Fix: No more typecasting required
This commit is contained in:
parent
cae7ed6657
commit
a2a22c9afa
BIN
package-lock.json
generated
BIN
package-lock.json
generated
Binary file not shown.
@ -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",
|
||||||
|
|||||||
@ -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);
|
||||||
|
|||||||
@ -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})
|
||||||
Reference in New Issue
Block a user