Merge pull request #181 from mekanix/active-admin

Make active and admin user fields optional

Author: mekanix

bin/freenit.sh

@@ -200,7 +200,7 @@ EOF
 }
 EOF
 
-  npm install
+  npm update --save
   echo "# ${NAME}" >README.md
   npm install --save-dev chota
 
@@ -561,14 +561,23 @@ EOF
 <Roles store={store} />
 EOF
 
-  mkdir -p 'src/routes/profile'
+  mkdir -p 'src/routes/profile/password'
   cat >'src/routes/profile/+page.svelte' <<EOF
 <script lang="ts">
   import { Profile } from '@freenit-framework/core'
   import store from '\$lib/store'
 </script>
 
 <Profile store={store} />
+
+EOF
+  cat >'src/routes/profile/password/+page.svelte' <<EOF
+<script lang="ts">
+  import { Password } from '@freenit-framework/core'
+  import store from '\$lib/store'
+</script>
+
+<Password store={store} />
 EOF
 
   mkdir -p src/lib/store

freenit/__init__.py

@@ -1 +1 @@
-__version__ = "0.3.19"
+__version__ = "0.3.20"

freenit/models/ldap/user.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from bonsai import LDAPEntry, LDAPModOp, LDAPSearchScope, errors
+from bonsai import LDAPEntry, LDAPSearchScope, errors
 from fastapi import HTTPException
 from pydantic import EmailStr, Field
 
@@ -27,8 +27,8 @@ class UserSafe(LDAPBaseModel):
     groups: list = Field([], description=("Groups the user is a member of"))
     uidNumber: int = Field(0, description=("User ID number"))
     gidNumber: int = Field(0, description=("Group ID number"))
-    active: bool = Field(False, description=("Active user"))
-    admin: bool = Field(False, description=("Admin user"))
+    active: bool | None = Field(None, description=("Active user"))
+    admin: bool | None = Field(None, description=("Admin user"))
 
     @classmethod
     async def _login(cls, credentials) -> dict: