refactor: apply review suggestions

Signed-off-by: Camila Belo <camilaibs@gmail.com>

plugins/auth-backend/api-report.md

@@ -14,7 +14,6 @@ import { AwsAlbResult as AwsAlbResult_2 } from '@backstage/plugin-auth-backend-m
 import { AzureEasyAuthResult } from '@backstage/plugin-auth-backend-module-azure-easyauth-provider';
 import { BackendFeature } from '@backstage/backend-plugin-api';
 import { BackstageSignInResult } from '@backstage/plugin-auth-node';
-import { bitbucketServerSignInResolvers } from '@backstage/plugin-auth-backend-module-bitbucket-server-provider';
 import { CacheService } from '@backstage/backend-plugin-api';
 import { CatalogApi } from '@backstage/catalog-client';
 import { ClientAuthResponse } from '@backstage/plugin-auth-node';
@@ -443,7 +442,9 @@ export const providers: Readonly<{
           }
         | undefined,
     ) => AuthProviderFactory_2;
-    resolvers: Readonly<bitbucketServerSignInResolvers>;
+    resolvers: Readonly<{
+      emailMatchingUserEntityProfileEmail: () => SignInResolver_2<BitbucketServerOAuthResult>;
+    }>;
   }>;
   cfAccess: Readonly<{
     create: (options: {

plugins/auth-backend/src/providers/bitbucketServer/provider.ts

@@ -85,5 +85,32 @@ export const bitbucketServer = createAuthProviderIntegration({
       signInResolver: adaptLegacyOAuthSignInResolver(options?.signIn?.resolver),
     });
   },
-  resolvers: bitbucketServerSignInResolvers,
+  resolvers: {
+    /**
+     * Looks up the user by matching their email to the entity email.
+     */
+    emailMatchingUserEntityProfileEmail:
+      (): SignInResolver<BitbucketServerOAuthResult> => {
+        const resolver =
+          bitbucketServerSignInResolvers.emailMatchingUserEntityProfileEmail();
+        return async (info, ctx) => {
+          return resolver(
+            {
+              profile: info.profile,
+              result: {
+                fullProfile: info.result.fullProfile,
+                session: {
+                  accessToken: info.result.accessToken,
+                  tokenType: info.result.params.token_type ?? 'bearer',
+                  scope: info.result.params.scope,
+                  expiresInSeconds: info.result.params.expires_in,
+                  refreshToken: info.result.refreshToken,
+                },
+              },
+            },
+            ctx,
+          );
+        };
+      },
+  },
 });