fix refresh token not persisting

MarcoMadera · Apr 8, 2024 · e615df1 · e615df1
1 parent c8ec623
commit e615df1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/pages/api/spotify-refresh.ts b/pages/api/spotify-refresh.ts
@@ -23,11 +23,13 @@ export default async function refresh(
     NEXT_PUBLIC_SPOTIFY_CLIENT_ID: client_id = "",
     SPOTIFY_CLIENT_SECRET: client_secret = "",
   } = process.env;
+  const body = req.body as IRefreshBody;
   const context = { req, res };
   const refreshTokenFromCookie = takeCookie(REFRESH_TOKEN_COOKIE, context);
-  const body = req.body as IRefreshBody;
+  const refreshToken = body.refreshToken ?? refreshTokenFromCookie;
+
   try {
-    if (!body.refreshToken && !refreshTokenFromCookie) {
+    if (!refreshToken) {
       throw new ApiError(400, "Bad Request");
     }
 
@@ -76,12 +78,14 @@ export default async function refresh(
       age: expireCookieDate.getTime(),
       context,
     });
+
     makeCookie({
       name: REFRESH_TOKEN_COOKIE,
-      value: body.refreshToken ?? refreshTokenFromCookie ?? "",
+      value: refreshToken,
       age: expireCookieDate.getTime(),
       context,
     });
+
     makeCookie({
       name: EXPIRE_TOKEN_COOKIE,
       value: data.expires_in.toString(),

diff --git a/utils/spotifyCalls/refreshAccessToken.ts b/utils/spotifyCalls/refreshAccessToken.ts
@@ -29,11 +29,6 @@ export async function refreshAccessToken(
   const data = await handleJsonResponse<IRefreshAccessTokenResponse>(response);
 
   if (data) {
-    makeCookie({
-      name: REFRESH_TOKEN_COOKIE,
-      value: data.refresh_token,
-      context,
-    });
     makeCookie({
       name: ACCESS_TOKEN_COOKIE,
       value: data.access_token,