From 332b9b05f78eed4b3c2bacbcd938d8434a1215b4 Mon Sep 17 00:00:00 2001
From: mleku <me@mleku.dev>
Date: Wed, 8 Oct 2025 18:47:29 +0100
Subject: [PATCH] Enhance user role management in App.svelte by adding
 fetchUserRole function; update UI to display user role badge upon login.
 Modify Follows struct to include owners and adjust access level logic in acl
 package for improved permission handling.

---
 app/web/src/App.svelte    | 66 +++++++++++++++++++++++++++++----------
 pkg/acl/follows.go        | 22 +++++++++++--
 pkg/interfaces/acl/acl.go |  4 +--
 3 files changed, 70 insertions(+), 22 deletions(-)

diff --git a/app/web/src/App.svelte b/app/web/src/App.svelte
index 5cf6542..d8076e1 100644
--- a/app/web/src/App.svelte
+++ b/app/web/src/App.svelte
@@ -2,14 +2,13 @@
     import LoginModal from './LoginModal.svelte';
     import { initializeNostrClient, fetchUserProfile } from './nostr.js';
     
-    export let name;
-
     let isDarkTheme = false;
     let showLoginModal = false;
     let isLoggedIn = false;
     let userPubkey = '';
     let authMethod = '';
     let userProfile = null;
+    let userRole = '';
     let showSettingsDrawer = false;
     let selectedTab = 'export';
     let isSearchMode = false;
@@ -45,6 +44,8 @@
             isLoggedIn = true;
             userPubkey = storedPubkey;
             authMethod = storedAuthMethod;
+            // Fetch user role for already logged in users
+            fetchUserRole();
         }
     }
 
@@ -92,6 +93,9 @@
         } catch (error) {
             console.error('Failed to load profile:', error);
         }
+        
+        // Fetch user role/permissions
+        await fetchUserRole();
     }
     
     function handleLogout() {
@@ -99,6 +103,7 @@
         userPubkey = '';
         authMethod = '';
         userProfile = null;
+        userRole = '';
         showSettingsDrawer = false;
         
         // Clear stored authentication
@@ -187,6 +192,28 @@
             console.error('Failed to auto-load profile:', error);
         }
     }
+
+    async function fetchUserRole() {
+        if (!isLoggedIn || !userPubkey) {
+            userRole = '';
+            return;
+        }
+        
+        try {
+            const response = await fetch(`/api/permissions/${userPubkey}`);
+            if (response.ok) {
+                const data = await response.json();
+                userRole = data.permission || '';
+                console.log('User role loaded:', userRole);
+            } else {
+                console.error('Failed to fetch user role:', response.status);
+                userRole = '';
+            }
+        } catch (error) {
+            console.error('Error fetching user role:', error);
+            userRole = '';
+        }
+    }
 </script>
 
 <!-- Header -->
@@ -201,12 +228,16 @@
                     bind:value={searchQuery}
                     on:keydown={handleSearchKeydown}
                     placeholder="Search..."
-                    autofocus
                 />
             </div>
         {:else}
             <div class="header-title">
-                <span class="app-title">ORLY?</span>
+                <span class="app-title">
+                    ORLY? dashboard
+                    {#if isLoggedIn && userRole}
+                        <span class="permission-badge">{userRole}</span>
+                    {/if}
+                </span>
             </div>
         {/if}
         <button class="search-btn" on:click={toggleSearchMode}>
@@ -258,7 +289,7 @@
 
     <!-- Main Content -->
     <main class="main-content">
-        <h1>Hello {name}!</h1>
+        <p>Log in to access your user dashboard</p>
     </main>
 </div>
 
@@ -394,6 +425,20 @@
         font-size: 1em;
         font-weight: 600;
         color: var(--text-color);
+        display: flex;
+        align-items: center;
+        gap: 0.5rem;
+    }
+
+    .permission-badge {
+        font-size: 0.7em;
+        font-weight: 500;
+        padding: 0.2em 0.5em;
+        border-radius: 0.3em;
+        background-color: var(--primary);
+        color: white;
+        text-transform: uppercase;
+        letter-spacing: 0.05em;
     }
 
     .search-input-container {
@@ -581,14 +626,6 @@
         color: var(--text-color);
     }
 
-    .main-content h1 {
-        color: #ff3e00;
-        text-transform: uppercase;
-        font-size: 4em;
-        font-weight: 100;
-        text-align: center;
-    }
-
     @media (max-width: 640px) {
         .header-content {
             padding: 0;
@@ -603,9 +640,6 @@
             padding: 1rem;
         }
 
-        .main-content h1 {
-            font-size: 2.5em;
-        }
     }
     
     /* User Info Styles */
diff --git a/pkg/acl/follows.go b/pkg/acl/follows.go
index ca6725c..5bfca33 100644
--- a/pkg/acl/follows.go
+++ b/pkg/acl/follows.go
@@ -40,6 +40,7 @@ type Follows struct {
 	pubs       *publish.S
 	followsMx  sync.RWMutex
 	admins     [][]byte
+	owners     [][]byte
 	follows    [][]byte
 	updated    chan struct{}
 	subsCancel context.CancelFunc
@@ -69,6 +70,16 @@ func (f *Follows) Configure(cfg ...any) (err error) {
 		err = errorf.E("both config and database must be set")
 		return
 	}
+	// add owners list
+	for _, owner := range f.cfg.Owners {
+		var own []byte
+		if o, e := bech32encoding.NpubOrHexToPublicKeyBinary(owner); chk.E(e) {
+			continue
+		} else {
+			own = o
+		}
+		f.owners = append(f.owners, own)
+	}
 	// find admin follow lists
 	f.followsMx.Lock()
 	defer f.followsMx.Unlock()
@@ -129,11 +140,13 @@ func (f *Follows) Configure(cfg ...any) (err error) {
 }
 
 func (f *Follows) GetAccessLevel(pub []byte, address string) (level string) {
-	if f.cfg == nil {
-		return "write"
-	}
 	f.followsMx.RLock()
 	defer f.followsMx.RUnlock()
+	for _, v := range f.owners {
+		if utils.FastEqual(v, pub) {
+			return "owner"
+		}
+	}
 	for _, v := range f.admins {
 		if utils.FastEqual(v, pub) {
 			return "admin"
@@ -144,6 +157,9 @@ func (f *Follows) GetAccessLevel(pub []byte, address string) (level string) {
 			return "write"
 		}
 	}
+	if f.cfg == nil {
+		return "write"
+	}
 	return "read"
 }
 
diff --git a/pkg/interfaces/acl/acl.go b/pkg/interfaces/acl/acl.go
index 3b6f409..88f065b 100644
--- a/pkg/interfaces/acl/acl.go
+++ b/pkg/interfaces/acl/acl.go
@@ -6,6 +6,7 @@ import (
 )
 
 const (
+	None = "none"
 	// Read means read only
 	Read = "read"
 	// Write means read and write
@@ -14,9 +15,6 @@ const (
 	Admin = "admin"
 	// Owner means read, write, import/export, arbitrary delete and wipe
 	Owner = "owner"
-	// Group applies to communities and other groups; the content afterwards a
-	// set of comma separated <permission>:<pubkey> pairs designating permissions to groups.
-	Group = "group:"
 )
 
 type I interface {