tek-wallet 0.0.73 → 0.0.75

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.
Files changed (5) hide show
  1. package/dist/handlers/auth/functions/isExpired.js +2 -1
  2. package/dist/handlers/auth/import/index.js +3 -2
  3. package/dist/handlers/auth/login/index.js +20 -17
  4. package/dist/providers/WalletDataProvider/index.js +36 -39
  5. package/package.json +1 -1
package/dist/handlers/auth/functions/isExpired.js CHANGED
@@ -1,10 +1,11 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
+ var const_1 = require("../../const");
3
4
  var isExpired = function (expireTime) {
4
5
  var _a;
5
6
  try {
6
7
  var time = (_a = new Date(+expireTime)) === null || _a === void 0 ? void 0 : _a.getTime();
7
- return time >= Date.now();
8
+ return time >= Date.now() - const_1.PRE_EXPIRED_TIME; // 40 seconds
8
9
  }
9
10
  catch (error) {
10
11
  console.error("🚀 ~ isExpired ~ error:", error);
package/dist/handlers/auth/import/index.js CHANGED
@@ -64,8 +64,9 @@ var importWalletHandler = function (req) { return __awaiter(void 0, void 0, void
64
64
  return [4 /*yield*/, (0, setLoginInfoToCookies_1.default)({
65
65
  accessToken: tokenInfo.access_token,
66
66
  refreshToken: tokenInfo.refresh_token,
67
- expiresAt: tokenInfo.expires_in,
68
- refreshExpiresAt: tokenInfo.refresh_expires_in | 240,
67
+ expiresAt: tokenInfo.expires_in * 1000 + Date.now(),
68
+ refreshExpiresAt: (tokenInfo.refresh_expires_in || 172800) * 1000 + //default 2 days
69
+ Date.now(),
69
70
  })];
70
71
  case 3:
71
72
  _b.sent();
package/dist/handlers/auth/login/index.js CHANGED
@@ -44,15 +44,14 @@ var server_1 = require("next/server");
44
44
  var isExpired_1 = __importDefault(require("../functions/isExpired"));
45
45
  var expose_type_1 = require("../../../types/expose-type");
46
46
  var refreshTokenKeycloak_1 = __importDefault(require("../functions/refreshTokenKeycloak"));
47
- var const_1 = require("../../const");
48
47
  var setLoginInfoToCookies_1 = __importDefault(require("../functions/setLoginInfoToCookies"));
49
48
  var clearLoginInfo_1 = __importDefault(require("../functions/clearLoginInfo"));
50
49
  var loginHandler = function () { return __awaiter(void 0, void 0, void 0, function () {
51
- var loginInfo, refreshedTokens, data, expiresAt, err_1;
50
+ var loginInfo, refreshedTokens, refreshedTokens_1, data, expiresAt, err_1;
52
51
  return __generator(this, function (_a) {
53
52
  switch (_a.label) {
54
53
  case 0:
55
- _a.trys.push([0, 10, , 12]);
54
+ _a.trys.push([0, 11, , 13]);
56
55
  return [4 /*yield*/, (0, getLoginInfoFromCookies_1.default)()];
57
56
  case 1:
58
57
  loginInfo = _a.sent();
@@ -84,20 +83,24 @@ var loginHandler = function () { return __awaiter(void 0, void 0, void 0, functi
84
83
  },
85
84
  })];
86
85
  }
87
- if (!((0, isExpired_1.default)(loginInfo.expiresAt) &&
88
- !(0, isExpired_1.default)(loginInfo.refreshExpiresAt))) return [3 /*break*/, 8];
89
86
  return [4 /*yield*/, (0, refreshTokenKeycloak_1.default)(loginInfo.refreshToken)];
90
87
  case 4:
91
88
  refreshedTokens = _a.sent();
92
- console.warn("🚀 ~ jwt ~ refreshedTokens:", loginInfo.refreshToken, refreshedTokens);
93
- if (!(refreshedTokens.status === expose_type_1.REFRESH_TOKEN_STATUS.SUCCESS)) return [3 /*break*/, 6];
94
- data = refreshedTokens.data;
89
+ console.warn("🚀 ~ refreshedTokens dd:", refreshedTokens);
90
+ if (!((0, isExpired_1.default)(loginInfo.expiresAt) &&
91
+ !(0, isExpired_1.default)(loginInfo.refreshExpiresAt))) return [3 /*break*/, 9];
92
+ return [4 /*yield*/, (0, refreshTokenKeycloak_1.default)(loginInfo.refreshToken)];
93
+ case 5:
94
+ refreshedTokens_1 = _a.sent();
95
+ console.warn("🚀 ~ jwt ~ refreshedTokens:", loginInfo.refreshToken, refreshedTokens_1);
96
+ if (!(refreshedTokens_1.status === expose_type_1.REFRESH_TOKEN_STATUS.SUCCESS)) return [3 /*break*/, 7];
97
+ data = refreshedTokens_1.data;
95
98
  expiresAt = (data === null || data === void 0 ? void 0 : data.expires_in) * 1000 + Date.now();
96
99
  loginInfo.accessToken = data === null || data === void 0 ? void 0 : data.access_token;
97
100
  loginInfo.refreshToken = data === null || data === void 0 ? void 0 : data.refresh_token;
98
- loginInfo.expiresAt = Math.max(expiresAt - const_1.PRE_EXPIRED_TIME, 0);
101
+ loginInfo.expiresAt = Math.max(expiresAt, 0);
99
102
  return [4 /*yield*/, (0, setLoginInfoToCookies_1.default)(loginInfo)];
100
- case 5:
103
+ case 6:
101
104
  _a.sent();
102
105
  return [2 /*return*/, server_1.NextResponse.json({
103
106
  success: true,
@@ -107,31 +110,31 @@ var loginHandler = function () { return __awaiter(void 0, void 0, void 0, functi
107
110
  expiresAt: loginInfo.expiresAt,
108
111
  },
109
112
  })];
110
- case 6: return [4 /*yield*/, (0, clearLoginInfo_1.default)()];
111
- case 7:
113
+ case 7: return [4 /*yield*/, (0, clearLoginInfo_1.default)()];
114
+ case 8:
112
115
  _a.sent();
113
116
  return [2 /*return*/, server_1.NextResponse.json({
114
117
  success: false,
115
118
  message: expose_type_1.LoginMessage.REFRESH_TOKEN_FAILED,
116
119
  })];
117
- case 8: return [4 /*yield*/, (0, clearLoginInfo_1.default)()];
118
- case 9:
120
+ case 9: return [4 /*yield*/, (0, clearLoginInfo_1.default)()];
121
+ case 10:
119
122
  _a.sent();
120
123
  return [2 /*return*/, server_1.NextResponse.json({
121
124
  success: false,
122
125
  message: expose_type_1.LoginMessage.ERROR,
123
126
  })];
124
- case 10:
127
+ case 11:
125
128
  err_1 = _a.sent();
126
129
  console.error("🚀 ~ loginHandler ~ err:", err_1);
127
130
  return [4 /*yield*/, (0, clearLoginInfo_1.default)()];
128
- case 11:
131
+ case 12:
129
132
  _a.sent();
130
133
  return [2 /*return*/, server_1.NextResponse.json({
131
134
  status: 500,
132
135
  message: "Internal server error",
133
136
  })];
134
- case 12: return [2 /*return*/];
137
+ case 13: return [2 /*return*/];
135
138
  }
136
139
  });
137
140
  }); };
package/dist/providers/WalletDataProvider/index.js CHANGED
@@ -102,41 +102,39 @@ function WalletDataProvider(_a) {
102
102
  var _e = react_1.default.useState(false), isTokensLoading = _e[0], setIsTokensLoading = _e[1];
103
103
  var _f = react_1.default.useState(undefined), tokens = _f[0], setTokens = _f[1];
104
104
  var timeout = react_1.default.useRef(undefined);
105
- var updateLogin = (0, react_1.useCallback)(function () {
106
- (function () { return __awaiter(_this, void 0, void 0, function () {
107
- var response, error_1;
108
- var _a;
109
- return __generator(this, function (_b) {
110
- switch (_b.label) {
111
- case 0:
112
- _b.trys.push([0, 2, , 3]);
113
- console.warn("🚀 ~ update ~ response:");
114
- setIsAuthLoading(true);
115
- return [4 /*yield*/, (0, loginIntenalService_1.default)()];
116
- case 1:
117
- response = _b.sent();
118
- console.warn("🚀 ~ update ~ response:", response);
119
- if (response === null || response === void 0 ? void 0 : response.success) {
120
- setSession(response === null || response === void 0 ? void 0 : response.data);
121
- (0, userClientRequest_1.setAuthToken)(((_a = response === null || response === void 0 ? void 0 : response.data) === null || _a === void 0 ? void 0 : _a.accessToken) || "");
122
- setIsAuthenticated(true);
123
- }
124
- else {
125
- setSession(undefined);
126
- (0, userClientRequest_1.setAuthToken)("");
127
- setIsAuthenticated(false);
128
- }
129
- setIsAuthLoading(false);
130
- return [3 /*break*/, 3];
131
- case 2:
132
- error_1 = _b.sent();
133
- console.error("🚀 ~ error:", error_1);
134
- return [3 /*break*/, 3];
135
- case 3: return [2 /*return*/];
136
- }
137
- });
138
- }); });
139
- }, []);
105
+ var updateLogin = (0, react_1.useCallback)(function () { return __awaiter(_this, void 0, void 0, function () {
106
+ var response, error_1;
107
+ var _a;
108
+ return __generator(this, function (_b) {
109
+ switch (_b.label) {
110
+ case 0:
111
+ _b.trys.push([0, 2, , 3]);
112
+ console.warn("🚀 ~ update ~ response:");
113
+ setIsAuthLoading(true);
114
+ return [4 /*yield*/, (0, loginIntenalService_1.default)()];
115
+ case 1:
116
+ response = _b.sent();
117
+ console.warn("🚀 ~ update ~ response:", response);
118
+ if (response === null || response === void 0 ? void 0 : response.success) {
119
+ setSession(response === null || response === void 0 ? void 0 : response.data);
120
+ (0, userClientRequest_1.setAuthToken)(((_a = response === null || response === void 0 ? void 0 : response.data) === null || _a === void 0 ? void 0 : _a.accessToken) || "");
121
+ setIsAuthenticated(true);
122
+ }
123
+ else {
124
+ setSession(undefined);
125
+ (0, userClientRequest_1.setAuthToken)("");
126
+ setIsAuthenticated(false);
127
+ }
128
+ setIsAuthLoading(false);
129
+ return [3 /*break*/, 3];
130
+ case 2:
131
+ error_1 = _b.sent();
132
+ console.error("🚀 ~ error:", error_1);
133
+ return [3 /*break*/, 3];
134
+ case 3: return [2 /*return*/];
135
+ }
136
+ });
137
+ }); }, []);
140
138
  var updateBalance = (0, react_1.useCallback)(function () { return __awaiter(_this, void 0, void 0, function () {
141
139
  var response, error_2;
142
140
  return __generator(this, function (_a) {
@@ -187,10 +185,6 @@ function WalletDataProvider(_a) {
187
185
  }
188
186
  });
189
187
  }); }, []);
190
- react_1.default.useEffect(function () {
191
- updateLogin();
192
- console.warn("🚀 ~ React.useEffect ~ updateLogin:", updateLogin);
193
- }, [updateLogin]);
194
188
  react_1.default.useEffect(function () {
195
189
  if (isAuthenticated) {
196
190
  updateBalance();
@@ -199,6 +193,9 @@ function WalletDataProvider(_a) {
199
193
  setTokens(undefined);
200
194
  }
201
195
  }, [isAuthenticated]);
196
+ react_1.default.useEffect(function () {
197
+ updateLogin();
198
+ }, []);
202
199
  react_1.default.useEffect(function () {
203
200
  var _a;
204
201
  !!timeout.current && clearTimeout(timeout.current);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "tek-wallet",
3
- "version": "0.0.73",
3
+ "version": "0.0.75",
4
4
  "description": "A custom React provider with TypeScript support",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",