Dekescordes/spacebar
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: No more typecasting required

Browse Source
This commit is contained in:
Diego Magdaleno 2021-05-23 13:46:26 -05:00
parent cae7ed6657
commit a2a22c9afa
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
package-lock.json generated
View File

@ -9,7 +9,7 @@
"version": "1.0.0", "version": "1.0.0",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@fosscord/server-util": "^1.3.0", "@fosscord/server-util": "^1.3.1",
"ajv": "^8.5.0", "ajv": "^8.5.0",
"dotenv": "^8.2.0", "dotenv": "^8.2.0",
"jsonwebtoken": "^8.5.1", "jsonwebtoken": "^8.5.1",
@ -31,9 +31,9 @@
} }
}, },
"node_modules/@fosscord/server-util": { "node_modules/@fosscord/server-util": {
"version": "1.3.0", "version": "1.3.1",
"resolved": "https://registry.npmjs.org/@fosscord/server-util/-/server-util-1.3.0.tgz", "resolved": "https://registry.npmjs.org/@fosscord/server-util/-/server-util-1.3.1.tgz",
"integrity": "sha512-GBU1XLAQKylr76Vb5kGEkYInj0qPkz/D9oAVSPISMIWbYeo6RIfARVneg6FdreWC+WK7UNcpGr+JFJpvMfSeOA==", "integrity": "sha512-NmrJ8HcZmOHyIUDMoQ+UnjoeMMi/HSbN2p/EMt1penTDSBvWcD8YS5m2NljuH0QxSmhuA2yLgSEpV1ydvJmOIw==",
"dependencies": { "dependencies": {
"@types/jsonwebtoken": "^8.5.0", "@types/jsonwebtoken": "^8.5.0",
"@types/mongoose-autopopulate": "^0.10.1", "@types/mongoose-autopopulate": "^0.10.1",
@ -2217,9 +2217,9 @@
}, },
"dependencies": { "dependencies": {
"@fosscord/server-util": { "@fosscord/server-util": {
"version": "1.3.0", "version": "1.3.1",
"resolved": "https://registry.npmjs.org/@fosscord/server-util/-/server-util-1.3.0.tgz", "resolved": "https://registry.npmjs.org/@fosscord/server-util/-/server-util-1.3.1.tgz",
"integrity": "sha512-GBU1XLAQKylr76Vb5kGEkYInj0qPkz/D9oAVSPISMIWbYeo6RIfARVneg6FdreWC+WK7UNcpGr+JFJpvMfSeOA==", "integrity": "sha512-NmrJ8HcZmOHyIUDMoQ+UnjoeMMi/HSbN2p/EMt1penTDSBvWcD8YS5m2NljuH0QxSmhuA2yLgSEpV1ydvJmOIw==",
"requires": { "requires": {
"@types/jsonwebtoken": "^8.5.0", "@types/jsonwebtoken": "^8.5.0",
"@types/mongoose-autopopulate": "^0.10.1", "@types/mongoose-autopopulate": "^0.10.1",

2
package.json
View File

@ -13,7 +13,7 @@
"author": "Fosscord", "author": "Fosscord",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@fosscord/server-util": "^1.3.0", "@fosscord/server-util": "^1.3.1",
"ajv": "^8.5.0", "ajv": "^8.5.0",
"dotenv": "^8.2.0", "dotenv": "^8.2.0",
"jsonwebtoken": "^8.5.1", "jsonwebtoken": "^8.5.1",

4
src/opcodes/Identify.ts
View File

@ -17,7 +17,7 @@ import { IdentifySchema } from "../schema/Identify";
import { Send } from "../util/Send"; import { Send } from "../util/Send";
import experiments from "./experiments.json"; import experiments from "./experiments.json";
import { check } from "./instanceOf"; import { check } from "./instanceOf";
import { DefaultOptions, gatewayConfig } from "../util/Config"; import * as Config from "../util/Config";
// TODO: bot sharding // TODO: bot sharding
// TODO: check priviliged intents // TODO: check priviliged intents
@ -30,7 +30,7 @@ export async function onIdentify(this: WebSocket, data: Payload) {
const identify: IdentifySchema = data.d; const identify: IdentifySchema = data.d;
try { try {
const { jwtSecret } = (gatewayConfig.getAll() as DefaultOptions).security; const { jwtSecret } = Config.gatewayConfig.getAll().security;
var decoded = await checkToken(identify.token, jwtSecret); // will throw an error if invalid var decoded = await checkToken(identify.token, jwtSecret); // will throw an error if invalid
} catch (error) { } catch (error) {
console.error("invalid token", error); console.error("invalid token", error);

2
src/util/Config.ts
View File

@ -33,4 +33,4 @@ const ajv = new Ajv();
const validator = ajv.compile(schema); const validator = ajv.compile(schema);
const configPath = getConfigPathForFile("fosscord", "gateway", ".json"); const configPath = getConfigPathForFile("fosscord", "gateway", ".json");
export const gatewayConfig = new Config({path: configPath, schemaValidator: validator, schema: schema}) export const gatewayConfig = new Config<DefaultOptions>({path: configPath, schemaValidator: validator, schema: schema})