diff --git a/packages/better-auth/src/api/routes/account.ts b/packages/better-auth/src/api/routes/account.ts index cefdf10970..ca539b41ed 100644 --- a/packages/better-auth/src/api/routes/account.ts +++ b/packages/better-auth/src/api/routes/account.ts @@ -535,9 +535,11 @@ export const getAccessToken = createAuthEndpoint( accessTokenExpired && provider.refreshAccessToken ) { - newTokens = await provider.refreshAccessToken( - account.refreshToken as string, + const refreshToken = await decryptOAuthToken( + account.refreshToken, + ctx.context, ); + newTokens = await provider.refreshAccessToken(refreshToken); await ctx.context.internalAdapter.updateAccount(account.id, { accessToken: await setTokenUtil(newTokens.accessToken, ctx.context), accessTokenExpiresAt: newTokens.accessTokenExpiresAt, @@ -546,10 +548,9 @@ export const getAccessToken = createAuthEndpoint( }); } const tokens = { - accessToken: await decryptOAuthToken( - newTokens?.accessToken ?? account.accessToken ?? "", - ctx.context, - ), + accessToken: + newTokens?.accessToken ?? + (await decryptOAuthToken(account.accessToken ?? "", ctx.context)), accessTokenExpiresAt: newTokens?.accessTokenExpiresAt ?? account.accessTokenExpiresAt ??