open.source/manifold
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tweak server auth to return null instead of undefined

Browse Source
This commit is contained in:
Marshall Polaris 2022-08-12 14:58:32 -07:00
parent 512d02b74a
commit c718b396e0
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
web/lib/firebase/server-auth.ts
View File

@ -81,7 +81,7 @@ const authAndRefreshTokens = async (ctx: RequestContext) => {
// step 0: if you have no refresh token you are logged out // step 0: if you have no refresh token you are logged out
if (refresh == null) { if (refresh == null) {
console.debug('User is unauthenticated.') console.debug('User is unauthenticated.')
return undefined return null
} }
console.debug('User may be authenticated; checking cookies.') console.debug('User may be authenticated; checking cookies.')
@ -107,7 +107,7 @@ const authAndRefreshTokens = async (ctx: RequestContext) => {
} catch (e) { } catch (e) {
// big unexpected problem -- functionally, they are not logged in // big unexpected problem -- functionally, they are not logged in
console.error(e) console.error(e)
return undefined return null
} }
} }
@ -136,9 +136,10 @@ const authAndRefreshTokens = async (ctx: RequestContext) => {
} catch (e) { } catch (e) {
// big unexpected problem -- functionally, they are not logged in // big unexpected problem -- functionally, they are not logged in
console.error(e) console.error(e)
return undefined return null
} }
} }
return null
} }
export const authenticateOnServer = async (ctx: RequestContext) => { export const authenticateOnServer = async (ctx: RequestContext) => {
@ -158,7 +159,7 @@ export const authenticateOnServer = async (ctx: RequestContext) => {
// definitely not supposed to happen, but let's be maximally robust // definitely not supposed to happen, but let's be maximally robust
console.error(e) console.error(e)
} }
return creds return creds ?? null
} }
// note that we might want to define these types more generically if we want better // note that we might want to define these types more generically if we want better