@workos-inc/authkit-nextjs 2.3.1 → 2.3.2
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.
|
@@ -2,7 +2,8 @@ import { useCallback, useEffect, useReducer, useRef } from 'react';
|
|
|
2
2
|
import { getAccessTokenAction, refreshAccessTokenAction } from '../actions.js';
|
|
3
3
|
import { useAuth } from './authkit-provider.js';
|
|
4
4
|
const TOKEN_EXPIRY_BUFFER_SECONDS = 60;
|
|
5
|
-
const
|
|
5
|
+
const MIN_REFRESH_DELAY_SECONDS = 15; // minimum delay before refreshing token
|
|
6
|
+
const RETRY_DELAY_SECONDS = 300; // 5 minutes
|
|
6
7
|
function tokenReducer(state, action) {
|
|
7
8
|
switch (action.type) {
|
|
8
9
|
case 'FETCH_START':
|
|
@@ -18,6 +19,9 @@ function tokenReducer(state, action) {
|
|
|
18
19
|
return state;
|
|
19
20
|
}
|
|
20
21
|
}
|
|
22
|
+
function getRefreshDelay(timeUntilExpiry) {
|
|
23
|
+
return Math.max((timeUntilExpiry - TOKEN_EXPIRY_BUFFER_SECONDS) * 1000, MIN_REFRESH_DELAY_SECONDS * 1000);
|
|
24
|
+
}
|
|
21
25
|
function parseToken(token) {
|
|
22
26
|
// istanbul ignore next
|
|
23
27
|
if (!token) {
|
|
@@ -79,7 +83,7 @@ export function useAccessToken() {
|
|
|
79
83
|
if (token) {
|
|
80
84
|
const tokenData = parseToken(token);
|
|
81
85
|
if (tokenData) {
|
|
82
|
-
const delay =
|
|
86
|
+
const delay = getRefreshDelay(tokenData.timeUntilExpiry);
|
|
83
87
|
clearRefreshTimeout();
|
|
84
88
|
refreshTimeoutRef.current = setTimeout(updateToken, delay);
|
|
85
89
|
}
|
|
@@ -88,15 +92,16 @@ export function useAccessToken() {
|
|
|
88
92
|
}
|
|
89
93
|
catch (error) {
|
|
90
94
|
dispatch({ type: 'FETCH_ERROR', error: error instanceof Error ? error : new Error(String(error)) });
|
|
91
|
-
refreshTimeoutRef.current = setTimeout(updateToken,
|
|
95
|
+
refreshTimeoutRef.current = setTimeout(updateToken, RETRY_DELAY_SECONDS * 1000);
|
|
92
96
|
}
|
|
93
97
|
finally {
|
|
94
98
|
fetchingRef.current = false;
|
|
95
99
|
}
|
|
96
100
|
}, [clearRefreshTimeout]);
|
|
97
101
|
const refresh = useCallback(async () => {
|
|
98
|
-
if (fetchingRef.current)
|
|
102
|
+
if (fetchingRef.current) {
|
|
99
103
|
return;
|
|
104
|
+
}
|
|
100
105
|
fetchingRef.current = true;
|
|
101
106
|
dispatch({ type: 'FETCH_START' });
|
|
102
107
|
try {
|
|
@@ -106,7 +111,7 @@ export function useAccessToken() {
|
|
|
106
111
|
if (token) {
|
|
107
112
|
const tokenData = parseToken(token);
|
|
108
113
|
if (tokenData) {
|
|
109
|
-
const delay =
|
|
114
|
+
const delay = getRefreshDelay(tokenData.timeUntilExpiry);
|
|
110
115
|
clearRefreshTimeout();
|
|
111
116
|
refreshTimeoutRef.current = setTimeout(updateToken, delay);
|
|
112
117
|
}
|
|
@@ -116,7 +121,7 @@ export function useAccessToken() {
|
|
|
116
121
|
catch (error) {
|
|
117
122
|
const typedError = error instanceof Error ? error : new Error(String(error));
|
|
118
123
|
dispatch({ type: 'FETCH_ERROR', error: typedError });
|
|
119
|
-
refreshTimeoutRef.current = setTimeout(updateToken,
|
|
124
|
+
refreshTimeoutRef.current = setTimeout(updateToken, RETRY_DELAY_SECONDS * 1000);
|
|
120
125
|
}
|
|
121
126
|
finally {
|
|
122
127
|
fetchingRef.current = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useAccessToken.js","sourceRoot":"","sources":["../../../src/components/useAccessToken.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAC/E,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEhD,MAAM,2BAA2B,GAAG,EAAE,CAAC;AACvC,MAAM,
|
|
1
|
+
{"version":3,"file":"useAccessToken.js","sourceRoot":"","sources":["../../../src/components/useAccessToken.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/workos.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { WorkOS } from '@workos-inc/node';
|
|
2
2
|
import { WORKOS_API_HOSTNAME, WORKOS_API_KEY, WORKOS_API_HTTPS, WORKOS_API_PORT } from './env-variables.js';
|
|
3
3
|
import { lazy } from './utils.js';
|
|
4
|
-
export const VERSION = '2.3.
|
|
4
|
+
export const VERSION = '2.3.2';
|
|
5
5
|
const options = {
|
|
6
6
|
apiHostname: WORKOS_API_HOSTNAME,
|
|
7
7
|
https: WORKOS_API_HTTPS ? WORKOS_API_HTTPS === 'true' : true,
|
package/package.json
CHANGED
|
@@ -3,7 +3,8 @@ import { getAccessTokenAction, refreshAccessTokenAction } from '../actions.js';
|
|
|
3
3
|
import { useAuth } from './authkit-provider.js';
|
|
4
4
|
|
|
5
5
|
const TOKEN_EXPIRY_BUFFER_SECONDS = 60;
|
|
6
|
-
const
|
|
6
|
+
const MIN_REFRESH_DELAY_SECONDS = 15; // minimum delay before refreshing token
|
|
7
|
+
const RETRY_DELAY_SECONDS = 300; // 5 minutes
|
|
7
8
|
|
|
8
9
|
interface TokenState {
|
|
9
10
|
token: string | undefined;
|
|
@@ -33,6 +34,10 @@ function tokenReducer(state: TokenState, action: TokenAction): TokenState {
|
|
|
33
34
|
}
|
|
34
35
|
}
|
|
35
36
|
|
|
37
|
+
function getRefreshDelay(timeUntilExpiry: number) {
|
|
38
|
+
return Math.max((timeUntilExpiry - TOKEN_EXPIRY_BUFFER_SECONDS) * 1000, MIN_REFRESH_DELAY_SECONDS * 1000);
|
|
39
|
+
}
|
|
40
|
+
|
|
36
41
|
function parseToken(token: string | undefined) {
|
|
37
42
|
// istanbul ignore next
|
|
38
43
|
if (!token) {
|
|
@@ -103,7 +108,7 @@ export function useAccessToken() {
|
|
|
103
108
|
if (token) {
|
|
104
109
|
const tokenData = parseToken(token);
|
|
105
110
|
if (tokenData) {
|
|
106
|
-
const delay =
|
|
111
|
+
const delay = getRefreshDelay(tokenData.timeUntilExpiry);
|
|
107
112
|
clearRefreshTimeout();
|
|
108
113
|
refreshTimeoutRef.current = setTimeout(updateToken, delay);
|
|
109
114
|
}
|
|
@@ -112,14 +117,16 @@ export function useAccessToken() {
|
|
|
112
117
|
return token;
|
|
113
118
|
} catch (error) {
|
|
114
119
|
dispatch({ type: 'FETCH_ERROR', error: error instanceof Error ? error : new Error(String(error)) });
|
|
115
|
-
refreshTimeoutRef.current = setTimeout(updateToken,
|
|
120
|
+
refreshTimeoutRef.current = setTimeout(updateToken, RETRY_DELAY_SECONDS * 1000);
|
|
116
121
|
} finally {
|
|
117
122
|
fetchingRef.current = false;
|
|
118
123
|
}
|
|
119
124
|
}, [clearRefreshTimeout]);
|
|
120
125
|
|
|
121
126
|
const refresh = useCallback(async () => {
|
|
122
|
-
if (fetchingRef.current)
|
|
127
|
+
if (fetchingRef.current) {
|
|
128
|
+
return;
|
|
129
|
+
}
|
|
123
130
|
|
|
124
131
|
fetchingRef.current = true;
|
|
125
132
|
dispatch({ type: 'FETCH_START' });
|
|
@@ -133,7 +140,7 @@ export function useAccessToken() {
|
|
|
133
140
|
if (token) {
|
|
134
141
|
const tokenData = parseToken(token);
|
|
135
142
|
if (tokenData) {
|
|
136
|
-
const delay =
|
|
143
|
+
const delay = getRefreshDelay(tokenData.timeUntilExpiry);
|
|
137
144
|
clearRefreshTimeout();
|
|
138
145
|
refreshTimeoutRef.current = setTimeout(updateToken, delay);
|
|
139
146
|
}
|
|
@@ -143,7 +150,7 @@ export function useAccessToken() {
|
|
|
143
150
|
} catch (error) {
|
|
144
151
|
const typedError = error instanceof Error ? error : new Error(String(error));
|
|
145
152
|
dispatch({ type: 'FETCH_ERROR', error: typedError });
|
|
146
|
-
refreshTimeoutRef.current = setTimeout(updateToken,
|
|
153
|
+
refreshTimeoutRef.current = setTimeout(updateToken, RETRY_DELAY_SECONDS * 1000);
|
|
147
154
|
} finally {
|
|
148
155
|
fetchingRef.current = false;
|
|
149
156
|
}
|
package/src/workos.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { WorkOS } from '@workos-inc/node';
|
|
|
2
2
|
import { WORKOS_API_HOSTNAME, WORKOS_API_KEY, WORKOS_API_HTTPS, WORKOS_API_PORT } from './env-variables.js';
|
|
3
3
|
import { lazy } from './utils.js';
|
|
4
4
|
|
|
5
|
-
export const VERSION = '2.3.
|
|
5
|
+
export const VERSION = '2.3.2';
|
|
6
6
|
|
|
7
7
|
const options = {
|
|
8
8
|
apiHostname: WORKOS_API_HOSTNAME,
|