@@ -8,7 +8,7 @@ import type {
88 Credentials ,
99 JWTClaims ,
1010 SupabaseEnv ,
11- UserIdentity ,
11+ UserClaims ,
1212} from '../types.js'
1313import { timingSafeEqual } from './utils/timing-safe-equal.js'
1414import { resolveEnv } from './resolve-env.js'
@@ -37,7 +37,7 @@ function parseAllowMode(mode: AllowWithKey): {
3737 return { base, keyName }
3838}
3939
40- function claimsToUser ( claims : JWTClaims ) : UserIdentity {
40+ function claimsToUserClaims ( claims : JWTClaims ) : UserClaims {
4141 return {
4242 id : claims . sub ,
4343 role : claims . role ,
@@ -56,7 +56,7 @@ async function tryMode(
5656
5757 switch ( base ) {
5858 case 'always' :
59- return { authType : 'always' , token : null , user : null , claims : null }
59+ return { authType : 'always' , token : null , userClaims : null , claims : null }
6060
6161 case 'public' : {
6262 if ( ! credentials . apikey ) return null
@@ -65,14 +65,24 @@ async function tryMode(
6565 if ( keyName === '*' ) {
6666 for ( const value of Object . values ( keys ) ) {
6767 if ( await timingSafeEqual ( credentials . apikey , value ) ) {
68- return { authType : 'public' , token : null , user : null , claims : null }
68+ return {
69+ authType : 'public' ,
70+ token : null ,
71+ userClaims : null ,
72+ claims : null ,
73+ }
6974 }
7075 }
7176 } else {
7277 const name = keyName ?? 'default'
7378 const value = keys [ name ]
7479 if ( value && ( await timingSafeEqual ( credentials . apikey , value ) ) ) {
75- return { authType : 'public' , token : null , user : null , claims : null }
80+ return {
81+ authType : 'public' ,
82+ token : null ,
83+ userClaims : null ,
84+ claims : null ,
85+ }
7686 }
7787 }
7888 return null
@@ -85,14 +95,24 @@ async function tryMode(
8595 if ( keyName === '*' ) {
8696 for ( const value of Object . values ( keys ) ) {
8797 if ( await timingSafeEqual ( credentials . apikey , value ) ) {
88- return { authType : 'secret' , token : null , user : null , claims : null }
98+ return {
99+ authType : 'secret' ,
100+ token : null ,
101+ userClaims : null ,
102+ claims : null ,
103+ }
89104 }
90105 }
91106 } else {
92107 const name = keyName ?? 'default'
93108 const value = keys [ name ]
94109 if ( value && ( await timingSafeEqual ( credentials . apikey , value ) ) ) {
95- return { authType : 'secret' , token : null , user : null , claims : null }
110+ return {
111+ authType : 'secret' ,
112+ token : null ,
113+ userClaims : null ,
114+ claims : null ,
115+ }
96116 }
97117 }
98118 return null
@@ -111,7 +131,7 @@ async function tryMode(
111131 return {
112132 authType : 'user' ,
113133 token : credentials . token ,
114- user : claimsToUser ( claims ) ,
134+ userClaims : claimsToUserClaims ( claims ) ,
115135 claims,
116136 }
117137 } catch {
0 commit comments