tek-wallet 0.0.74 → 0.0.75

package/dist/handlers/auth/functions/isExpired.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+var const_1 = require("../../const");
 var isExpired = function (expireTime) {
     var _a;
     try {
         var time = (_a = new Date(+expireTime)) === null || _a === void 0 ? void 0 : _a.getTime();
-        return time >= Date.now();
+        return time >= Date.now() - const_1.PRE_EXPIRED_TIME; // 40 seconds
     }
     catch (error) {
         console.error("🚀 ~ isExpired ~ error:", error);

package/dist/handlers/auth/import/index.js

@@ -64,8 +64,9 @@ var importWalletHandler = function (req) { return __awaiter(void 0, void 0, void
                 return [4 /*yield*/, (0, setLoginInfoToCookies_1.default)({
                         accessToken: tokenInfo.access_token,
                         refreshToken: tokenInfo.refresh_token,
-                        expiresAt: tokenInfo.expires_in,
-                        refreshExpiresAt: tokenInfo.refresh_expires_in | 240,
+                        expiresAt: tokenInfo.expires_in * 1000 + Date.now(),
+                        refreshExpiresAt: (tokenInfo.refresh_expires_in || 172800) * 1000 + //default 2 days
+                            Date.now(),
                     })];
             case 3:
                 _b.sent();

package/dist/handlers/auth/login/index.js

@@ -44,15 +44,14 @@ var server_1 = require("next/server");
 var isExpired_1 = __importDefault(require("../functions/isExpired"));
 var expose_type_1 = require("../../../types/expose-type");
 var refreshTokenKeycloak_1 = __importDefault(require("../functions/refreshTokenKeycloak"));
-var const_1 = require("../../const");
 var setLoginInfoToCookies_1 = __importDefault(require("../functions/setLoginInfoToCookies"));
 var clearLoginInfo_1 = __importDefault(require("../functions/clearLoginInfo"));
 var loginHandler = function () { return __awaiter(void 0, void 0, void 0, function () {
-    var loginInfo, refreshedTokens, data, expiresAt, err_1;
+    var loginInfo, refreshedTokens, refreshedTokens_1, data, expiresAt, err_1;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                _a.trys.push([0, 10, , 12]);
+                _a.trys.push([0, 11, , 13]);
                 return [4 /*yield*/, (0, getLoginInfoFromCookies_1.default)()];
             case 1:
                 loginInfo = _a.sent();
@@ -84,20 +83,24 @@ var loginHandler = function () { return __awaiter(void 0, void 0, void 0, functi
                             },
                         })];
                 }
-                if (!((0, isExpired_1.default)(loginInfo.expiresAt) &&
-                    !(0, isExpired_1.default)(loginInfo.refreshExpiresAt))) return [3 /*break*/, 8];
                 return [4 /*yield*/, (0, refreshTokenKeycloak_1.default)(loginInfo.refreshToken)];
             case 4:
                 refreshedTokens = _a.sent();
-                console.warn("🚀 ~ jwt ~ refreshedTokens:", loginInfo.refreshToken, refreshedTokens);
-                if (!(refreshedTokens.status === expose_type_1.REFRESH_TOKEN_STATUS.SUCCESS)) return [3 /*break*/, 6];
-                data = refreshedTokens.data;
+                console.warn("🚀 ~ refreshedTokens dd:", refreshedTokens);
+                if (!((0, isExpired_1.default)(loginInfo.expiresAt) &&
+                    !(0, isExpired_1.default)(loginInfo.refreshExpiresAt))) return [3 /*break*/, 9];
+                return [4 /*yield*/, (0, refreshTokenKeycloak_1.default)(loginInfo.refreshToken)];
+            case 5:
+                refreshedTokens_1 = _a.sent();
+                console.warn("🚀 ~ jwt ~ refreshedTokens:", loginInfo.refreshToken, refreshedTokens_1);
+                if (!(refreshedTokens_1.status === expose_type_1.REFRESH_TOKEN_STATUS.SUCCESS)) return [3 /*break*/, 7];
+                data = refreshedTokens_1.data;
                 expiresAt = (data === null || data === void 0 ? void 0 : data.expires_in) * 1000 + Date.now();
                 loginInfo.accessToken = data === null || data === void 0 ? void 0 : data.access_token;
                 loginInfo.refreshToken = data === null || data === void 0 ? void 0 : data.refresh_token;
-                loginInfo.expiresAt = Math.max(expiresAt - const_1.PRE_EXPIRED_TIME, 0);
+                loginInfo.expiresAt = Math.max(expiresAt, 0);
                 return [4 /*yield*/, (0, setLoginInfoToCookies_1.default)(loginInfo)];
-            case 5:
+            case 6:
                 _a.sent();
                 return [2 /*return*/, server_1.NextResponse.json({
                         success: true,
@@ -107,31 +110,31 @@ var loginHandler = function () { return __awaiter(void 0, void 0, void 0, functi
                             expiresAt: loginInfo.expiresAt,
                         },
                     })];
-            case 6: return [4 /*yield*/, (0, clearLoginInfo_1.default)()];
-            case 7:
+            case 7: return [4 /*yield*/, (0, clearLoginInfo_1.default)()];
+            case 8:
                 _a.sent();
                 return [2 /*return*/, server_1.NextResponse.json({
                         success: false,
                         message: expose_type_1.LoginMessage.REFRESH_TOKEN_FAILED,
                     })];
-            case 8: return [4 /*yield*/, (0, clearLoginInfo_1.default)()];
-            case 9:
+            case 9: return [4 /*yield*/, (0, clearLoginInfo_1.default)()];
+            case 10:
                 _a.sent();
                 return [2 /*return*/, server_1.NextResponse.json({
                         success: false,
                         message: expose_type_1.LoginMessage.ERROR,
                     })];
-            case 10:
+            case 11:
                 err_1 = _a.sent();
                 console.error("🚀 ~ loginHandler ~ err:", err_1);
                 return [4 /*yield*/, (0, clearLoginInfo_1.default)()];
-            case 11:
+            case 12:
                 _a.sent();
                 return [2 /*return*/, server_1.NextResponse.json({
                         status: 500,
                         message: "Internal server error",
                     })];
-            case 12: return [2 /*return*/];
+            case 13: return [2 /*return*/];
         }
     });
 }); };

package/dist/providers/WalletDataProvider/index.js

@@ -193,6 +193,9 @@ function WalletDataProvider(_a) {
             setTokens(undefined);
         }
     }, [isAuthenticated]);
+    react_1.default.useEffect(function () {
+        updateLogin();
+    }, []);
     react_1.default.useEffect(function () {
         var _a;
         !!timeout.current && clearTimeout(timeout.current);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tek-wallet",
-  "version": "0.0.74",
+  "version": "0.0.75",
   "description": "A custom React provider with TypeScript support",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",