From 388fd9bb7f1ec165ed938ab7abe314f97d404e32 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Fri, 3 Dec 2021 10:21:01 +0100
Subject: [PATCH] chore: fixing some code review comments

Signed-off-by: blam <ben@blam.sh>
---
 .../core-components/src/layout/SignInPage/SignInPage.tsx  | 2 +-
 .../core-components/src/layout/SignInPage/UserIdentity.ts | 4 ++--
 .../src/layout/SignInPage/auth0Provider.tsx               | 4 ++--
 .../src/layout/SignInPage/commonProvider.tsx              | 4 ++--
 .../src/layout/SignInPage/customProvider.tsx              | 8 +++-----
 packages/core-plugin-api/src/apis/definitions/auth.ts     | 2 +-
 plugins/auth-backend/src/providers/index.ts               | 2 ++
 plugins/auth-backend/src/providers/oidc/provider.ts       | 2 ++
 8 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/packages/core-components/src/layout/SignInPage/SignInPage.tsx b/packages/core-components/src/layout/SignInPage/SignInPage.tsx
index 3a068decd5..304e427f33 100644
--- a/packages/core-components/src/layout/SignInPage/SignInPage.tsx
+++ b/packages/core-components/src/layout/SignInPage/SignInPage.tsx
@@ -136,7 +136,7 @@ export const SingleSignInPage = ({
 
       const profile = await authApi.getProfile();
       onSignInSuccess(
-        UserIdentity.from({
+        UserIdentity.create({
           identity: identityResponse.identity,
           authApi,
           profile,
diff --git a/packages/core-components/src/layout/SignInPage/UserIdentity.ts b/packages/core-components/src/layout/SignInPage/UserIdentity.ts
index 088f76e60e..1461c48a49 100644
--- a/packages/core-components/src/layout/SignInPage/UserIdentity.ts
+++ b/packages/core-components/src/layout/SignInPage/UserIdentity.ts
@@ -32,11 +32,11 @@ export class UserIdentity implements IdentityApi {
     return new GuestUserIdentity();
   }
 
-  static fromLegacy({ result }: { result: SignInResult }) {
+  static fromLegacy(result: SignInResult) {
     return LegacyUserIdentity.fromResult(result);
   }
 
-  static from(options: {
+  static create(options: {
     identity: BackstageUserIdentity;
     authApi: ProfileInfoApi & BackstageIdentityApi & SessionApi;
     /**
diff --git a/packages/core-components/src/layout/SignInPage/auth0Provider.tsx b/packages/core-components/src/layout/SignInPage/auth0Provider.tsx
index 8e2728a95e..739c3709a9 100644
--- a/packages/core-components/src/layout/SignInPage/auth0Provider.tsx
+++ b/packages/core-components/src/layout/SignInPage/auth0Provider.tsx
@@ -46,7 +46,7 @@ const Component: ProviderComponent = ({ onSignInSuccess }) => {
       const profile = await auth0AuthApi.getProfile();
 
       onSignInSuccess(
-        UserIdentity.from({
+        UserIdentity.create({
           identity: identityResponse.identity,
           authApi: auth0AuthApi,
           profile,
@@ -85,7 +85,7 @@ const loader: ProviderLoader = async apis => {
   }
 
   const profile = await auth0AuthApi.getProfile();
-  return UserIdentity.from({
+  return UserIdentity.create({
     identity: identityResponse.identity,
     authApi: auth0AuthApi,
     profile,
diff --git a/packages/core-components/src/layout/SignInPage/commonProvider.tsx b/packages/core-components/src/layout/SignInPage/commonProvider.tsx
index 48dd7df62c..8f426a3907 100644
--- a/packages/core-components/src/layout/SignInPage/commonProvider.tsx
+++ b/packages/core-components/src/layout/SignInPage/commonProvider.tsx
@@ -48,7 +48,7 @@ const Component: ProviderComponent = ({ config, onSignInSuccess }) => {
       const profile = await authApi.getProfile();
 
       onSignInSuccess(
-        UserIdentity.from({
+        UserIdentity.create({
           identity: identityResponse.identity,
           profile,
           authApi,
@@ -89,7 +89,7 @@ const loader: ProviderLoader = async (apis, apiRef) => {
 
   const profile = await authApi.getProfile();
 
-  return UserIdentity.from({
+  return UserIdentity.create({
     identity: identityResponse.identity,
     profile,
     authApi,
diff --git a/packages/core-components/src/layout/SignInPage/customProvider.tsx b/packages/core-components/src/layout/SignInPage/customProvider.tsx
index 9863234a06..13ba906079 100644
--- a/packages/core-components/src/layout/SignInPage/customProvider.tsx
+++ b/packages/core-components/src/layout/SignInPage/customProvider.tsx
@@ -72,11 +72,9 @@ const Component: ProviderComponent = ({ onSignInSuccess }) => {
   const handleResult = ({ userId }: Data) => {
     onSignInSuccess(
       UserIdentity.fromLegacy({
-        result: {
-          userId,
-          profile: {
-            email: `${userId}@example.com`,
-          },
+        userId,
+        profile: {
+          email: `${userId}@example.com`,
         },
       }),
     );
diff --git a/packages/core-plugin-api/src/apis/definitions/auth.ts b/packages/core-plugin-api/src/apis/definitions/auth.ts
index 8da7fbe6fd..e093a6b29b 100644
--- a/packages/core-plugin-api/src/apis/definitions/auth.ts
+++ b/packages/core-plugin-api/src/apis/definitions/auth.ts
@@ -188,7 +188,7 @@ export type BackstageUserIdentity = {
 };
 
 /**
- * A (user id, token) pair.
+ * Token and Identity response, with the users claims in the Identity.
  *
  * @public
  */
diff --git a/plugins/auth-backend/src/providers/index.ts b/plugins/auth-backend/src/providers/index.ts
index 5b4fbc6338..34c2ff06c2 100644
--- a/plugins/auth-backend/src/providers/index.ts
+++ b/plugins/auth-backend/src/providers/index.ts
@@ -44,3 +44,5 @@ export type {
   BackstageIdentityResponse,
   ProfileInfo,
 } from './types';
+
+export { decorateWithIdentity } from './decorateWithIdentity';
diff --git a/plugins/auth-backend/src/providers/oidc/provider.ts b/plugins/auth-backend/src/providers/oidc/provider.ts
index 2e58111868..158af6f830 100644
--- a/plugins/auth-backend/src/providers/oidc/provider.ts
+++ b/plugins/auth-backend/src/providers/oidc/provider.ts
@@ -205,6 +205,8 @@ export class OidcAuthProvider implements OAuthHandlers {
         },
       );
     }
+
+    return response;
   }
 }