@micha.bigler/ui-core-micha 2.1.16 → 2.1.17

package/src/auth/AuthContext.jsx

@@ -16,6 +16,39 @@ export const AuthProvider = ({ children }) => {
   const [user, setUser] = useState(null);
   const [loading, setLoading] = useState(true);
 
+  const mapUserFromApi = (data) => {
+    const profile = data?.profile || {};
+    return {
+      ...data,
+      id: data?.id,
+      username: data?.username,
+      email: data?.email,
+      first_name: data?.first_name,
+      last_name: data?.last_name,
+      role: data?.role ?? profile?.role ?? null,
+      language: data?.language ?? profile?.language ?? 'en',
+      is_superuser: Boolean(data?.is_superuser),
+      is_new: Boolean(data?.is_new ?? profile?.is_new),
+      is_invited: Boolean(data?.is_invited ?? profile?.is_invited),
+      accepted_privacy_statement: Boolean(
+        data?.accepted_privacy_statement ?? profile?.accepted_privacy_statement
+      ),
+      accepted_convenience_cookies: Boolean(
+        data?.accepted_convenience_cookies ?? profile?.accepted_convenience_cookies
+      ),
+      is_support_agent: Boolean(data?.is_support_agent ?? profile?.is_support_agent),
+      support_contact_id: data?.support_contact_id ?? profile?.support_contact_id ?? null,
+      security_state: data?.security_state,
+      available_roles: data?.available_roles || [],
+      ui_permissions: data?.ui_permissions || {},
+      can_manage_support_agents: Boolean(data?.can_manage_support_agents),
+      can_manage: Boolean(data?.can_manage),
+      is_active: data?.is_active,
+      last_login: data?.last_login,
+      date_joined: data?.date_joined,
+    };
+  };
+
   useEffect(() => {
     let isMounted = true;
 
@@ -28,19 +61,7 @@ export const AuthProvider = ({ children }) => {
         const data = await fetchCurrentUser();
         
         if (isMounted) {
-          // Map data to ensure consistent structure
-          setUser({
-            id: data.id,
-            username: data.username,
-            email: data.email,
-            first_name: data.first_name,
-            last_name: data.last_name,
-            role: data.role,
-            is_superuser: data.is_superuser,
-            security_state: data.security_state,
-            available_roles: data.available_roles,
-            ui_permissions: data.ui_permissions,
-          });
+          setUser(mapUserFromApi(data));
         }
       } catch (err) {
         // Silent failure on 401/403 is expected (user not logged in)
@@ -58,7 +79,7 @@ export const AuthProvider = ({ children }) => {
   const login = (userData) => {
     setUser((prev) => ({
       ...prev,
-      ...userData,
+      ...mapUserFromApi(userData),
     }));
   };
 
@@ -85,4 +106,4 @@ export const AuthProvider = ({ children }) => {
       {children}
     </AuthContext.Provider>
   );
-};
+};

package/src/auth/authApi.jsx

@@ -27,6 +27,22 @@ export async function updateUserProfile(data) {
   }
 }
 
+function normalizeStatementText(data) {
+  if (typeof data === 'string') return data;
+  if (data && typeof data.content === 'string') return data.content;
+  return '';
+}
+
+export async function fetchPrivacyStatement() {
+  const res = await apiClient.get('/api/utils/privacy/');
+  return normalizeStatementText(res.data);
+}
+
+export async function fetchCookieStatement() {
+  const res = await apiClient.get('/api/utils/cookie/');
+  return normalizeStatementText(res.data);
+}
+
 export async function fetchHeadlessSession() {
   const res = await apiClient.get(`${HEADLESS_BASE}/auth/session`);
   return res.data;
@@ -411,4 +427,4 @@ export async function updateUserSupportStatus(userId, isSupportAgent) {
   } catch (error) {
     throw normaliseApiError(error, 'Auth.USER_SUPPORT_UPDATE_FAILED');
   }
-}
+}

package/src/components/AccessCodeManager.jsx

@@ -118,7 +118,7 @@ export function AccessCodeManager() {
   }
 
   return (
-    <Box sx={{ mt: 2 }}>
+    <Box>
       {errorKey && (
         <Alert severity="error" sx={{ mb: 2 }}>
           {t(errorKey)}

package/src/components/BulkInviteCsvTab.jsx

@@ -117,7 +117,7 @@ export function BulkInviteCsvTab({
   };
 
   return (
-    <Box sx={{ mt: 1 }}>
+    <Box>
       <Typography variant="h6" gutterBottom>
         {t('Account.BULK_INVITE_TITLE', 'Bulk Invite via CSV')}
       </Typography>

package/src/components/ProfileComponent.jsx

@@ -10,10 +10,14 @@ import {
   CircularProgress,
   Alert,
   Typography,
+  Accordion,
+  AccordionSummary,
+  AccordionDetails,
 } from '@mui/material';
 import { useTranslation } from 'react-i18next';
 // WICHTIG: Importiere den Context, um die bereits geladenen Daten zu nutzen
 import { AuthContext } from '../auth/AuthContext'; 
+import { fetchCookieStatement, fetchPrivacyStatement } from '../auth/authApi';
 
 export function ProfileComponent({
   onSubmit,
@@ -21,6 +25,9 @@ export function ProfileComponent({
   showName = true,
   showPrivacy = true,
   showCookies = true,
+  showStatements = true,
+  privacyStatementText = null,
+  cookieStatementText = null,
 }) {
   const { t } = useTranslation();
   
@@ -39,6 +46,10 @@ export function ProfileComponent({
   const [lastName, setLastName] = useState('');
   const [acceptedPrivacy, setAcceptedPrivacy] = useState(false);
   const [acceptedCookies, setAcceptedCookies] = useState(false);
+  const [privacyStatement, setPrivacyStatement] = useState(privacyStatementText || '');
+  const [cookieStatement, setCookieStatement] = useState(cookieStatementText || '');
+  const [loadingPrivacyStatement, setLoadingPrivacyStatement] = useState(false);
+  const [loadingCookieStatement, setLoadingCookieStatement] = useState(false);
 
   // Synchronisiere Formular-Daten, sobald der User aus dem Context da ist
   useEffect(() => {
@@ -52,6 +63,56 @@ export function ProfileComponent({
     }
   }, [user]);
 
+  useEffect(() => {
+    if (privacyStatementText !== null && privacyStatementText !== undefined) {
+      setPrivacyStatement(String(privacyStatementText));
+    }
+  }, [privacyStatementText]);
+
+  useEffect(() => {
+    if (cookieStatementText !== null && cookieStatementText !== undefined) {
+      setCookieStatement(String(cookieStatementText));
+    }
+  }, [cookieStatementText]);
+
+  useEffect(() => {
+    let cancelled = false;
+
+    const loadStatements = async () => {
+      if (!showStatements) return;
+
+      if (showPrivacy && (privacyStatementText === null || privacyStatementText === undefined)) {
+        setLoadingPrivacyStatement(true);
+        try {
+          const text = await fetchPrivacyStatement();
+          if (!cancelled) setPrivacyStatement(text || '');
+        } catch (err) {
+          if (!cancelled) setPrivacyStatement('');
+        } finally {
+          if (!cancelled) setLoadingPrivacyStatement(false);
+        }
+      }
+
+      if (showCookies && (cookieStatementText === null || cookieStatementText === undefined)) {
+        setLoadingCookieStatement(true);
+        try {
+          const text = await fetchCookieStatement();
+          if (!cancelled) setCookieStatement(text || '');
+        } catch (err) {
+          if (!cancelled) setCookieStatement('');
+        } finally {
+          if (!cancelled) setLoadingCookieStatement(false);
+        }
+      }
+    };
+
+    loadStatements();
+
+    return () => {
+      cancelled = true;
+    };
+  }, [showStatements, showPrivacy, showCookies, privacyStatementText, cookieStatementText]);
+
   const handleSubmit = async (event) => {
     event.preventDefault();
     if (!onSubmit) return;
@@ -61,10 +122,16 @@ export function ProfileComponent({
     setSuccessKey(null);
 
     const payload = {
-      first_name: firstName,
-      last_name: lastName,
-      accepted_privacy_statement: acceptedPrivacy,
-      accepted_convenience_cookies: acceptedCookies,
+      ...(showName && {
+        first_name: firstName,
+        last_name: lastName,
+      }),
+      ...(showPrivacy && {
+        accepted_privacy_statement: acceptedPrivacy,
+      }),
+      ...(showCookies && {
+        accepted_convenience_cookies: acceptedCookies,
+      }),
     };
 
     try {
@@ -183,6 +250,52 @@ export function ProfileComponent({
               />
             )}
           </Stack>
+
+          {showStatements && (
+            <Stack spacing={1.25} sx={{ mt: 1.5 }}>
+              {showPrivacy && (
+                <Accordion disableGutters>
+                  <AccordionSummary>
+                    <Typography variant="body2" fontWeight={600}>
+                      {t('Profile.PRIVACY_STATEMENT_TITLE', 'Privacy statement')}
+                    </Typography>
+                  </AccordionSummary>
+                  <AccordionDetails>
+                    {loadingPrivacyStatement ? (
+                      <Typography variant="body2" color="text.secondary">
+                        {t('Profile.STATEMENT_LOADING', 'Loading statement...')}
+                      </Typography>
+                    ) : (
+                      <Typography variant="body2" sx={{ whiteSpace: 'pre-wrap' }}>
+                        {privacyStatement || t('Profile.PRIVACY_STATEMENT_EMPTY', 'Privacy statement is currently unavailable.')}
+                      </Typography>
+                    )}
+                  </AccordionDetails>
+                </Accordion>
+              )}
+
+              {showCookies && (
+                <Accordion disableGutters>
+                  <AccordionSummary>
+                    <Typography variant="body2" fontWeight={600}>
+                      {t('Profile.COOKIES_STATEMENT_TITLE', 'Cookie statement')}
+                    </Typography>
+                  </AccordionSummary>
+                  <AccordionDetails>
+                    {loadingCookieStatement ? (
+                      <Typography variant="body2" color="text.secondary">
+                        {t('Profile.STATEMENT_LOADING', 'Loading statement...')}
+                      </Typography>
+                    ) : (
+                      <Typography variant="body2" sx={{ whiteSpace: 'pre-wrap' }}>
+                        {cookieStatement || t('Profile.COOKIES_STATEMENT_EMPTY', 'Cookie statement is currently unavailable.')}
+                      </Typography>
+                    )}
+                  </AccordionDetails>
+                </Accordion>
+              )}
+            </Stack>
+          )}
         </Box>
       )}
 

package/src/components/UserInviteComponent.jsx

@@ -34,7 +34,7 @@ export function UserInviteComponent() { // FIX: Removed apiUrl prop
   };
 
   return (
-    <Box sx={{ maxWidth: 600, mt: 2 }}>
+    <Box sx={{ maxWidth: 600 }}>
       <Typography variant="h6" gutterBottom>
         {t('Auth.INVITE_TITLE', 'Invite a new user')}
       </Typography>
@@ -67,4 +67,4 @@ export function UserInviteComponent() { // FIX: Removed apiUrl prop
       </Box>
     </Box>
   );
-}
+}