fixup: circular dependency

Author: AlexTugarev

components/server/src/auth/auth-provider-service.ts

@@ -18,15 +18,13 @@ import { log } from "@gitpod/gitpod-protocol/lib/util/logging";
 import fetch from "node-fetch";
 import { Authorizer } from "../authorization/authorizer";
 import { ApplicationError, ErrorCodes } from "@gitpod/gitpod-protocol/lib/messaging/error";
-import { HostContextProvider } from "./host-context-provider";
 
 @injectable()
 export class AuthProviderService {
     constructor(
         @inject(AuthProviderEntryDB) private readonly authProviderDB: AuthProviderEntryDB,
         @inject(TeamDB) private readonly teamDB: TeamDB,
         @inject(Config) protected readonly config: Config,
-        @inject(HostContextProvider) private readonly hostContexts: HostContextProvider,
         @inject(Authorizer) private readonly auth: Authorizer,
     ) {}
 
@@ -124,22 +122,25 @@ export class AuthProviderService {
         }
 
         // checking for already existing runtime providers
-        const hostContext = this.hostContexts.get(host);
-        if (hostContext) {
-            const builtInExists = hostContext.authProvider.params.ownerId === undefined;
-            log.info(`Attempt to override an existing provider.`, { entry, builtInExists });
+        const isBuiltInProvider = this.isBuiltInProvider(host);
+        if (isBuiltInProvider) {
+            log.info(`Attempt to override an existing provider.`, { entry });
             throw new ApplicationError(ErrorCodes.CONFLICT, `Attempt to override an existing provider.`);
         }
-
         const existing = await this.authProviderDB.findByHost(entry.host);
         if (existing) {
-            log.info(`Attempt to override an existing provider.`, { entry });
+            log.info(`Provider for this host already exists.`, { entry });
             throw new ApplicationError(ErrorCodes.CONFLICT, `Provider for this host already exists.`);
         }
+
         const authProvider = this.initializeNewProvider(entry);
         return await this.authProviderDB.storeAuthProvider(authProvider as AuthProviderEntry, true);
     }
 
+    private isBuiltInProvider(host: string) {
+        return this.config.authProviderConfigs.some((config) => config.host.toLowerCase() === host.toLocaleLowerCase());
+    }
+
     async updateAuthProviderOfUser(userId: string, entry: AuthProviderEntry.UpdateEntry): Promise<AuthProviderEntry> {
         await this.auth.checkPermissionOnUser(userId, "write_info", userId);
 
@@ -181,17 +182,16 @@ export class AuthProviderService {
             throw new ApplicationError(ErrorCodes.BAD_REQUEST, `Host could not be reached.`);
         }
 
-        const hostContext = this.hostContexts.get(host);
-        if (hostContext) {
-            const builtInExists = hostContext.authProvider.params.ownerId === undefined;
-            log.info(`Attempt to override an existing provider.`, { newEntry, builtInExists });
+        const isBuiltInProvider = this.isBuiltInProvider(host);
+        if (isBuiltInProvider) {
+            log.info(`Attempt to override an existing provider.`, { newEntry });
             throw new ApplicationError(ErrorCodes.CONFLICT, `Attempt to override an existing provider.`);
         }
 
         const orgProviders = await this.authProviderDB.findByOrgId(newEntry.organizationId);
         const existing = orgProviders.find((p) => p.host === host);
         if (existing) {
-            log.info(`Attempt to override an existing provider.`, { newEntry });
+            log.info(`Provider for this host already exists.`, { newEntry });
             throw new ApplicationError(ErrorCodes.CONFLICT, `Provider for this host already exists.`);
         }
 
@@ -231,7 +231,7 @@ export class AuthProviderService {
         return await this.authProviderDB.storeAuthProvider(authProvider as AuthProviderEntry, true);
     }
 
-    protected initializeNewProvider(newEntry: AuthProviderEntry.NewEntry): AuthProviderEntry {
+    private initializeNewProvider(newEntry: AuthProviderEntry.NewEntry): AuthProviderEntry {
         const { host, type, clientId, clientSecret } = newEntry;
         let urls;
         switch (type) {
@@ -317,7 +317,7 @@ export class AuthProviderService {
         }
     }
 
-    protected callbackUrl = () => {
+    private callbackUrl = () => {
         const pathname = `/auth/callback`;
         return this.config.hostUrl.with({ pathname }).toString();
     };

components/server/src/auth/authenticator.ts

@@ -16,7 +16,6 @@ import { TokenProvider } from "../user/token-provider";
 import { UserAuthentication } from "../user/user-authentication";
 import { UserService } from "../user/user-service";
 import { AuthFlow, AuthProvider } from "./auth-provider";
-import { AuthProviderService } from "./auth-provider-service";
 import { HostContextProvider } from "./host-context-provider";
 import { SignInJWT } from "./jwt";
 
@@ -29,7 +28,6 @@ export class Authenticator {
     @inject(TeamDB) protected teamDb: TeamDB;
     @inject(HostContextProvider) protected hostContextProvider: HostContextProvider;
     @inject(TokenProvider) protected readonly tokenProvider: TokenProvider;
-    @inject(AuthProviderService) protected readonly authProviderService: AuthProviderService;
     @inject(UserAuthentication) protected readonly userAuthentication: UserAuthentication;
     @inject(SignInJWT) protected readonly signInJWT: SignInJWT;