wip(feat): add support for user scopes

Signed-off-by: SoulHarsh007 <[email protected]>

Author: SoulHarsh007

CachyOS Builder Dashboard.code-workspace

@@ -21,6 +21,7 @@
 			"sonner",
 			"tabler",
 			"toastify",
+			"unrs",
 			"Upsert",
 			"vercel",
 			"webgl",

bun.lock

@@ -17,6 +17,12 @@ const eslintConfig = [
       'next-env.d.ts',
     ],
   },
+  {
+    // @todo: Enable this rule once the existing errors are fixed.
+    rules: {
+      'react-hooks/set-state-in-effect': 'off',
+    },
+  },
 ];
 
 export default eslintConfig;

eslint.config.mjs

@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "@hookform/resolvers": "^5.2.2",
-    "@marsidev/react-turnstile": "1.3.1",
+    "@marsidev/react-turnstile": "1.4.0",
     "@radix-ui/react-avatar": "^1.1.11",
     "@radix-ui/react-checkbox": "^1.3.3",
     "@radix-ui/react-collapsible": "^1.1.12",
@@ -15,7 +15,7 @@
     "@radix-ui/react-slot": "^1.2.4",
     "@radix-ui/react-switch": "^1.2.6",
     "@radix-ui/react-tooltip": "^1.2.8",
-    "@tabler/icons-react": "3.35.0",
+    "@tabler/icons-react": "3.36.0",
     "@tanstack/react-table": "^8.21.3",
     "@xterm/addon-fit": "0.10.0",
     "@xterm/addon-search": "0.15.0",
@@ -26,39 +26,39 @@
     "clsx": "^2.1.1",
     "cmdk": "^1.1.1",
     "iron-session": "8.0.4",
-    "lucide-react": "^0.554.0",
-    "next": "16.0.10",
+    "lucide-react": "^0.562.0",
+    "next": "16.1.0",
     "next-themes": "^0.4.6",
     "pretty-bytes": "7.1.0",
     "pretty-ms": "9.3.0",
     "react": "19.2.3",
     "react-dom": "19.2.3",
-    "react-hook-form": "7.66.1",
-    "recharts": "^3.5.0",
+    "react-hook-form": "7.69.0",
+    "recharts": "^3.6.0",
     "sonner": "^2.0.7",
     "strip-ansi": "7.1.2",
     "tailwind-merge": "^3.4.0",
     "tailwind-variants": "3.2.2",
     "use-debounce": "10.0.6",
-    "zod": "^4.1.13"
+    "zod": "^4.2.1"
   },
   "devDependencies": {
-    "@tailwindcss/postcss": "^4.1.17",
-    "@types/node": "^24.10.1",
+    "@tailwindcss/postcss": "^4.1.18",
+    "@types/node": "^25.0.3",
     "@types/react": "19.2.7",
     "@types/react-dom": "19.2.3",
-    "eslint": "^9.39.1",
-    "eslint-config-next": "16.0.10",
+    "eslint": "^9.39.2",
+    "eslint-config-next": "16.1.0",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-perfectionist": "^4.15.1",
+    "eslint-plugin-perfectionist": "^5.0.0",
     "eslint-plugin-prettier": "^5.5.4",
-    "prettier": "^3.6.2",
-    "tailwindcss": "^4.1.17",
+    "prettier": "^3.7.4",
+    "tailwindcss": "^4.1.18",
     "tw-animate-css": "^1.4.0",
     "typescript": "^5.9.3"
   },
   "name": "cachyos-builder-dashboard",
