From f201645b16dc9c4f3cfa9eab16ab85caadcdc5e2 Mon Sep 17 00:00:00 2001
From: Atte Moisio <attemoisio@attemoisio.fi>
Date: Fri, 5 Apr 2024 11:19:02 +0300
Subject: [PATCH] Show admin's first name instead of internal authentication ID

---
 src/components/ContextProvider.tsx | 2 ++
 src/components/Header.tsx          | 5 +++--
 src/index.tsx                      | 5 +++++
 src/models/Admin.ts                | 3 +++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/components/ContextProvider.tsx b/src/components/ContextProvider.tsx
index 7d9604b..3f66954 100644
--- a/src/components/ContextProvider.tsx
+++ b/src/components/ContextProvider.tsx
@@ -13,6 +13,7 @@ export interface ContextProviderProps extends React.Props<ContextProvider> {
   showCircEventsDownload?: boolean;
   settingUp?: boolean;
   email?: string;
+  givenName?: string;
   roles?: {
     role: string;
     library?: string;
@@ -36,6 +37,7 @@ export default class ContextProvider extends React.Component<
     this.admin = new Admin(
       props.roles || [],
       props.email || null,
+      props.givenName || null,
       props.authType || null
     );
     this.pathFor = (collectionUrl: string, bookUrl: string, tab?: string) => {
diff --git a/src/components/Header.tsx b/src/components/Header.tsx
index f06f9e9..86f4d43 100644
--- a/src/components/Header.tsx
+++ b/src/components/Header.tsx
@@ -225,7 +225,7 @@ export class Header extends React.Component<HeaderProps, HeaderState> {
             {sitewideLinkItems.map((item) =>
               this.renderLinkItem(item, currentPathname)
             )}
-            {this.context.admin.email && (
+            {(this.context.admin.email || this.context.admin.givenName) && (
               <li className="dropdown">
                 <Button
                   className="account-dropdown-toggle transparent"
@@ -235,7 +235,8 @@ export class Header extends React.Component<HeaderProps, HeaderState> {
                   callback={this.toggleAccountDropdown}
                   content={
                     <span>
-                      {this.context.admin.email} <GenericWedgeIcon />
+                      {this.context.admin.givenName || this.context.admin.email}{" "}
+                      <GenericWedgeIcon />
                     </span>
                   }
                 />
diff --git a/src/index.tsx b/src/index.tsx
index aa2ec57..83ed439 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -38,6 +38,11 @@ interface ConfigurationSettings {
   /** `email` will be the email address of the currently logged in admin. */
   email?: string;
 
+  /** `givenName` will be the first name of currently logged in admin.
+      only available for externally authenticated users (who will have no
+      email). */
+  givenName?: string;
+
   /** `roles` contains the logged in admin's roles: system admininstrator,
       or library manager or librarian for one or more libraries. */
   roles?: {
diff --git a/src/models/Admin.ts b/src/models/Admin.ts
index 248f992..14b0005 100644
--- a/src/models/Admin.ts
+++ b/src/models/Admin.ts
@@ -3,6 +3,7 @@ import { AdminAuthType, AdminRoleData } from "../interfaces";
 export default class Admin {
   roles: AdminRoleData[];
   email: string | null = null;
+  givenName: string | null = null;
   private authType: AdminAuthType = "password";
   private systemAdmin: boolean = false;
   private sitewideLibraryManager: boolean = false;
@@ -13,10 +14,12 @@ export default class Admin {
   constructor(
     roles: AdminRoleData[],
     email?: string,
+    givenName?: string,
     authType?: AdminAuthType
   ) {
     this.roles = roles;
     this.email = email;
+    this.givenName = givenName;
     this.authType = authType;
     for (const role of roles) {
       switch (role.role) {