From 69e40c00b2d80108e1e5440da0bd3bf7a53f70ad Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Tue, 5 Oct 2021 18:21:09 +0200
Subject: [PATCH] auth-backend: remove default bitbucket sign-in provider

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 plugins/auth-backend/api-report.md                  |  4 ++--
 .../src/providers/bitbucket/provider.ts             | 13 +++----------
 plugins/auth-backend/src/providers/factories.ts     |  9 ++-------
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/plugins/auth-backend/api-report.md b/plugins/auth-backend/api-report.md
index 3834388db9..0b9f0eb8c4 100644
--- a/plugins/auth-backend/api-report.md
+++ b/plugins/auth-backend/api-report.md
@@ -120,7 +120,7 @@ export type BitbucketPassportProfile = Profile & {
 // @public (undocumented)
 export type BitbucketProviderOptions = {
   authHandler?: AuthHandler<OAuthResult>;
-  signIn: {
+  signIn?: {
     resolver: SignInResolver<OAuthResult>;
   };
 };
@@ -139,7 +139,7 @@ export const bitbucketUsernameSignInResolver: SignInResolver<BitbucketOAuthResul
 //
 // @public (undocumented)
 export const createBitbucketProvider: (
-  options: BitbucketProviderOptions,
+  options?: BitbucketProviderOptions | undefined,
 ) => AuthProviderFactory;
 
 // Warning: (ae-missing-release-tag) "createGithubProvider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
diff --git a/plugins/auth-backend/src/providers/bitbucket/provider.ts b/plugins/auth-backend/src/providers/bitbucket/provider.ts
index 352e0fc116..3a518a6baa 100644
--- a/plugins/auth-backend/src/providers/bitbucket/provider.ts
+++ b/plugins/auth-backend/src/providers/bitbucket/provider.ts
@@ -253,7 +253,7 @@ export type BitbucketProviderOptions = {
   /**
    * Configure sign-in for this provider, without it the provider can not be used to sign users in.
    */
-  signIn: {
+  signIn?: {
     /**
      * Maps an auth result to a Backstage identity for the user.
      */
@@ -262,7 +262,7 @@ export type BitbucketProviderOptions = {
 };
 
 export const createBitbucketProvider = (
-  options: BitbucketProviderOptions,
+  options?: BitbucketProviderOptions,
 ): AuthProviderFactory => {
   return ({
     providerId,
@@ -289,18 +289,11 @@ export const createBitbucketProvider = (
               profile: makeProfileInfo(fullProfile, params.id_token),
             });
 
-      const signInResolver: SignInResolver<BitbucketOAuthResult> = info =>
-        options.signIn.resolver(info, {
-          catalogIdentityClient,
-          tokenIssuer,
-          logger,
-        });
-
       const provider = new BitbucketAuthProvider({
         clientId,
         clientSecret,
         callbackUrl,
-        signInResolver,
+        signInResolver: options?.signIn?.resolver,
         authHandler,
         tokenIssuer,
         catalogIdentityClient,
diff --git a/plugins/auth-backend/src/providers/factories.ts b/plugins/auth-backend/src/providers/factories.ts
index b8e4b37d0c..c4894f2757 100644
--- a/plugins/auth-backend/src/providers/factories.ts
+++ b/plugins/auth-backend/src/providers/factories.ts
@@ -26,10 +26,7 @@ import { createMicrosoftProvider } from './microsoft';
 import { createOneLoginProvider } from './onelogin';
 import { AuthProviderFactory } from './types';
 import { createAwsAlbProvider } from './aws-alb';
-import {
-  createBitbucketProvider,
-  bitbucketUsernameSignInResolver,
-} from './bitbucket';
+import { createBitbucketProvider } from './bitbucket';
 
 export const factories: { [providerId: string]: AuthProviderFactory } = {
   google: createGoogleProvider(),
@@ -43,7 +40,5 @@ export const factories: { [providerId: string]: AuthProviderFactory } = {
   oidc: createOidcProvider(),
   onelogin: createOneLoginProvider(),
   awsalb: createAwsAlbProvider(),
-  bitbucket: createBitbucketProvider({
-    signIn: { resolver: bitbucketUsernameSignInResolver },
-  }),
+  bitbucket: createBitbucketProvider(),
 };