diff --git a/es/endpoints/oauth.js b/es/endpoints/oauth.js index fce6a7c6e..ceafcb190 100644 --- a/es/endpoints/oauth.js +++ b/es/endpoints/oauth.js @@ -148,8 +148,8 @@ const oauthTokenEndpoint = { } const expiresIn = 3600; // 1 hour const refreshTokenExpiresIn = 86400 * 30; // 30 days - // 如果过期就顺带刷新了 - if (existingToken && (existingToken.refreshExpiresAt < Date.now())) { + // 如果过期就顺带刷新了(refresh token没过期, accessToken过期了) + if (existingToken && (existingToken.refreshExpiresAt > Date.now())) { console.log("Existing token expired, refreshing it"); const newAccessToken = randomUUID(); const newRefreshToken = randomUUID(); diff --git a/es/triggers/index.d.ts b/es/triggers/index.d.ts index 40965ed78..375a9dab8 100644 --- a/es/triggers/index.d.ts +++ b/es/triggers/index.d.ts @@ -1,2 +1,2 @@ -declare const _default: (import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger>)[]; +declare const _default: (import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger>)[]; export default _default; diff --git a/lib/endpoints/oauth.js b/lib/endpoints/oauth.js index a7061f1f3..c8f01edd7 100644 --- a/lib/endpoints/oauth.js +++ b/lib/endpoints/oauth.js @@ -151,8 +151,8 @@ const oauthTokenEndpoint = { } const expiresIn = 3600; // 1 hour const refreshTokenExpiresIn = 86400 * 30; // 30 days - // 如果过期就顺带刷新了 - if (existingToken && (existingToken.refreshExpiresAt < Date.now())) { + // 如果过期就顺带刷新了(refresh token没过期, accessToken过期了) + if (existingToken && (existingToken.refreshExpiresAt > Date.now())) { console.log("Existing token expired, refreshing it"); const newAccessToken = (0, crypto_1.randomUUID)(); const newRefreshToken = (0, crypto_1.randomUUID)(); diff --git a/lib/triggers/index.d.ts b/lib/triggers/index.d.ts index 40965ed78..375a9dab8 100644 --- a/lib/triggers/index.d.ts +++ b/lib/triggers/index.d.ts @@ -1,2 +1,2 @@ -declare const _default: (import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger>)[]; +declare const _default: (import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger>)[]; export default _default; diff --git a/src/endpoints/oauth.ts b/src/endpoints/oauth.ts index e4b50a993..7811bbd18 100644 --- a/src/endpoints/oauth.ts +++ b/src/endpoints/oauth.ts @@ -170,8 +170,8 @@ const oauthTokenEndpoint: Endpoint const expiresIn = 3600; // 1 hour const refreshTokenExpiresIn = 86400 * 30; // 30 days - // 如果过期就顺带刷新了 - if (existingToken && (existingToken.refreshExpiresAt as number < Date.now())) { + // 如果过期就顺带刷新了(refresh token没过期, accessToken过期了) + if (existingToken && (existingToken.refreshExpiresAt as number > Date.now())) { console.log("Existing token expired, refreshing it"); const newAccessToken = randomUUID(); const newRefreshToken = randomUUID();