Merge pull request #6 from ccims/feature/github_node_id

github node id
ccims · Oct 20, 2024 · 9da669b · 9da669b
2 parents d1e7027 + 6226fb5
commit 9da669b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/backend/src/strategies/github-token/github-token.service.ts b/backend/src/strategies/github-token/github-token.service.ts
@@ -93,6 +93,7 @@ export class GithubTokenStrategyService extends Strategy {
     override getImsUserTemplatedValuesForLoginData(loginData: UserLoginData): object {
         return {
             github_id: loginData.data["github_id"],
+            github_node_id: loginData.data["github_node_id"],
             username: loginData.data["username"],
             displayName: loginData.data["displayName"],
             email: loginData.data["email"],
@@ -102,6 +103,7 @@ export class GithubTokenStrategyService extends Strategy {
     override getLoginDataDataForImsUserTemplatedFields(imsUser: object): object | Promise<object> {
         return {
             github_id: imsUser["github_id"],
+            github_node_id: imsUser["github_node_id"],
         };
     }
 
@@ -119,7 +121,8 @@ export class GithubTokenStrategyService extends Strategy {
         token: string,
         strategyInstance: StrategyInstance,
     ): Promise<{
-        github_id: string;
+        github_id: number;
+        github_node_id: string;
         username: string;
         displayName: string;
         email: string;
@@ -129,6 +132,7 @@ export class GithubTokenStrategyService extends Strategy {
         {
             viewer {
                 id
+                databaseId
                 login
                 name
                 email
@@ -152,7 +156,8 @@ export class GithubTokenStrategyService extends Strategy {
         const userData = data.data.viewer;
 
         return {
-            github_id: userData.id,
+            github_id: userData.databaseId,
+            github_node_id: userData.id,
             username: userData.login,
             displayName: userData.name,
             email: userData.email,

diff --git a/backend/src/strategies/github/github.service.ts b/backend/src/strategies/github/github.service.ts
@@ -117,7 +117,7 @@ export class GithubStrategyService extends StrategyUsingPassport {
 
     override async getSyncDataForLoginData(
         loginData: UserLoginData,
-    ): Promise<{ token: string | null; [key: string]: any }> {
+    ): Promise<{ token: string | null;[key: string]: any }> {
         const syncLogins = (
             await this.activeLoginService.findValidForLoginDataSortedByExpiration(loginData, true)
         ).filter((login) => !!login.data["accessToken"]);
@@ -127,6 +127,7 @@ export class GithubStrategyService extends StrategyUsingPassport {
     override getImsUserTemplatedValuesForLoginData(loginData: UserLoginData): object {
         return {
             github_id: loginData.data["github_id"],
+            github_node_id: loginData.data["github_node_id"],
             username: loginData.data["username"],
             displayName: loginData.data["displayName"],
             email: loginData.data["email"],
@@ -136,6 +137,7 @@ export class GithubStrategyService extends StrategyUsingPassport {
     override getLoginDataDataForImsUserTemplatedFields(imsUser: object): object | Promise<object> {
         return {
             github_id: imsUser["github_id"],
+            github_node_id: imsUser["github_node_id"],
         };
     }
 
@@ -189,11 +191,13 @@ export class GithubStrategyService extends StrategyUsingPassport {
         const dataUserLoginData = {
             username,
             github_id: parseInt(profile.id),
+            github_node_id: profile.nodeId,
             email: profile.emails?.[0]?.value,
             displayName: profile.displayName,
         };
         const loginDataCandidates = await this.loginDataService.findForStrategyWithDataContaining(strategyInstance, {
             github_id: parseInt(profile.id),
+            github_node_id: profile.nodeId,
         });
         if (loginDataCandidates.length != 1) {
             this.loggerGithub.debug("Oauth login didn't find unique login data", loginDataCandidates);