feat: allow user identifier to be string|number

jasonraimondi · Sep 22, 2021 · c779e6f · c779e6f
1 parent c97f18c
commit c779e6f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/src/entities/user.entity.ts b/src/entities/user.entity.ts
@@ -1,4 +1,6 @@
+export type OAuthUserIdentifier = string | number;
+
 export interface OAuthUser {
-  id: string | number;
+  id: OAuthUserIdentifier;
   [key: string]: any;
 }
diff --git a/src/grants/auth_code.grant.ts b/src/grants/auth_code.grant.ts
@@ -4,6 +4,7 @@ import { CodeChallengeMethod, ICodeChallenge } from "../code_verifiers/verifier"
 import { OAuthAuthCode } from "../entities/auth_code.entity";
 import { OAuthClient } from "../entities/client.entity";
 import { OAuthScope } from "../entities/scope.entity";
+import { OAuthUserIdentifier } from "../entities/user.entity";
 import { OAuthException } from "../exceptions/oauth.exception";
 import { AuthorizationRequest } from "../requests/authorization.request";
 import { RequestInterface } from "../requests/request";
@@ -18,7 +19,7 @@ export interface IAuthCodePayload {
   auth_code_id: string;
   expire_time: number;
   scopes: string[];
-  user_id?: string | null;
+  user_id?: OAuthUserIdentifier | null;
   redirect_uri?: string | null;
   code_challenge?: string | null;
   code_challenge_method?: CodeChallengeMethod | null;
@@ -252,7 +253,7 @@ export class AuthCodeGrant extends AbstractAuthorizedGrant {
   private async issueAuthCode(
     authCodeTTL: DateInterval,
     client: OAuthClient,
-    userIdentifier?: string,
+    userIdentifier?: OAuthUserIdentifier,
     redirectUri?: string,
     codeChallenge?: string,
     codeChallengeMethod?: CodeChallengeMethod,

diff --git a/src/repositories/scope.repository.ts b/src/repositories/scope.repository.ts
@@ -1,5 +1,6 @@
 import { OAuthClient } from "../entities/client.entity";
 import { OAuthScope } from "../entities/scope.entity";
+import { OAuthUserIdentifier } from "../entities/user.entity";
 import { GrantIdentifier } from "../grants/abstract/grant.interface";
 
 export interface OAuthScopeRepository {
@@ -9,6 +10,6 @@ export interface OAuthScopeRepository {
     scopes: OAuthScope[],
     identifier: GrantIdentifier,
     client: OAuthClient,
-    user_id?: string,
+    user_id?: OAuthUserIdentifier,
   ): Promise<OAuthScope[]>;
 }
diff --git a/src/repositories/user.repository.ts b/src/repositories/user.repository.ts
@@ -1,12 +1,12 @@
 import { OAuthClient } from "../entities/client.entity";
-import { OAuthUser } from "../entities/user.entity";
+import { OAuthUser, OAuthUserIdentifier } from "../entities/user.entity";
 import { GrantIdentifier } from "../grants/abstract/grant.interface";
 
 export type ExtraAccessTokenFields = Record<string, string | number | boolean>;
 
 export interface OAuthUserRepository {
   getUserByCredentials(
-    identifier: string,
+    identifier: OAuthUserIdentifier,
     password?: string,
     grantType?: GrantIdentifier,
     client?: OAuthClient,