Use first and lastname and avoid console error (#19)

* Replace username with first-lastname and return anonymous user if null * modern strings
georchestra · Jan 8, 2024 · ea23014 · ea23014
1 parent 91e8807
commit ea23014
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/auth.ts b/src/auth.ts
@@ -16,13 +16,17 @@ interface WhoAmIResponse {
   GeorchestraUser: {
     roles: KNOWN_ROLES[]
     username: string
+    firstName: string
+    lastName: string
     ldapWarn: boolean
     ldapRemainingDays: string
   }
 }
 
 export interface User {
   username: string
+  firstname?: string
+  lastname?: string
   anonymous: boolean
   warned: boolean
   remainingDays: string
@@ -42,9 +46,20 @@ export async function getUserDetails(): Promise<User> {
     .then(response => response.json())
     .then((json: WhoAmIResponse) => {
       const user = json.GeorchestraUser
+      if (!user) {
+        return {
+          username: 'anonymousUser',
+          warned: false,
+          remainingDays: '0',
+          anonymous: true,
+          adminRoles: null,
+        }
+      }
       const roles = user.roles
       return {
         username: user.username,
+        firstname: user.firstName,
+        lastname: user.lastName,
         warned: user.ldapWarn,
         remainingDays: user.ldapRemainingDays,
         anonymous: roles.indexOf('ROLE_ANONYMOUS') > -1,

diff --git a/src/header.ce.vue b/src/header.ce.vue
@@ -192,11 +192,11 @@ onMounted(() => {
           <a
             class="link-btn"
             href="/console/account/userdetails"
-            :title="state.user?.username"
+            :title="`${state.user?.firstname} ${state.user?.lastname}`"
           >
             <UserIcon class="font-bold text-3xl inline-block"></UserIcon>
             <span class="text-xs max-w-[120px] truncate">{{
-              state.user?.username
+              `${state.user?.firstname} ${state.user?.lastname}`
             }}</span></a
           >
           <a class="link-btn" :href="logoutUrl"
@@ -254,7 +254,9 @@ onMounted(() => {
           <div v-if="!isAnonymous" class="flex gap-4 items-baseline">
             <a class="link-btn" href="/console/account/userdetails">
               <UserIcon class="font-bold text-3xl inline-block mr-4"></UserIcon>
-              <span>{{ state.user?.username }}</span></a
+              <span>{{
+                `${state.user?.firstname} ${state.user?.lastname}`
+              }}</span></a
             >
             <a class="link-btn" :href="logoutUrl">logout</a>
           </div>