-  "packageManager": "[email protected].3",
+  "packageManager": "[email protected].4",
   "private": true,
   "scripts": {
     "build": "next build",

package.json

@@ -36,7 +36,7 @@ export async function getAccessibleServers() {
     return redirect('/');
   }
   return session.tokens.map((token, index) => ({
-    accessible: token.token !== '',
+    accessible: token.token !== '' && token.scopes.length > 0,
     active: index === session.serverIndex,
     description: token.description,
     name: token.name,
@@ -66,11 +66,13 @@ export async function getLoggedInUser(fullProfile = false) {
       user.profile_picture_url ?? '/cachyos-logo.svg';
     await session.save();
     if (fullProfile) {
+      user.scopes = session.tokens[session.serverIndex].scopes;
       return user;
     }
     return {
       displayName: session.displayName,
       profile_picture_url: session.profile_picture_url,
+      scopes: session.tokens[session.serverIndex].scopes,
       username: session.username,
     };
   } catch (error) {
@@ -94,7 +96,7 @@ export async function getSession() {
   }
   const cachyBuilderClient = new CachyBuilderClient(
     session.serverIndex,
-    session.tokens[session.serverIndex].token
+    session.tokens
   );
   return {
     cachyBuilderClient,
@@ -167,3 +169,29 @@ export async function logout() {
   session.destroy();
   return redirect('/');
 }
+
+export async function syncLoggedInUserScopes() {
+  const {cachyBuilderClient, session} = await getSession();
+  if (!session.isLoggedIn) {
+    return redirect('/');
+  }
+  try {
+    const {errors, tokens} = await cachyBuilderClient.syncLoggedInUserScopes(
+      true,
+      await headers()
+    );
+    session.tokens = tokens;
+    await session.save();
+    return {
+      success: tokens.length > 0,
+      warning:
+        errors.length > 0
+          ? `Failed to sync scopes on some servers, these servers will be disabled for current session:\n${errors}`
+          : undefined,
+    };
+  } catch (error) {
+    return {
+      error: `Failed to sync user scopes: ${error instanceof Error ? error.message : 'Unknown error'}`,
+    };
+  }
+}

src/app/actions/session.ts

@@ -4,74 +4,7 @@ import {headers} from 'next/headers';
 import {redirect} from 'next/navigation';
 
 import {getSession} from '@/app/actions/session';
-import {UserData, UserProfile} from '@/lib/typings';
-
-export async function changeServer(serverName: string) {
-  const {session} = await getSession();
-  const serverIndex = session.tokens.findIndex(
-    token => token.name === serverName && token.token !== ''
-  );
-  if (serverIndex === -1) {
-    return {
-      error: `Server "${serverName}" not found or is not accessible with the current session.`,
-    };
-  }
-  session.serverIndex = serverIndex;
-  await session.save();
-  return {
-    msg: `Switched to server "${serverName}" successfully.`,
-  };
-}
-
-export async function getAccessibleServers() {
-  const {session} = await getSession();
-  if (!session.isLoggedIn) {
-    return redirect('/');
-  }
-  return session.tokens.map((token, index) => ({
-    accessible: token.token !== '',
-    active: index === session.serverIndex,
-    description: token.description,
-    name: token.name,
-  }));
-}
-
-export async function getLoggedInUser(
-  fullProfile: false
-): Promise<UserData | {error: string}>;
-
-export async function getLoggedInUser(
-  fullProfile: true
-): Promise<UserProfile | {error: string}>;
-
-export async function getLoggedInUser(fullProfile = false) {
-  const {cachyBuilderClient, session} = await getSession();
-  if (!session.isLoggedIn) {
-    return redirect('/');
-  }
-  try {
-    const user = await cachyBuilderClient.getLoggedInUserProfile(
-      await headers()
-    );
-    session.displayName = user.display_name ?? user.username;
-    session.username = user.username;
-    session.profile_picture_url =
-      user.profile_picture_url ?? '/cachyos-logo.svg';
-    await session.save();
-    if (fullProfile) {
-      return user;
-    }
-    return {
-      displayName: session.displayName,
-      profile_picture_url: session.profile_picture_url,
-      username: session.username,
-    };
-  } catch (error) {
-    return {
-      error: `Failed to get user profile: ${error instanceof Error ? error.message : 'Unknown error'}`,
-    };
-  }
-}
+import {UserProfile} from '@/lib/typings';
 
 export async function getUser(username: string) {
   const {cachyBuilderClient, session} = await getSession();

src/app/actions/users.ts

@@ -49,11 +49,12 @@ import {
   packageRepoValues,
   PackageStatus,
   packageStatusValues,
+  UserScope,
 } from '@/lib/typings';
-import {packageStatusToIcon} from '@/lib/utils';
+import {checkScopes, packageStatusToIcon} from '@/lib/utils';
 
 export default function PackageListPage() {
-  const {activeServer} = useSidebar();
+  const {activeServer, scopes} = useSidebar();
   const [data, setData] = useState<ListPackageResponse | null>(null);
   const [error, setError] = useState<null | string>(null);
   const [pageSize, setPageSize] = useState(20);
@@ -85,6 +86,10 @@ export default function PackageListPage() {
 
   useGenericShortcutListener('/', primarySearchFilterShortcutCallback, true);
 
+  const enableRebuild = useMemo(
+    () => checkScopes(scopes, [UserScope.READ, UserScope.WRITE]),
+    [scopes]
+  );
   const columns: ColumnDef<Package>[] = useMemo(
     () => [
       {
@@ -241,7 +246,12 @@ export default function PackageListPage() {
             </DropdownMenuTrigger>
             <DropdownMenuContent align="end" className="max-w-48">
               <DropdownMenuItem
+                disabled={!enableRebuild}
+                hidden={!enableRebuild}
                 onSelect={() => {
+                  if (!enableRebuild) {
+                    return;
+                  }
                   const toastId = toast.loading(
                     `Requesting rebuild for PkgBase: ${row.original.pkgbase} MArch: ${row.original.march} Repo: ${row.original.repository}...`
                   );
@@ -271,7 +281,7 @@ export default function PackageListPage() {
               >
                 <RotateCcw /> Rebuild
               </DropdownMenuItem>
-              <DropdownMenuSeparator />
+              <DropdownMenuSeparator hidden={!enableRebuild} />
               <DropdownMenuItem
                 asChild
                 disabled={row.original.status !== PackageStatus.FAILED}
@@ -302,7 +312,7 @@ export default function PackageListPage() {
         id: 'actions',
       },
     ],
-    []
+    [enableRebuild]
   );
 
   const onMarchFilterUpdate = useCallback(
@@ -457,6 +467,7 @@ export default function PackageListPage() {
                   <div className="flex">
                     <Button
                       className="h-8"
+                      disabled={!enableRebuild}
                       onClick={() => setShowRebuildModal(true)}
                       size="sm"
                       variant="outline"

src/app/dashboard/package-list/page.tsx

@@ -1,16 +1,17 @@
 'use client';
-import {useCallback, useEffect, useState} from 'react';
+import {useCallback, useEffect, useMemo, useState} from 'react';
 import {toast} from 'sonner';
 
-import {getLoggedInUser} from '@/app/actions/users';
+import {getLoggedInUser} from '@/app/actions/session';
 import Loader from '@/components/loader';
 import {Card} from '@/components/ui/card';
 import {useSidebar} from '@/components/ui/sidebar';
 import {UserProfileForm} from '@/components/user-profile-form';
-import {UserProfile} from '@/lib/typings';
+import {UserProfile, UserScope} from '@/lib/typings';
+import {checkScopes} from '@/lib/utils';
 
 export default function UserProfilePage() {
-  const {activeServer, doRefresh} = useSidebar();
+  const {activeServer, doRefresh, scopes} = useSidebar();
   const [user, setUser] = useState<null | UserProfile>(null);
   const onUserUpdate = useCallback(
     (updatedUser: UserProfile) => {
@@ -19,6 +20,10 @@ export default function UserProfilePage() {
     },
     [doRefresh]
   );
+  const enableEdits = useMemo(
+    () => checkScopes(scopes, [UserScope.READ, UserScope.WRITE]),
+    [scopes]
+  );
   useEffect(() => {
     setUser(null);
     getLoggedInUser(true).then(data => {
@@ -36,7 +41,11 @@ export default function UserProfilePage() {
     <Card className="flex min-h-full w-full items-center justify-center p-6 md:p-10">
       <div className="w-full max-w-lg">
         {user ? (
-          <UserProfileForm onUserUpdate={onUserUpdate} user={user} />
+          enableEdits ? (
+            <UserProfileForm onUserUpdate={onUserUpdate} user={user} />
+          ) : (
+            <UserProfileForm disabled onUserUpdate={() => {}} user={user} />
+          )
         ) : (
           <Loader animate text="Loading user profile..." />
         )}