@otters.ai/common-backend 1.0.183 → 1.0.188
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/interface/tokenDataStruct.d.ts +4 -0
- package/build/interface/user/user.d.ts +1 -0
- package/build/middleware/checkIsAdmin.js +0 -1
- package/build/middleware/checkToken.js +0 -1
- package/build/services/jwtService.d.ts +0 -1
- package/build/services/jwtService.js +8 -2
- package/package.json +1 -1
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { UserType } from "../enum";
|
|
1
2
|
export interface TokenDataStruct {
|
|
2
3
|
id: string;
|
|
3
4
|
email: string;
|
|
@@ -5,4 +6,7 @@ export interface TokenDataStruct {
|
|
|
5
6
|
firstName: string;
|
|
6
7
|
lastName: string;
|
|
7
8
|
isAdmin: boolean;
|
|
9
|
+
company: string;
|
|
10
|
+
stripeId: string;
|
|
11
|
+
role: UserType;
|
|
8
12
|
}
|
|
@@ -30,7 +30,6 @@ const checkIsAdmin = (sessionLogService, req, res, next) => __awaiter(void 0, vo
|
|
|
30
30
|
.findEntry({ sessionId: req.headers['sessionid'].toString() });
|
|
31
31
|
if (result.flag) {
|
|
32
32
|
const verifyToken = services_1.JwtService.verifyJSONToken({
|
|
33
|
-
salt: typeof result.message === "object" ? result.message['salt'] : '',
|
|
34
33
|
token: token
|
|
35
34
|
});
|
|
36
35
|
if (!verifyToken.flag) {
|
|
@@ -30,7 +30,6 @@ const checkToken = (sessionLogService, req, res, next) => __awaiter(void 0, void
|
|
|
30
30
|
.findEntry({ sessionId: req.headers['sessionid'].toString() });
|
|
31
31
|
if (result.flag) {
|
|
32
32
|
const verifyToken = services_1.JwtService.verifyJSONToken({
|
|
33
|
-
salt: typeof result.message === "object" ? result.message['salt'] : '',
|
|
34
33
|
token: token
|
|
35
34
|
});
|
|
36
35
|
if (!verifyToken.flag) {
|
|
@@ -5,11 +5,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.JwtService = void 0;
|
|
7
7
|
const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
|
|
8
|
+
const fs_1 = __importDefault(require("fs"));
|
|
9
|
+
const PUBLIC_KEY = fs_1.default.readFileSync("../secrets/jwt-public.pem");
|
|
8
10
|
class JwtService {
|
|
9
11
|
static verifyJSONToken(filters) {
|
|
10
12
|
try {
|
|
11
|
-
let verify = jsonwebtoken_1.default.verify(filters.token,
|
|
12
|
-
|
|
13
|
+
let verify = jsonwebtoken_1.default.verify(filters.token, PUBLIC_KEY, {
|
|
14
|
+
algorithms: ["RS256"],
|
|
15
|
+
issuer: "auth.otters.ai",
|
|
16
|
+
audience: "otters-api",
|
|
17
|
+
});
|
|
18
|
+
return { flag: true, message: typeof verify === "string" ? '' : verify };
|
|
13
19
|
}
|
|
14
20
|
catch (e) {
|
|
15
21
|
if (e.message === "jwt expired" || e.message === "invalid signature") {
|