core-app-api: switch auth provider icons to be empty by default

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
2021-11-10 10:40:41 +01:00
parent 7ca03b85ab
commit c98c5c3d00
15 changed files with 18 additions and 34 deletions
@@ -59,8 +59,6 @@ import {
  atlassianAuthApiRef,
 } from '@backstage/core-plugin-api';

-import OAuth2Icon from '@material-ui/icons/AcUnit';
-
 export const apis = [
  createApiFactory({
    api: discoveryApiRef,
@@ -226,7 +224,7 @@ export const apis = [
        provider: {
          id: 'oidc',
          title: 'Your Identity Provider',
-          icon: OAuth2Icon,
+          icon: () => null,
        },
        environment: configApi.getOptionalString('auth.environment'),
      }),
@@ -15,7 +15,6 @@
 */

 import MockOAuthApi from './MockOAuthApi';
-import PowerIcon from '@material-ui/icons/Power';

 describe('MockOAuthApi', () => {
  it('should trigger all requests', async () => {
@@ -24,13 +23,13 @@ describe('MockOAuthApi', () => {

    const authHandler1 = jest.fn().mockImplementation(() => authResult);
    const requester1 = mock.createAuthRequester({
-      provider: { icon: PowerIcon, title: 'Test' },
+      provider: { icon: () => null, title: 'Test' },
      onAuthRequest: authHandler1,
    });

    const authHandler2 = jest.fn().mockResolvedValue('other');
    const requester2 = mock.createAuthRequester({
-      provider: { icon: PowerIcon, title: 'Test' },
+      provider: { icon: () => null, title: 'Test' },
      onAuthRequest: authHandler2,
    });

@@ -67,13 +66,13 @@ describe('MockOAuthApi', () => {

    const authHandler1 = jest.fn();
    const requester1 = mock.createAuthRequester({
-      provider: { icon: PowerIcon, title: 'Test' },
+      provider: { icon: () => null, title: 'Test' },
      onAuthRequest: authHandler1,
    });

    const authHandler2 = jest.fn();
    const requester2 = mock.createAuthRequester({
-      provider: { icon: PowerIcon, title: 'Test' },
+      provider: { icon: () => null, title: 'Test' },
      onAuthRequest: authHandler2,
    });

@@ -14,7 +14,6 @@
 * limitations under the License.
 */

-import ProviderIcon from '@material-ui/icons/AcUnit';
 import { OAuthRequestManager } from './OAuthRequestManager';

 describe('OAuthRequestManager', () => {
@@ -27,7 +26,7 @@ describe('OAuthRequestManager', () => {
    const requester = manager.createAuthRequester({
      provider: {
        title: 'My Provider',
-        icon: ProviderIcon,
+        icon: () => null,
      },
      onAuthRequest: async () => 'hello',
    });
@@ -14,7 +14,6 @@
 * limitations under the License.
 */

-import AtlassianIcon from '@material-ui/icons/AcUnit';
 import { atlassianAuthApiRef } from '@backstage/core-plugin-api';
 import { OAuth2 } from '../oauth2';
 import { OAuthApiCreateOptions } from '../types';
@@ -22,7 +21,7 @@ import { OAuthApiCreateOptions } from '../types';
 const DEFAULT_PROVIDER = {
  id: 'atlassian',
  title: 'Atlassian',
-  icon: AtlassianIcon,
+  icon: () => null,
 };

 /**
@@ -14,7 +14,6 @@
 * limitations under the License.
 */

-import Auth0Icon from '@material-ui/icons/AcUnit';
 import { auth0AuthApiRef } from '@backstage/core-plugin-api';
 import { OAuth2 } from '../oauth2';
 import { OAuthApiCreateOptions } from '../types';
@@ -22,7 +21,7 @@ import { OAuthApiCreateOptions } from '../types';
 const DEFAULT_PROVIDER = {
  id: 'auth0',
  title: 'Auth0',
-  icon: Auth0Icon,
+  icon: () => null,
 };

 /**
@@ -14,7 +14,6 @@
 * limitations under the License.
 */

-import BitbucketIcon from '@material-ui/icons/FormatBold';
 import {
  BackstageIdentity,
  bitbucketAuthApiRef,
@@ -37,7 +36,7 @@ export type BitbucketAuthResponse = {
 const DEFAULT_PROVIDER = {
  id: 'bitbucket',
  title: 'Bitbucket',
-  icon: BitbucketIcon,
+  icon: () => null,
 };

 /**
@@ -14,7 +14,6 @@
 * limitations under the License.
 */

-import GithubIcon from '@material-ui/icons/AcUnit';
 import { DefaultAuthConnector } from '../../../../lib/AuthConnector';
 import { GithubSession } from './types';
 import {
@@ -48,7 +47,7 @@ export type GithubAuthResponse = {
 const DEFAULT_PROVIDER = {
  id: 'github',
  title: 'GitHub',
-  icon: GithubIcon,
+  icon: () => null,
 };

 /**
@@ -14,7 +14,6 @@
 * limitations under the License.
 */

-import GitlabIcon from '@material-ui/icons/AcUnit';
 import { gitlabAuthApiRef } from '@backstage/core-plugin-api';
 import { OAuth2 } from '../oauth2';
 import { OAuthApiCreateOptions } from '../types';
@@ -22,7 +21,7 @@ import { OAuthApiCreateOptions } from '../types';
 const DEFAULT_PROVIDER = {
  id: 'gitlab',
  title: 'GitLab',
-  icon: GitlabIcon,
+  icon: () => null,
 };

 /**
@@ -14,7 +14,6 @@
 * limitations under the License.
 */

-import GoogleIcon from '@material-ui/icons/AcUnit';
 import { googleAuthApiRef } from '@backstage/core-plugin-api';
 import { OAuth2 } from '../oauth2';
 import { OAuthApiCreateOptions } from '../types';
@@ -22,7 +21,7 @@ import { OAuthApiCreateOptions } from '../types';
 const DEFAULT_PROVIDER = {
  id: 'google',
  title: 'Google',
-  icon: GoogleIcon,
+  icon: () => null,
 };

 const SCOPE_PREFIX = 'https://www.googleapis.com/auth/';
@@ -14,7 +14,6 @@
 * limitations under the License.
 */

-import MicrosoftIcon from '@material-ui/icons/AcUnit';
 import { microsoftAuthApiRef } from '@backstage/core-plugin-api';
 import { OAuth2 } from '../oauth2';
 import { OAuthApiCreateOptions } from '../types';
@@ -22,7 +21,7 @@ import { OAuthApiCreateOptions } from '../types';
 const DEFAULT_PROVIDER = {
  id: 'microsoft',
  title: 'Microsoft',
-  icon: MicrosoftIcon,
+  icon: () => null,
 };

 /**
@@ -14,7 +14,6 @@
 * limitations under the License.
 */

-import OAuth2Icon from '@material-ui/icons/AcUnit';
 import { DefaultAuthConnector } from '../../../../lib/AuthConnector';
 import { RefreshingAuthSessionManager } from '../../../../lib/AuthSessionManager';
 import { SessionManager } from '../../../../lib/AuthSessionManager/types';
@@ -51,7 +50,7 @@ export type OAuth2Response = {
 const DEFAULT_PROVIDER = {
  id: 'oauth2',
  title: 'Your Identity Provider',
-  icon: OAuth2Icon,
+  icon: () => null,
 };

 /**
@@ -14,7 +14,6 @@
 * limitations under the License.
 */

-import OktaIcon from '@material-ui/icons/AcUnit';
 import { oktaAuthApiRef } from '@backstage/core-plugin-api';
 import { OAuth2 } from '../oauth2';
 import { OAuthApiCreateOptions } from '../types';
@@ -22,7 +21,7 @@ import { OAuthApiCreateOptions } from '../types';
 const DEFAULT_PROVIDER = {
  id: 'okta',
  title: 'Okta',
-  icon: OktaIcon,
+  icon: () => null,
 };

 const OKTA_OIDC_SCOPES: Set<String> = new Set([
@@ -14,7 +14,6 @@
 * limitations under the License.
 */

-import OneLoginIcon from '@material-ui/icons/AcUnit';
 import {
  oneloginAuthApiRef,
  OAuthRequestApi,
@@ -33,7 +32,7 @@ type CreateOptions = {
 const DEFAULT_PROVIDER = {
  id: 'onelogin',
  title: 'onelogin',
-  icon: OneLoginIcon,
+  icon: () => null,
 };

 const OIDC_SCOPES: Set<String> = new Set([
@@ -14,7 +14,6 @@
 * limitations under the License.
 */

-import SamlIcon from '@material-ui/icons/AcUnit';
 import { DirectAuthConnector } from '../../../../lib/AuthConnector';
 import { SessionManager } from '../../../../lib/AuthSessionManager/types';
 import {
@@ -42,7 +41,7 @@ export type SamlAuthResponse = {
 const DEFAULT_PROVIDER = {
  id: 'saml',
  title: 'SAML',
-  icon: SamlIcon,
+  icon: () => null,
 };

 /**
@@ -14,7 +14,6 @@
 * limitations under the License.
 */

-import ProviderIcon from '@material-ui/icons/AcUnit';
 import { DefaultAuthConnector } from './DefaultAuthConnector';
 import MockOAuthApi from '../../apis/implementations/OAuthRequestApi/MockOAuthApi';
 import * as loginPopup from '../loginPopup';
@@ -29,7 +28,7 @@ const defaultOptions = {
  provider: {
    id: 'my-provider',
    title: 'My Provider',
-    icon: ProviderIcon,
+    icon: () => null,
  },
  oauthRequestApi: new MockOAuthApi(),
  sessionTransform: ({ expiresInSeconds, ...res }: any) => ({