From 8143d941b80af24c28dd720e534b6109e534da26 Mon Sep 17 00:00:00 2001
From: elonj <elonj@spotify.com>
Date: Wed, 19 Jan 2022 09:34:23 -0500
Subject: [PATCH] ids will be name

Signed-off-by: elonj <elonj@spotify.com>
---
 plugins/auth-backend/src/providers/bitbucket/provider.ts | 4 ++--
 plugins/auth-backend/src/providers/google/provider.ts    | 2 +-
 plugins/auth-backend/src/providers/microsoft/provider.ts | 2 +-
 plugins/auth-backend/src/providers/okta/provider.ts      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/auth-backend/src/providers/bitbucket/provider.ts b/plugins/auth-backend/src/providers/bitbucket/provider.ts
index 630c5c61e3..c83a195db5 100644
--- a/plugins/auth-backend/src/providers/bitbucket/provider.ts
+++ b/plugins/auth-backend/src/providers/bitbucket/provider.ts
@@ -222,7 +222,7 @@ export const bitbucketUsernameSignInResolver: SignInResolver<BitbucketOAuthResul
     const claims = getEntityClaims(entity);
     const token = await ctx.tokenIssuer.issueToken({ claims });
 
-    return { id: `user:default/${entity.metadata.name}`, entity, token };
+    return { id: entity.metadata.name, entity, token };
   };
 
 export const bitbucketUserIdSignInResolver: SignInResolver<BitbucketOAuthResult> =
@@ -242,7 +242,7 @@ export const bitbucketUserIdSignInResolver: SignInResolver<BitbucketOAuthResult>
     const claims = getEntityClaims(entity);
     const token = await ctx.tokenIssuer.issueToken({ claims });
 
-    return { id: `user:default/${entity.metadata.name}`, entity, token };
+    return { id: entity.metadata.name, entity, token };
   };
 
 export type BitbucketProviderOptions = {
diff --git a/plugins/auth-backend/src/providers/google/provider.ts b/plugins/auth-backend/src/providers/google/provider.ts
index 11397b5102..90e68c6f9c 100644
--- a/plugins/auth-backend/src/providers/google/provider.ts
+++ b/plugins/auth-backend/src/providers/google/provider.ts
@@ -198,7 +198,7 @@ export const googleEmailSignInResolver: SignInResolver<OAuthResult> = async (
   const claims = getEntityClaims(entity);
   const token = await ctx.tokenIssuer.issueToken({ claims });
 
-  return { id: `user:default/${entity.metadata.name}`, entity, token };
+  return { id: entity.metadata.name, entity, token };
 };
 
 const googleDefaultSignInResolver: SignInResolver<OAuthResult> = async (
diff --git a/plugins/auth-backend/src/providers/microsoft/provider.ts b/plugins/auth-backend/src/providers/microsoft/provider.ts
index c1158ba2d3..2d4a53b076 100644
--- a/plugins/auth-backend/src/providers/microsoft/provider.ts
+++ b/plugins/auth-backend/src/providers/microsoft/provider.ts
@@ -217,7 +217,7 @@ export const microsoftEmailSignInResolver: SignInResolver<OAuthResult> = async (
   const claims = getEntityClaims(entity);
   const token = await ctx.tokenIssuer.issueToken({ claims });
 
-  return { id: `user:default/${entity.metadata.name}`, entity, token };
+  return { id: entity.metadata.name, entity, token };
 };
 
 export const microsoftDefaultSignInResolver: SignInResolver<OAuthResult> =
diff --git a/plugins/auth-backend/src/providers/okta/provider.ts b/plugins/auth-backend/src/providers/okta/provider.ts
index 31caafed14..30dd295d12 100644
--- a/plugins/auth-backend/src/providers/okta/provider.ts
+++ b/plugins/auth-backend/src/providers/okta/provider.ts
@@ -219,7 +219,7 @@ export const oktaEmailSignInResolver: SignInResolver<OAuthResult> = async (
   const claims = getEntityClaims(entity);
   const token = await ctx.tokenIssuer.issueToken({ claims });
 
-  return { id: `user:default/${entity.metadata.name}`, entity, token };
+  return { id: entity.metadata.name, entity, token };
 };
 
 export const oktaDefaultSignInResolver: SignInResolver<OAuthResult> = async (