Merge branch 'master' of https://github.com/raghavyuva/nixopus

Author: zhravan

CHANGELOG.md

@@ -1,3 +1,12 @@
+# [0.1.0-alpha.68](https://github.com/raghavyuva/nixopus/compare/v0.1.0-alpha.67...v0.1.0-alpha.68) (2025-11-24)
+
+
+### Bug Fixes
+
+* feature disabled error on signup ([#587](https://github.com/raghavyuva/nixopus/issues/587)) ([8af20ab](https://github.com/raghavyuva/nixopus/commit/8af20abf6c02706e6e726e63da4df7a1399645a3))
+
+
+
 # [0.1.0-alpha.67](https://github.com/raghavyuva/nixopus/compare/v0.1.0-alpha.66...v0.1.0-alpha.67) (2025-11-21)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nixopus",
-  "version": "0.1.0-alpha.67",
+  "version": "0.1.0-alpha.68",
   "description": "A modern container management platform",
   "private": false,
   "cli-version": "0.1.26",

version.txt

@@ -1 +1 @@
-v0.1.0-alpha.67
+v0.1.0-alpha.68

view/app/register/hooks/use-register.ts

@@ -9,6 +9,8 @@ import { useForm } from 'react-hook-form';
 import { zodResolver } from '@hookform/resolvers/zod';
 import * as z from 'zod';
 import { useIsAdminRegisteredQuery } from '@/redux/services/users/authApi';
+import { useAppDispatch } from '@/redux/hooks';
+import { initializeAuth } from '@/redux/features/users/authSlice';
 
 const registerSchema = (t: (key: translationKey, params?: Record<string, string>) => string) =>
   z
@@ -36,6 +38,7 @@ type RegisterForm = z.infer<ReturnType<typeof registerSchema>>;
 function useRegister() {
   const { t } = useTranslation();
   const router = useRouter();
+  const dispatch = useAppDispatch();
   const [isLoading, setIsLoading] = useState(false);
   const {
     data: isAdminRegistered,
@@ -69,6 +72,7 @@ function useRegister() {
         toast.error('Sign up is not allowed');
       } else {
         toast.success(t('auth.register.success'));
+        await dispatch(initializeAuth() as any);
         router.push('/auth');
       }
     } catch (error) {

view/hooks/socket-provider.tsx

@@ -2,6 +2,7 @@
 import { getWebsocketUrl } from '@/redux/conf';
 import { createContext, useContext, useEffect, useRef, useState, ReactNode } from 'react';
 import { getAccessToken } from 'supertokens-auth-react/recipe/session';
+import { useAppSelector } from '@/redux/hooks';
 
 type WebSocketContextValue = {
   isReady: boolean;
@@ -36,6 +37,7 @@ export const WebSocketProvider = ({
   const reconnectTimeoutRef = useRef<NodeJS.Timeout | null>(null);
   const reconnectAttemptsRef = useRef(0);
   const isConnectingRef = useRef(false);
+  const { isAuthenticated, isInitialized } = useAppSelector((state) => state.auth);
 
   const connectWebSocket = async () => {
     if (isConnectingRef.current) {
@@ -127,6 +129,10 @@ export const WebSocketProvider = ({
   };
 
   useEffect(() => {
+    if (!isInitialized || !isAuthenticated) {
+      return;
+    }
+
     reconnectAttemptsRef.current = 0;
     isConnectingRef.current = false;
 
@@ -136,12 +142,6 @@ export const WebSocketProvider = ({
     }
 
     connectWebSocket();
-  }, []);
-
-  useEffect(() => {
-    if (!wsRef.current) {
-      connectWebSocket();
-    }
 
     return () => {
       if (reconnectTimeoutRef.current) {
@@ -159,7 +159,7 @@ export const WebSocketProvider = ({
         wsRef.current = null;
       }
     };
-  }, []);
+  }, [isAuthenticated, isInitialized]);
 
   const sendMessage = (data: string) => {
     if (wsRef.current && wsRef.current.readyState === WebSocket.OPEN) {

view/lib/rbac.ts

@@ -1,6 +1,7 @@
-import { useEffect, useMemo, useState } from 'react';
+import { useEffect, useMemo, useState, useCallback, useRef } from 'react';
 import Session from 'supertokens-web-js/recipe/session';
 import { UserRoleClaim, PermissionClaim } from 'supertokens-web-js/recipe/userroles';
+import { useAppSelector } from '@/redux/hooks';
 
 export type Resource =
   | 'organization'
@@ -29,44 +30,70 @@ export const useRBAC = () => {
   const [roles, setRoles] = useState<string[] | undefined>(undefined);
   const [permissions, setPermissions] = useState<string[] | undefined>(undefined);
   const [isLoading, setIsLoading] = useState<boolean>(true);
+  const { isAuthenticated, isInitialized } = useAppSelector((state) => state.auth);
+  const activeOrganization = useAppSelector((state) => state.user.activeOrganization);
+  const retryTimeoutRef = useRef<NodeJS.Timeout | null>(null);
 
-  useEffect(() => {
-    let isMounted = true;
-    (async () => {
-      try {
-        const hasSession = await Session.doesSessionExist();
-        if (!hasSession) {
-          if (isMounted) {
-            setRoles(undefined);
-            setPermissions(undefined);
-            setIsLoading(false);
-          }
-          return;
-        }
+  const fetchRBAC = useCallback(async () => {
+    try {
+      if (retryTimeoutRef.current) {
+        clearTimeout(retryTimeoutRef.current);
+        retryTimeoutRef.current = null;
+      }
+
+      const hasSession = await Session.doesSessionExist();
+      if (!hasSession) {
+        setRoles(undefined);
+        setPermissions(undefined);
+        setIsLoading(false);
+        return;
+      }
 
-        const [sessionRoles, sessionPerms] = await Promise.all([
-          Session.getClaimValue({ claim: UserRoleClaim }),
-          Session.getClaimValue({ claim: PermissionClaim })
-        ]);
+      const [sessionRoles, sessionPerms] = await Promise.all([
+        Session.getClaimValue({ claim: UserRoleClaim }),
+        Session.getClaimValue({ claim: PermissionClaim })
+      ]);
 
-        if (isMounted) {
-          setRoles(sessionRoles ?? undefined);
-          setPermissions(sessionPerms ?? undefined);
-          setIsLoading(false);
-        }
-      } catch (_err) {
-        if (isMounted) {
-          setRoles(undefined);
-          setPermissions(undefined);
-          setIsLoading(false);
-        }
+      if ((!sessionRoles || sessionRoles.length === 0) && (!sessionPerms || sessionPerms.length === 0)) {
+        retryTimeoutRef.current = setTimeout(() => {
+          fetchRBAC();
+        }, 1000);
+        return;
       }
-    })();
+
+      setRoles(sessionRoles ?? undefined);
+      setPermissions(sessionPerms ?? undefined);
+      setIsLoading(false);
+    } catch (err) {
+      retryTimeoutRef.current = setTimeout(() => {
+        fetchRBAC();
+      }, 1000);
+    }
+  }, [isAuthenticated, isInitialized, activeOrganization?.id]);
+
+  useEffect(() => {
     return () => {
-      isMounted = false;
+      if (retryTimeoutRef.current) {
+        clearTimeout(retryTimeoutRef.current);
+      }
     };
   }, []);
 
+  useEffect(() => {
+    if (!isInitialized) {
+      return;
+    }
+
+    if (!isAuthenticated) {
+      setRoles(undefined);
+      setPermissions(undefined);
+      setIsLoading(false);
+      return;
+    }
+
+    fetchRBAC();
+  }, [isAuthenticated, isInitialized, activeOrganization?.id, fetchRBAC]);
+
   const isAdmin = useMemo(() => {
     if (!Array.isArray(roles)) return false;
     return roles.some((role) => {