@tickrorg/common 1.0.16 → 1.0.17
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/dist/services/token.d.ts
CHANGED
|
@@ -1,19 +1,24 @@
|
|
|
1
1
|
import { Response, Request } from "express";
|
|
2
2
|
export interface TokenPayload {
|
|
3
|
-
|
|
3
|
+
_id: string;
|
|
4
4
|
email: string;
|
|
5
5
|
type: number;
|
|
6
6
|
}
|
|
7
7
|
export declare class Token {
|
|
8
|
+
private static readonly ACCESS_TOKEN_EXPIRY;
|
|
9
|
+
private static readonly REFRESH_TOKEN_EXPIRY;
|
|
10
|
+
private static readonly ACCESS_COOKIE_PATH;
|
|
11
|
+
private static readonly REFRESH_COOKIE_PATH;
|
|
8
12
|
static generateAccess(payload: TokenPayload): string;
|
|
9
|
-
static generateRefresh(
|
|
13
|
+
static generateRefresh(): string;
|
|
14
|
+
static hashRefresh(token: string): string;
|
|
10
15
|
static generatePair(payload: TokenPayload): {
|
|
11
16
|
accessToken: string;
|
|
12
17
|
refreshToken: string;
|
|
18
|
+
refreshTokenHash: string;
|
|
13
19
|
};
|
|
14
20
|
static verifyAccess(token: string): TokenPayload | null;
|
|
15
|
-
static
|
|
16
|
-
static refresh(req: Request, res: Response): TokenPayload | null;
|
|
21
|
+
static getRefreshFromRequest(req: Request): string | null;
|
|
17
22
|
static fromRequest(req: Request): TokenPayload | null;
|
|
18
23
|
static setCookies(res: Response, accessToken: string, refreshToken: string): void;
|
|
19
24
|
static clearCookies(res: Response): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../../src/services/token.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../../src/services/token.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAE5C,MAAM,WAAW,YAAY;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;CACd;AAED,qBAAa,KAAK;IAChB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAS;IACpD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAA2B;IAEvE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAO;IACjD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAmB;IAE9D,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,GAAG,MAAM;IAOpD,MAAM,CAAC,eAAe,IAAI,MAAM;IAIhC,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAIzC,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,YAAY;;;;;IAUzC,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI;IA0BvD,MAAM,CAAC,qBAAqB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI;IAMzD,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,YAAY,GAAG,IAAI;IAQrD,MAAM,CAAC,UAAU,CACf,GAAG,EAAE,QAAQ,EACb,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,GACnB,IAAI;IAkBP,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,QAAQ,GAAG,IAAI;CASzC"}
|
package/dist/services/token.js
CHANGED
|
@@ -1,52 +1,49 @@
|
|
|
1
|
+
import crypto from "crypto";
|
|
1
2
|
import jwt from "jsonwebtoken";
|
|
2
3
|
export class Token {
|
|
3
4
|
static generateAccess(payload) {
|
|
4
|
-
|
|
5
|
-
|
|
5
|
+
return jwt.sign(payload, process.env.JWT_ACCESS_KEY, {
|
|
6
|
+
expiresIn: Token.ACCESS_TOKEN_EXPIRY,
|
|
7
|
+
algorithm: "HS256",
|
|
8
|
+
});
|
|
9
|
+
}
|
|
10
|
+
static generateRefresh() {
|
|
11
|
+
return crypto.randomBytes(32).toString("base64url");
|
|
6
12
|
}
|
|
7
|
-
static
|
|
8
|
-
return
|
|
13
|
+
static hashRefresh(token) {
|
|
14
|
+
return crypto.createHash("sha256").update(token).digest("hex");
|
|
9
15
|
}
|
|
10
16
|
static generatePair(payload) {
|
|
17
|
+
const refreshToken = Token.generateRefresh();
|
|
11
18
|
return {
|
|
12
19
|
accessToken: Token.generateAccess(payload),
|
|
13
|
-
refreshToken
|
|
20
|
+
refreshToken,
|
|
21
|
+
refreshTokenHash: Token.hashRefresh(refreshToken),
|
|
14
22
|
};
|
|
15
23
|
}
|
|
16
24
|
static verifyAccess(token) {
|
|
17
25
|
try {
|
|
18
|
-
|
|
26
|
+
const decoded = jwt.verify(token, process.env.JWT_ACCESS_KEY, { algorithms: ["HS256"] });
|
|
27
|
+
if (typeof decoded === "string")
|
|
28
|
+
return null;
|
|
29
|
+
const { _id, email, type } = decoded;
|
|
30
|
+
if (typeof _id !== "string" ||
|
|
31
|
+
typeof email !== "string" ||
|
|
32
|
+
typeof type !== "number") {
|
|
33
|
+
return null;
|
|
34
|
+
}
|
|
35
|
+
return { _id, email, type };
|
|
19
36
|
}
|
|
20
37
|
catch {
|
|
21
38
|
return null;
|
|
22
39
|
}
|
|
23
40
|
}
|
|
24
|
-
static
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
}
|
|
28
|
-
catch {
|
|
29
|
-
return null;
|
|
30
|
-
}
|
|
31
|
-
}
|
|
32
|
-
static refresh(req, res) {
|
|
33
|
-
const refreshToken = req.cookies.refresh_token;
|
|
34
|
-
if (!refreshToken)
|
|
35
|
-
return null;
|
|
36
|
-
const payload = Token.verifyRefresh(refreshToken);
|
|
37
|
-
if (!payload)
|
|
38
|
-
return null;
|
|
39
|
-
const { id, email, type } = payload;
|
|
40
|
-
const { accessToken, refreshToken: newRefreshToken } = Token.generatePair({
|
|
41
|
-
id,
|
|
42
|
-
email,
|
|
43
|
-
type: type,
|
|
44
|
-
});
|
|
45
|
-
Token.setCookies(res, accessToken, newRefreshToken);
|
|
46
|
-
return { id, email, type };
|
|
41
|
+
static getRefreshFromRequest(req) {
|
|
42
|
+
const token = req.cookies?.refresh_token;
|
|
43
|
+
return typeof token === "string" ? token : null;
|
|
47
44
|
}
|
|
48
45
|
static fromRequest(req) {
|
|
49
|
-
const token = req.cookies
|
|
46
|
+
const token = req.cookies?.access_token;
|
|
50
47
|
if (!token)
|
|
51
48
|
return null;
|
|
52
49
|
return Token.verifyAccess(token);
|
|
@@ -57,19 +54,27 @@ export class Token {
|
|
|
57
54
|
secure: process.env.NODE_ENV === "production",
|
|
58
55
|
sameSite: "lax",
|
|
59
56
|
maxAge: 15 * 60 * 1000,
|
|
60
|
-
path:
|
|
57
|
+
path: Token.ACCESS_COOKIE_PATH,
|
|
61
58
|
});
|
|
62
59
|
res.cookie("refresh_token", refreshToken, {
|
|
63
60
|
httpOnly: true,
|
|
64
61
|
secure: process.env.NODE_ENV === "production",
|
|
65
62
|
sameSite: "lax",
|
|
66
|
-
maxAge:
|
|
67
|
-
path:
|
|
63
|
+
maxAge: Token.REFRESH_TOKEN_EXPIRY,
|
|
64
|
+
path: Token.REFRESH_COOKIE_PATH,
|
|
68
65
|
});
|
|
69
66
|
}
|
|
70
67
|
static clearCookies(res) {
|
|
71
|
-
res.clearCookie("access_token"
|
|
72
|
-
|
|
68
|
+
res.clearCookie("access_token", {
|
|
69
|
+
path: Token.ACCESS_COOKIE_PATH,
|
|
70
|
+
});
|
|
71
|
+
res.clearCookie("refresh_token", {
|
|
72
|
+
path: Token.REFRESH_COOKIE_PATH,
|
|
73
|
+
});
|
|
73
74
|
}
|
|
74
75
|
}
|
|
76
|
+
Token.ACCESS_TOKEN_EXPIRY = "15m";
|
|
77
|
+
Token.REFRESH_TOKEN_EXPIRY = 7 * 24 * 60 * 60 * 1000;
|
|
78
|
+
Token.ACCESS_COOKIE_PATH = "/";
|
|
79
|
+
Token.REFRESH_COOKIE_PATH = "/auth/refresh";
|
|
75
80
|
//# sourceMappingURL=token.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../src/services/token.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,cAAc,CAAC;AAS/B,MAAM,OAAO,KAAK;
|
|
1
|
+
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../src/services/token.ts"],"names":[],"mappings":"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"}
|
package/dist/types/events.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../src/types/events.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,aAAa;IAC5B,
|
|
1
|
+
{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../src/types/events.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB;AACD,oBAAY,aAAa;IACvB,aAAa,mBAAmB;IAChC,aAAa,mBAAmB;IAChC,YAAY,kBAAkB;IAC9B,cAAc,oBAAoB;IAClC,gBAAgB,sBAAsB;IACtC,WAAW,iBAAiB;IAC5B,WAAW,iBAAiB;CAC7B;AAED,MAAM,WAAW,KAAK,CAAC,CAAC,GAAG,OAAO;IAChC,OAAO,EAAE,aAAa,CAAC;IACvB,IAAI,EAAE,CAAC,CAAC;CACT"}
|