fix merge conflicts

app-config.yaml

@@ -92,11 +92,6 @@ auth:
   providers:
     google:
       development:
-<<<<<<< HEAD
-        appOrigin: 'http://localhost:3000/'
-        secure: false
-=======
->>>>>>> master
         clientId:
           $secret:
             env: AUTH_GOOGLE_CLIENT_ID
@@ -105,11 +100,6 @@ auth:
             env: AUTH_GOOGLE_CLIENT_SECRET
     github:
       development:
-<<<<<<< HEAD
-        appOrigin: 'http://localhost:3000/'
-        secure: false
-=======
->>>>>>> master
         clientId:
           $secret:
             env: AUTH_GITHUB_CLIENT_ID
@@ -121,11 +111,6 @@ auth:
             env: AUTH_GITHUB_ENTERPRISE_INSTANCE_URL
     gitlab:
       development:
-<<<<<<< HEAD
-        appOrigin: 'http://localhost:3000/'
-        secure: false
-=======
->>>>>>> master
         clientId:
           $secret:
             env: AUTH_GITLAB_CLIENT_ID
@@ -136,20 +121,10 @@ auth:
           $secret:
             env: GITLAB_BASE_URL
     saml:
-<<<<<<< HEAD
-      development:
-        entryPoint: 'http://localhost:7001/'
-        issuer: 'passport-saml'
+      entryPoint: 'http://localhost:7001/'
+      issuer: 'passport-saml'
     okta:
       development:
-        appOrigin: 'http://localhost:3000/'
-        secure: false
-=======
-      entryPoint: "http://localhost:7001/"
-      issuer: "passport-saml"
-    okta:
-      development:
->>>>>>> master
         clientId:
           $secret:
             env: AUTH_OKTA_CLIENT_ID
@@ -161,11 +136,6 @@ auth:
             env: AUTH_OKTA_AUDIENCE
     oauth2:
       development:
-<<<<<<< HEAD
-        appOrigin: 'http://localhost:3000/'
-        secure: false
-=======
->>>>>>> master
         clientId:
           $secret:
             env: AUTH_OAUTH2_CLIENT_ID

packages/app/src/App.tsx

@@ -40,11 +40,8 @@ const app = createApp({
         <SignInPage
           {...props}
           providers={['guest', 'custom', ...providers]}
-<<<<<<< HEAD
-=======
           title="Select a sign-in method"
           align="center"
->>>>>>> master
         />
       );
     },

packages/app/src/identityProviders.ts

@@ -19,11 +19,8 @@ import {
   gitlabAuthApiRef,
   oktaAuthApiRef,
   githubAuthApiRef,
-<<<<<<< HEAD
   samlAuthApiRef,
-=======
   microsoftAuthApiRef,
->>>>>>> master
 } from '@backstage/core';
 
 export const providers = [

packages/core-api/src/apis/implementations/auth/index.ts

@@ -19,9 +19,6 @@ export * from './gitlab';
 export * from './google';
 export * from './oauth2';
 export * from './okta';
-<<<<<<< HEAD
 export * from './saml';
-=======
 export * from './auth0';
 export * from './microsoft';
->>>>>>> master

plugins/auth-backend/src/providers/factories.ts

@@ -53,29 +53,7 @@ export const createAuthProviderRouter = (
 
   const router = Router();
 
-<<<<<<< HEAD
-  for (const env of envs) {
-    const envConfig = providerConfig.getConfig(env);
-    console.log(envConfig);
-    const provider = factory(globalConfig, env, envConfig, logger, issuer);
-    if (provider) {
-      envProviders[env] = provider;
-      envIdentifier = provider.identifyEnv;
-    }
-  }
-
-  if (typeof envIdentifier === 'undefined') {
-    throw Error(`No envIdentifier provided for '${providerId}'`);
-  }
-
-  const handler = new EnvironmentHandler(
-    providerId,
-    envProviders,
-    envIdentifier,
-  );
-=======
   const handler = factory({ globalConfig, config, logger, tokenIssuer });
->>>>>>> master
 
   router.get('/start', handler.start.bind(handler));
   router.get('/handler/frame', handler.frameHandler.bind(handler));