From cbd43d4f4ce9f1ff75db32bfee266ab528f4cced Mon Sep 17 00:00:00 2001
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Tue, 13 Oct 2020 09:33:35 +0200
Subject: [PATCH] auth fc: make fc_display_name more resilient (#47566)

---
 src/authentic2_auth_fc/views.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/authentic2_auth_fc/views.py b/src/authentic2_auth_fc/views.py
index c96814dd3..2dd18e408 100644
--- a/src/authentic2_auth_fc/views.py
+++ b/src/authentic2_auth_fc/views.py
@@ -330,9 +330,17 @@ class FcOAuthSessionViewMixin(LoggerMixin):
     @property
     def fc_display_name(self):
         '''Human representation of the current FC account'''
-        if not self.user_info:
-            return u''
-        return u'{0} {1}'.format(self.user_info['family_name'], self.user_info['given_name'])
+        display_name = ''
+        user_info = self.user_info or {}
+        family_name = user_info.get('family_name')
+        given_name = user_info.get('given_name')
+        if given_name:
+            display_name += given_name
+        if family_name:
+            if display_name:
+                display_name += ' '
+            display_name += family_name
+        return display_name
 
 
 class PopupViewMixin(object):