tek-wallet 0.0.22 → 0.0.25
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.
|
@@ -71,7 +71,7 @@ var handler = (0, next_auth_1.default)({
|
|
|
71
71
|
access_token: tokens.access_token,
|
|
72
72
|
refresh_token: tokens.refresh_token,
|
|
73
73
|
expires_at: tokens.expires_in,
|
|
74
|
-
refresh_expires_at: tokens.refresh_expires_in,
|
|
74
|
+
refresh_expires_at: tokens.refresh_expires_in || 240,
|
|
75
75
|
client: "tek_wallet",
|
|
76
76
|
}];
|
|
77
77
|
}
|
|
@@ -4,7 +4,7 @@ var isExpired = function (expireTime) {
|
|
|
4
4
|
var _a;
|
|
5
5
|
try {
|
|
6
6
|
var time = (_a = new Date(+expireTime)) === null || _a === void 0 ? void 0 : _a.getTime();
|
|
7
|
-
return time
|
|
7
|
+
return time >= Date.now();
|
|
8
8
|
}
|
|
9
9
|
catch (error) {
|
|
10
10
|
console.error("🚀 ~ isExpired ~ error:", error);
|
|
@@ -65,7 +65,7 @@ var importWalletHandler = function (req) { return __awaiter(void 0, void 0, void
|
|
|
65
65
|
accessToken: tokenInfo.access_token,
|
|
66
66
|
refreshToken: tokenInfo.refresh_token,
|
|
67
67
|
expiresAt: tokenInfo.expires_in,
|
|
68
|
-
refreshExpiresAt: tokenInfo.refresh_expires_in,
|
|
68
|
+
refreshExpiresAt: tokenInfo.refresh_expires_in | 240,
|
|
69
69
|
})];
|
|
70
70
|
case 3:
|
|
71
71
|
_b.sent();
|
|
@@ -56,6 +56,7 @@ var loginHandler = function () { return __awaiter(void 0, void 0, void 0, functi
|
|
|
56
56
|
return [4 /*yield*/, (0, getLoginInfoFromCookies_1.default)()];
|
|
57
57
|
case 1:
|
|
58
58
|
loginInfo = _a.sent();
|
|
59
|
+
console.warn("🚀 ~ loginHandler ~ loginInfo:", loginInfo);
|
|
59
60
|
//no login info
|
|
60
61
|
if (!loginInfo) {
|
|
61
62
|
return [2 /*return*/, server_1.NextResponse.json({
|
|
@@ -63,6 +64,15 @@ var loginHandler = function () { return __awaiter(void 0, void 0, void 0, functi
|
|
|
63
64
|
message: type_1.LoginMessage.NOT_FOUND,
|
|
64
65
|
})];
|
|
65
66
|
}
|
|
67
|
+
if (!(0, isExpired_1.default)(loginInfo.refreshExpiresAt)) return [3 /*break*/, 3];
|
|
68
|
+
return [4 /*yield*/, (0, clearLoginInfo_1.default)()];
|
|
69
|
+
case 2:
|
|
70
|
+
_a.sent();
|
|
71
|
+
return [2 /*return*/, server_1.NextResponse.json({
|
|
72
|
+
success: false,
|
|
73
|
+
message: type_1.LoginMessage.EXPIRED,
|
|
74
|
+
})];
|
|
75
|
+
case 3:
|
|
66
76
|
//access token is not expired
|
|
67
77
|
if (!(0, isExpired_1.default)(loginInfo.expiresAt)) {
|
|
68
78
|
return [2 /*return*/, server_1.NextResponse.json({
|
|
@@ -74,15 +84,6 @@ var loginHandler = function () { return __awaiter(void 0, void 0, void 0, functi
|
|
|
74
84
|
},
|
|
75
85
|
})];
|
|
76
86
|
}
|
|
77
|
-
if (!(0, isExpired_1.default)(loginInfo.refreshExpiresAt)) return [3 /*break*/, 3];
|
|
78
|
-
return [4 /*yield*/, (0, clearLoginInfo_1.default)()];
|
|
79
|
-
case 2:
|
|
80
|
-
_a.sent();
|
|
81
|
-
return [2 /*return*/, server_1.NextResponse.json({
|
|
82
|
-
success: false,
|
|
83
|
-
message: type_1.LoginMessage.EXPIRED,
|
|
84
|
-
})];
|
|
85
|
-
case 3:
|
|
86
87
|
if (!((0, isExpired_1.default)(loginInfo.expiresAt) &&
|
|
87
88
|
!(0, isExpired_1.default)(loginInfo.refreshExpiresAt))) return [3 /*break*/, 8];
|
|
88
89
|
return [4 /*yield*/, (0, refreshTokenKeycloak_1.default)(loginInfo.refreshToken)];
|