Cleanup and fixes after refactoring

app-config.yaml

@@ -239,8 +239,8 @@ auth:
           $env: AUTH_OAUTH2_TOKEN_URL
     oidc:
       development:
-        adUrl:
-          $env: AUTH_OIDC_AD_URL
+        metadataUrl:
+          $env: AUTH_OIDC_METADATA_URL
         clientId:
           $env: AUTH_OIDC_CLIENT_ID
         clientSecret:

packages/app/src/identityProviders.ts

@@ -22,7 +22,7 @@ import {
   samlAuthApiRef,
   microsoftAuthApiRef,
   oneloginAuthApiRef,
-  oidcApiRef,
+  oidcAuthApiRef,
 } from '@backstage/core';
 
 export const providers = [
@@ -30,7 +30,7 @@ export const providers = [
     id: 'oidc-auth-provider',
     title: 'Oidc',
     message: 'Sign In using OpenId Connect',
-    apiRef: oidcApiRef,
+    apiRef: oidcAuthApiRef,
   },
   {
     id: 'google-auth-provider',

packages/core-api/src/apis/definitions/auth.ts

@@ -314,7 +314,7 @@ export const oauth2ApiRef: ApiRef<
 /**
  * Provides authentication for custom OpenID Connect identity providers.
  */
-export const oidcApiRef: ApiRef<
+export const oidcAuthApiRef: ApiRef<
   OAuthApi &
     OpenIdConnectApi &
     ProfileInfoApi &

packages/core/src/api-wrappers/defaultApis.ts

@@ -46,9 +46,11 @@ import {
   SamlAuth,
   oneloginAuthApiRef,
   OneLoginAuth,
-  oidcApiRef,
+  oidcAuthApiRef,
 } from '@backstage/core-api';
 
+import OAuth2Icon from '@material-ui/icons/AcUnit';
+
 export const defaultApis = [
   createApiFactory({
     api: discoveryApiRef,
@@ -155,12 +157,20 @@ export const defaultApis = [
       OneLoginAuth.create({ discoveryApi, oauthRequestApi }),
   }),
   createApiFactory({
-    api: oidcApiRef,
+    api: oidcAuthApiRef,
     deps: {
       discoveryApi: discoveryApiRef,
       oauthRequestApi: oauthRequestApiRef,
     },
     factory: ({ discoveryApi, oauthRequestApi }) =>
-      OAuth2.create({ discoveryApi, oauthRequestApi }),
+      OAuth2.create({
+        discoveryApi,
+        oauthRequestApi,
+        provider: {
+          id: 'oidc',
+          title: 'Your Identity Provider',
+          icon: OAuth2Icon,
+        },
+      }),
   }),
 ];