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

Merge branch 'fosscord:master' into master

Browse Source
This commit is contained in:
Diego Magdaleno 2021-05-22 22:21:25 -05:00
commit 05b4e4af35
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "@fosscord/server-util", "name": "@fosscord/server-util",
"version": "1.2.7", "version": "1.2.8",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "@fosscord/server-util", "name": "@fosscord/server-util",
"version": "1.2.7", "version": "1.2.8",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@types/jsonwebtoken": "^8.5.0", "@types/jsonwebtoken": "^8.5.0",

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@fosscord/server-util", "name": "@fosscord/server-util",
"version": "1.2.7", "version": "1.2.8",
"description": "Utility functions for the all server repositories", "description": "Utility functions for the all server repositories",
"main": "dist/index.js", "main": "dist/index.js",
"types": "dist/index.d.ts", "types": "dist/index.d.ts",

4
src/index.ts
View File

@ -4,7 +4,7 @@ export * as Constants from "./util/Constants";
export * from "./models/index"; export * from "./models/index";
export * from "./util/index"; export * from "./util/index";
import Config, { DefaultOptions } from "./util/Config"; import Config from "./util/Config";
import db, { MongooseCache, toObject } from "./util/Database"; import db, { MongooseCache, toObject } from "./util/Database";
export { Config, db, DefaultOptions, MongooseCache, toObject }; export { Config, db, MongooseCache, toObject };

5
src/util/checkToken.ts
View File

@ -1,10 +1,9 @@
import { JWTOptions } from "./Constants"; import { JWTOptions } from "./Constants";
import jwt from "jsonwebtoken"; import jwt from "jsonwebtoken";
import Config from "./Config";
export function checkToken(token: string): Promise<any> { export function checkToken(token: string, jwtSecret: string): Promise<any> {
return new Promise((res, rej) => { return new Promise((res, rej) => {
jwt.verify(token, Config.getAll()?.api?.security?.jwtSecret, JWTOptions, (err, decoded: any) => { jwt.verify(token, jwtSecret, JWTOptions, (err, decoded: any) => {
if (err || !decoded) return rej("Invalid Token"); if (err || !decoded) return rej("Invalid Token");
return res(decoded); return res(decoded);