From a2ebebd7f62fb4025a24452bb68c48441a095ea8 Mon Sep 17 00:00:00 2001
From: Christoph Kluge <christoph.kluge@fau.de>
Date: Wed, 1 Feb 2023 14:49:10 +0100
Subject: [PATCH] Remove role label array from frontend

- made centralized role array uncentralized again
---
 internal/auth/auth.go                         |  2 +-
 web/frontend/src/config/admin/AddUser.svelte  | 11 ++---------
 web/frontend/src/config/admin/EditRole.svelte |  9 +--------
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/internal/auth/auth.go b/internal/auth/auth.go
index 332efbb..eb3c34b 100644
--- a/internal/auth/auth.go
+++ b/internal/auth/auth.go
@@ -143,7 +143,7 @@ func IsValidRole(role string) bool {
 func GetValidRoles(user *User) ([5]string, error) {
 	var vals [5]string
 	if (!user.HasRole(RoleAdmin)) {
-		return vals, fmt.Errorf("%#v: only admins are allowed to fetch a list of roles", user.Username)
+		return vals, fmt.Errorf("%s: only admins are allowed to fetch a list of roles", user.Username)
 	} else {
 		return validRoles, nil
 	}
diff --git a/web/frontend/src/config/admin/AddUser.svelte b/web/frontend/src/config/admin/AddUser.svelte
index 910041f..4245f06 100644
--- a/web/frontend/src/config/admin/AddUser.svelte
+++ b/web/frontend/src/config/admin/AddUser.svelte
@@ -7,13 +7,6 @@
 
     let message = {msg: '', color: '#d63384'}
     let displayMessage = false
-    let roleLabel = {
-      api: 'API',
-      user: 'User (regular user, same as if created via LDAP sync.)',
-      manager: 'Manager',
-      support: 'Support',
-      admin: 'Admin'
-    }
 
     export let roles = []
 
@@ -86,12 +79,12 @@
                 {#if i == 0}
                     <div>
                         <input type="radio" id={role} name="role" value={role} checked/>
-                        <label for={role}>{roleLabel[role]}</label>
+                        <label for={role}>{role.charAt(0).toUpperCase() + role.slice(1)} (regular user, same as if created via LDAP sync.)</label>
                     </div>
                 {:else}
                     <div>
                         <input type="radio" id={role} name="role" value={role}/>
-                        <label for={role}>{roleLabel[role]}</label>
+                        <label for={role}>{role.charAt(0).toUpperCase() + role.slice(1)}</label>
                     </div>
                 {/if}
             {/each}
diff --git a/web/frontend/src/config/admin/EditRole.svelte b/web/frontend/src/config/admin/EditRole.svelte
index a260f85..ca14699 100644
--- a/web/frontend/src/config/admin/EditRole.svelte
+++ b/web/frontend/src/config/admin/EditRole.svelte
@@ -9,13 +9,6 @@
     let displayMessage = false
 
     export let roles = []
-    let roleLabel = {
-      api: 'API',
-      user: 'User',
-      manager: 'Manager',
-      support: 'Support',
-      admin: 'Admin'
-    }
 
     async function handleAddRole() {
         const username = document.querySelector('#role-username').value
@@ -96,7 +89,7 @@
             <select class="form-select" id="role-select">
                 <option selected value="">Role...</option>
                 {#each roles as role}
-                    <option value={role}>{roleLabel[role]}</option>
+                    <option value={role}>{role.charAt(0).toUpperCase() + role.slice(1)}</option>
                 {/each}
             </select>
             <!-- PreventDefault on Sveltestrap-Button more complex to achieve than just use good ol' html button -->