From 5f6f33a5edb913f6fbb790d8ce5eed31b6afa5cf Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 20 Aug 2021 14:09:40 +0200
Subject: [PATCH] auth-backend: fall back to username and id as displayName for
 profiles

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../auth-backend/src/lib/passport/PassportStrategyHelper.ts  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/auth-backend/src/lib/passport/PassportStrategyHelper.ts b/plugins/auth-backend/src/lib/passport/PassportStrategyHelper.ts
index a0c07943c1..67c2678f8b 100644
--- a/plugins/auth-backend/src/lib/passport/PassportStrategyHelper.ts
+++ b/plugins/auth-backend/src/lib/passport/PassportStrategyHelper.ts
@@ -30,8 +30,6 @@ export const makeProfileInfo = (
   profile: passport.Profile,
   idToken?: string,
 ): ProfileInfo => {
-  let { displayName } = profile;
-
   let email: string | undefined = undefined;
   if (profile.emails && profile.emails.length > 0) {
     const [firstEmail] = profile.emails;
@@ -44,6 +42,9 @@ export const makeProfileInfo = (
     picture = firstPhoto.value;
   }
 
+  let displayName: string | undefined =
+    profile.displayName ?? profile.username ?? profile.id;
+
   if ((!email || !picture || !displayName) && idToken) {
     try {
       const decoded: Record<string, string> = jwtDecoder(idToken);