updated to use IdentityProvider

imolorhe · imolorhe · commit 3352bf8d70e0 · 2025-10-06T21:00:45.000Z
diff --git a/packages/altair-api-utils/src/client.ts b/packages/altair-api-utils/src/client.ts
@@ -18,16 +18,16 @@ import {
   QueryItemRevision,
   AiChatSession,
   AiChatMessage,
+  IdentityProvider,
 } from '@altairgraphql/db';
-import { AltairConfig } from 'altair-graphql-core/build/config';
+import { AltairConfig, getAltairConfig } from 'altair-graphql-core/build/config';
 import { IPlan, IPlanInfo, IUserProfile, IUserStats } from './user';
 import { ICreateTeamDto, ICreateTeamMembershipDto, IUpdateTeamDto } from './team';
 import { firstValueFrom, from, Observable, Subject } from 'rxjs';
 import { map, switchMap, take } from 'rxjs/operators';
 import { ReturnedWorkspace } from './workspace';
 import { ConfigEnvironment } from 'altair-graphql-core/build/config/environment';
 import { UrlConfig } from 'altair-graphql-core/build/config/urls';
-import { getAltairConfig } from 'altair-graphql-core/build/config';
 import { IRateMessageDto, ISendMessageDto } from './ai';
 import { IAvailableCredits } from 'altair-graphql-core/build/types/state/account.interfaces';
 export type FullQueryCollection = QueryCollection & {
@@ -126,7 +126,10 @@ export class APIClient {
     return String.fromCharCode(...array);
   }
 
-  private getPopupUrl(nonce: string, provider: 'google' | 'github' = 'google') {
+  private getPopupUrl(
+    nonce: string,
+    provider: IdentityProvider = IdentityProvider.GOOGLE
+  ) {
     const url = new URL(this.urlConfig.loginClient);
     url.searchParams.append('nonce', nonce);
     url.searchParams.append('sc', location.origin);
@@ -155,13 +158,18 @@ export class APIClient {
     return user;
   }
 
-  async signinWithPopup(provider: 'google' | 'github' = 'google') {
-    const token = await timeout(this.signinWithPopupGetToken(provider), SignInTimeout);
+  async signinWithPopup(provider: IdentityProvider = IdentityProvider.GOOGLE) {
+    const token = await timeout(
+      this.signinWithPopupGetToken(provider),
+      SignInTimeout
+    );
 
     return this.signInWithCustomToken(token);
   }
 
-  private async signinWithPopupGetToken(provider: 'google' | 'github' = 'google') {
+  private async signinWithPopupGetToken(
+    provider: IdentityProvider = IdentityProvider.GOOGLE
+  ) {
     const nonce = this.nonce();
     const popup = window.open(this.getPopupUrl(nonce, provider), '_blank');
     if (!popup) {
diff --git a/packages/altair-api-utils/src/constants.ts b/packages/altair-api-utils/src/constants.ts
@@ -1,4 +1,3 @@
-export const OAUTH_POPUP_CALLBACK_MESSAGE_TYPE =
-  'altairgql:oauth:callback:response';
+export const OAUTH_POPUP_CALLBACK_MESSAGE_TYPE = 'altairgql:oauth:callback:response';
 
 export const ALTAIR_API_USER_TOKEN_STORAGE_KEY = 'ALTAIR-API-USER-TOKEN';
diff --git a/packages/altair-api/package.json b/packages/altair-api/package.json
@@ -51,7 +51,7 @@
     "@nestjs/schematics": "^10.1.2",
     "@nestjs/testing": "^10.3.10",
     "@types/bcrypt": "^5.0.2",
-    "@types/express": "^4.17.13",
+    "@types/express": "^4.17.21",
     "@types/jest": "^28.1.8",
     "@types/newrelic": "^9.14.4",
     "@types/node": "^20.14.10",
diff --git a/packages/altair-api/src/auth/guards/google-oauth.guard.ts b/packages/altair-api/src/auth/guards/google-oauth.guard.ts
@@ -1,7 +1,6 @@
-import { ExecutionContext, Injectable } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
-import { AuthGuard, IAuthModuleOptions } from '@nestjs/passport';
-import { Request } from 'express';
+import { AuthGuard } from '@nestjs/passport';
 
 @Injectable()
 export class GoogleOAuthGuard extends AuthGuard('google') {
diff --git a/packages/altair-app/src/app/modules/altair/components/account-dialog/account-dialog.component.html b/packages/altair-app/src/app/modules/altair/components/account-dialog/account-dialog.component.html
@@ -23,12 +23,16 @@ <h2>Login to get started</h2>
               >Learn more <app-icon name="info"
             /></a>
           </p>
-          <button class="btn btn--primary" (click)="submitLogin('google')">
-            {{ 'SIGNIN_WITH_GOOGLE' | translate }}
-          </button>
-          <button class="btn btn--primary" (click)="submitLogin('github')" style="margin-top: 10px;">
-            Sign in with GitHub
-          </button>
+          <div class="account-dialog__signin-actions">
+            <button class="btn btn--bordered" (click)="submitLogin('GOOGLE')">
+              <!-- <app-icon name="google"></app-icon> -->
+              {{ 'SIGNIN_WITH_GOOGLE' | translate }}
+            </button>
+            <button class="btn btn--bordered" (click)="submitLogin('GITHUB')">
+              <app-icon name="github"></app-icon>
+              {{ 'SIGNIN_WITH_GITHUB' | translate }}
+            </button>
+          </div>
         </div>
       </div>
     }
diff --git a/packages/altair-app/src/app/modules/altair/components/account-dialog/account-dialog.component.ts b/packages/altair-app/src/app/modules/altair/components/account-dialog/account-dialog.component.ts
@@ -11,6 +11,7 @@ import { AccountState } from 'altair-graphql-core/build/types/state/account.inte
 import { environment } from 'environments/environment';
 import { apiClient } from '../../services/api/api.service';
 import { externalLink } from '../../utils';
+import { IdentityProvider } from '@altairgraphql/db';
 
 @Component({
   selector: 'app-account-dialog',
@@ -22,10 +23,10 @@ export class AccountDialogComponent {
   @Input() showDialog = true;
   @Input() account: AccountState | undefined;
   @Output() toggleDialogChange = new EventEmitter<boolean>();
-  @Output() handleLoginChange = new EventEmitter<'google' | 'github'>();
+  @Output() handleLoginChange = new EventEmitter<IdentityProvider>();
   @Output() logoutChange = new EventEmitter();
 
-  submitLogin(provider: 'google' | 'github' = 'google') {
+  submitLogin(provider: IdentityProvider = IdentityProvider.GOOGLE) {
     this.handleLoginChange.emit(provider);
   }
   async openBillingPage(e: MouseEvent) {
diff --git a/packages/altair-app/src/app/modules/altair/containers/altair/altair.component.ts b/packages/altair-app/src/app/modules/altair/containers/altair/altair.component.ts
@@ -79,7 +79,7 @@ import {
 } from 'altair-graphql-core/build/types/state/workspace.interface';
 import { getWorkspaces, WorkspaceOption } from '../../store';
 import { CollectionsMetaState } from 'altair-graphql-core/build/types/state/collections-meta.interfaces';
-import { QueryItemRevision } from '@altairgraphql/db';
+import { QueryItemRevision, IdentityProvider } from '@altairgraphql/db';
 import { consumeQueryParam } from '../../utils/url';
 
 @UntilDestroy({ checkProperties: true })
@@ -844,7 +844,7 @@ export class AltairComponent {
     this.store.dispatch(new accountActions.LoadTeamsAction());
   }
 
-  accountLogin(provider?: 'google' | 'github') {
+  accountLogin(provider?: IdentityProvider) {
     this.store.dispatch(new accountActions.LoginAccountAction({ provider }));
   }
 
diff --git a/packages/altair-app/src/app/modules/altair/services/account/account.service.ts b/packages/altair-app/src/app/modules/altair/services/account/account.service.ts
@@ -5,26 +5,27 @@ import { EMPTY, from } from 'rxjs';
 import { isElectronApp } from '../../utils';
 import { apiClient } from '../api/api.service';
 import { ElectronAppService } from '../electron-app/electron-app.service';
+import { IdentityProvider } from '@altairgraphql/db';
 
 @Injectable({
   providedIn: 'root',
 })
 export class AccountService {
   constructor(private electronApp: ElectronAppService) {}
 
-  private async signin(provider: 'google' | 'github' = 'google') {
+  private async signin(provider: IdentityProvider = IdentityProvider.GOOGLE) {
     if (isElectronApp()) {
       const authToken = await this.electronApp.getAuthToken();
       return apiClient.signInWithCustomToken(authToken);
     }
 
     return apiClient.signinWithPopup(provider);
   }
-  async accountLogin(provider: 'google' | 'github' = 'google') {
+  async accountLogin(provider: IdentityProvider = IdentityProvider.GOOGLE) {
     return this.signin(provider);
   }
 
-  accountLogin$(provider: 'google' | 'github' = 'google') {
+  accountLogin$(provider: IdentityProvider = IdentityProvider.GOOGLE) {
     return from(this.accountLogin(provider));
   }
 
diff --git a/packages/altair-app/src/app/modules/altair/store/account/account.action.ts b/packages/altair-app/src/app/modules/altair/store/account/account.action.ts
@@ -3,6 +3,7 @@ import {
   AccountState,
   Team,
 } from 'altair-graphql-core/build/types/state/account.interfaces';
+import { IdentityProvider } from '@altairgraphql/db';
 
 export const LOGIN_ACCOUNT = 'LOGIN_ACCOUNT';
 export const ACCOUNT_IS_LOGGED_IN = 'ACCOUNT_IS_LOGGED_IN';
@@ -16,7 +17,7 @@ export const ACCOUNT_CHECKED_INIT = 'ACCOUNT_CHECKED_INIT';
 export class LoginAccountAction implements NGRXAction {
   readonly type = LOGIN_ACCOUNT;
 
-  constructor(public payload?: { provider?: 'google' | 'github' }) {}
+  constructor(public payload?: { provider?: IdentityProvider }) {}
 }
 
 export class AccountCheckedInitAction implements NGRXAction {
diff --git a/packages/altair-app/src/assets/i18n/default.json b/packages/altair-app/src/assets/i18n/default.json
@@ -230,6 +230,7 @@
   "REGISTER_TAB": "Register",
   "LOGOUT_TEXT": "Logout",
   "SIGNIN_WITH_GOOGLE": "Signin with Google",
+  "SIGNIN_WITH_GITHUB": "Signin with GitHub",
   "CLOUD_SYNC_TEXT": "Synced to the cloud",
   "TEAMS_TEXT": "Teams",
   "BILLING_TEXT": "Billing",
diff --git a/packages/altair-app/src/scss/components/_account-dialog.scss b/packages/altair-app/src/scss/components/_account-dialog.scss
@@ -34,3 +34,8 @@
   font-weight: 600;
   font-size: fontsize(14);
 }
+
+.account-dialog__signin-actions {
+  display: flex;
+  gap: 10px;
+}
diff --git a/packages/altair-db/prisma/migrations/20251006052719_add_github_identity_provider/migration.sql b/packages/altair-db/prisma/migrations/20251006052719_add_github_identity_provider/migration.sql
diff --git a/packages/altair-db/src/client.ts b/packages/altair-db/src/client.ts
@@ -1 +1,5 @@
+import { IdentityProvider } from '@prisma/client';
+
+export const IDENTITY_PROVIDERS = IdentityProvider;
+
 export * from '@prisma/client';
diff --git a/packages/login-redirect/package.json b/packages/login-redirect/package.json
@@ -3,6 +3,7 @@
   "version": "8.3.0",
   "dependencies": {
     "@altairgraphql/api-utils": "workspace:*",
+    "@altairgraphql/db": "workspace:*",
     "altair-graphql-core": "workspace:*"
   },
   "devDependencies": {
diff --git a/packages/login-redirect/src/login-redirect.ts b/packages/login-redirect/src/login-redirect.ts
@@ -2,6 +2,14 @@ import { OAUTH_POPUP_CALLBACK_MESSAGE_TYPE } from '@altairgraphql/api-utils/buil
 import { closeWindow, getValidSource, isValidOpener } from './helpers';
 import { getAltairConfig } from 'altair-graphql-core/build/config';
 
+// TODO: For some reason, importing from altair-db causes issues. Strangely this only seems to affect login-redirect package.
+// Getting src/login-redirect.ts (4:2): "IDENTITY_PROVIDERS" is not exported by "../altair-db/build/client.js", imported by "src/login-redirect.ts".
+// Will investigate later.
+const IDENTITY_PROVIDERS = {
+  GOOGLE: 'GOOGLE',
+  GITHUB: 'GITHUB',
+} as const;
+type IdentityProvider = (typeof IDENTITY_PROVIDERS)[keyof typeof IDENTITY_PROVIDERS];
 const OAUTH_NONCE_KEY = 'altairgql:oauth:nonce:key';
 
 const getNonce = () => {
@@ -66,12 +74,12 @@ const getRedirectResult = () => {
 
 const getProvider = () => {
   const params = new URLSearchParams(window.location.search);
-  return params.get('provider') || 'google';
+  return (params.get('provider') as IdentityProvider) || IDENTITY_PROVIDERS.GOOGLE;
 };
 
-const signInWithRedirect = (apiBaseUrl: string, provider: string) => {
+const signInWithRedirect = (apiBaseUrl: string, provider: IdentityProvider) => {
   const state = location.href;
-  const loginUrl = new URL(`/auth/${provider}/login`, apiBaseUrl);
+  const loginUrl = new URL(`/auth/${provider.toLowerCase()}/login`, apiBaseUrl);
   loginUrl.searchParams.append('state', state);
 
   return location.replace(loginUrl.href);
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ import {`
`79`	`79`	`} from 'altair-graphql-core/build/types/state/workspace.interface';`
`80`	`80`	`import { getWorkspaces, WorkspaceOption } from '../../store';`
`81`	`81`	`import { CollectionsMetaState } from 'altair-graphql-core/build/types/state/collections-meta.interfaces';`
`82`		`-import { QueryItemRevision } from '@altairgraphql/db';`
	`82`	`+import { QueryItemRevision, IdentityProvider } from '@altairgraphql/db';`
`83`	`83`	`import { consumeQueryParam } from '../../utils/url';`
`84`	`84`
`85`	`85`	`@UntilDestroy({ checkProperties: true })`
`@@ -844,7 +844,7 @@ export class AltairComponent {`
`844`	`844`	`this.store.dispatch(new accountActions.LoadTeamsAction());`
`845`	`845`	`}`
`846`	`846`
`847`		`- accountLogin(provider?: 'google' \| 'github') {`
	`847`	`+ accountLogin(provider?: IdentityProvider) {`
`848`	`848`	`this.store.dispatch(new accountActions.LoginAccountAction({ provider }));`
`849`	`849`	`}`
`850`	`850`