refactor: return undefined from local token verifier

guardian · Jan 9, 2024 · 0c4492c · 0c4492c
1 parent 83e6464
commit 0c4492c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/server/oauth.ts b/server/oauth.ts
@@ -279,7 +279,7 @@ export const performAuthorizationCodeFlow = async (
  */
 export const verifyOAuthCookiesLocally = async (
 	req: Request,
-): Promise<VerifiedOAuthCookies> => {
+): Promise<VerifiedOAuthCookies | undefined> => {
 	const accessTokenCookie = req.signedCookies[OAuthAccessTokenCookieName];
 	const idTokenCookie = req.signedCookies[OAuthIdTokenCookieName];
 
@@ -300,13 +300,7 @@ export const verifyOAuthCookiesLocally = async (
 				accessToken,
 				idToken,
 			};
-		} else {
-			// Access or ID token invalid, return empty object
-			return {};
 		}
-	} else {
-		// No access token or ID token cookie found, return empty object
-		return {};
 	}
 };
 

diff --git a/server/oauthConfig.ts b/server/oauthConfig.ts
@@ -7,8 +7,8 @@ export const OAuthIdTokenCookieName = 'GU_ID_TOKEN';
 export const OAuthStateCookieName = 'GU_oidc_auth_state';
 
 export interface VerifiedOAuthCookies {
-	accessToken?: OktaJwtVerifier.Jwt;
-	idToken?: OktaJwtVerifier.Jwt;
+	accessToken: OktaJwtVerifier.Jwt;
+	idToken: OktaJwtVerifier.Jwt;
 }
 
 export const oauthCookieOptions: CookieOptions = {