Add support for LDAP objects

Author: mekanix

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@freenit-framework/core",
-  "version": "0.0.53",
+  "version": "0.0.54",
   "private": false,
   "author": "Goran Mekić <meka@tilda.center>",
   "license": "BSD-2-Clause",

package.json

@@ -1,5 +1,6 @@
 <script lang="ts">
   import { onMount } from 'svelte'
+  import { utils } from '$lib'
 
   let { store } = $props()
 
@@ -9,10 +10,10 @@
 </script>
 
 <div class="root">
-  <div>ID: {store.user.profile.id || store.user.profile.dn}</div>
+  <div>ID: {utils.id(store.user.profile)}</div>
   <div>Email: {store.user.profile.email}</div>
   <div>
-    Active: {store.user.profile.active || store.user.profile.userClass == 'enabled' ? 'yes' : 'no'}
+    Active: {store.user.profile.active ? 'yes' : 'no'}
   </div>
   <div>Admin: {store.user.profile.admin ? 'yes' : 'no'}</div>
 </div>

src/lib/Profile.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
   import { onMount } from 'svelte'
-  import { error } from '$lib/notification'
+  import { notification, utils } from '$lib'
   import Spinner from './Spinner.svelte'
 
   let loading = $state(true)
@@ -13,10 +13,10 @@
       store.user.fetchAll(),
     ])
     if (!roleResponse.ok) {
-      error(roleResponse.statusText)
+      notification.error(roleResponse.statusText)
     }
     if (!userResponse.ok) {
-      error(userResponse.statusText)
+      notification.error(userResponse.statusText)
     }
     loading = false
   })
@@ -38,18 +38,12 @@
   const toggleMembership = (user: any) => async (event: any) => {
     let response
     if (event.target.checked) {
-      response = await store.role.assign(
-        store.role.detail.id ?? store.role.detail.dn,
-        user.id ?? user.dn,
-      )
+      response = await store.role.assign(utils.name(store.role.detail), utils.uid(user))
     } else {
-      response = await store.role.deassign(
-        store.role.detail.id ?? store.role.detail.dn,
-        user.id ?? user.dn,
-      )
+      response = await store.role.deassign(utils.name(store.role.detail), utils.uid(user))
     }
     if (!response.ok) {
-      error(response.statusText)
+      notification.error(response.statusText)
     } else {
       if (store.role.detail.users) {
         store.role.detail.users = [...store.role.detail.users, user]
@@ -62,14 +56,14 @@
   const fetchPrevious = async () => {
     const response = await store.user.fetchAll(store.user.list.page - 1)
     if (!response.ok) {
-      error(response.statusText)
+      notification.error(response.statusText)
     }
   }
 
   const fetchNext = async () => {
     const response = await store.user.fetchAll(store.user.list.page + 1)
     if (!response.ok) {
-      error(response.statusText)
+      notification.error(response.statusText)
     }
   }
 </script>
@@ -87,10 +81,10 @@
       <div class="heading">Admin</div>
       <div class="heading">Member</div>
       {#each store.user.list.data as user}
-        <div class="data">{user.id || user.dn}</div>
-        <a class="data" href={`/users/${user.id ?? user.dn}`}>{user.email}</a>
+        <div class="data">{utils.uid(user)}</div>
+        <a class="data" href={`/users/${utils.uid(user)}`}>{user.email}</a>
         <div class="data">
-          <input disabled type="checkbox" checked={user.active ?? user.userClass == 'enabled'} />
+          <input disabled type="checkbox" checked={user.active} />
         </div>
         <div class="data">
           <input disabled type="checkbox" checked={user.admin} />

src/lib/Role.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
   import { onMount } from 'svelte'
   import Modal from '$lib/Modal.svelte'
-  import { error } from '$lib/notification'
+  import { notification, utils } from '$lib'
   import Input from './Input.svelte'
   import Spinner from './Spinner.svelte'
 
@@ -14,22 +14,22 @@
     loading = true
     const response = await store.role.fetchAll()
     if (!response.ok) {
-      error(response.statusText)
+      notification.nerror(response.statusText)
     }
     loading = false
   })
 
   async function fetchPrevious() {
     const response = await store.role.fetchAll(store.role.list.page - 1)
     if (!response.ok) {
-      error(response.statusText)
+      notification.error(response.statusText)
     }
   }
 
   async function fetchNext() {
     const response = await store.role.fetchAll(store.role.list.page + 1)
     if (!response.ok) {
-      error(response.statusText)
+      notification.error(response.statusText)
     }
   }
 
@@ -42,7 +42,7 @@
     event.preventDefault()
     const response = await store.role.create({ name })
     if (!response.ok) {
-      error(response.statusText)
+      notification.error(response.statusText)
     }
     name = ''
     showCreate = false
@@ -63,10 +63,10 @@
         <div class="heading">Name</div>
         {#each store.role.list.data as role}
           <div class="data">
-            <a href={`/roles/${role.id || role.dn}`}>{role.id || role.dn}</a>
+            <a href={`/roles/${utils.name(role)}`}>{utils.id(role)}</a>
           </div>
           <div class="data">
-            <a href={`/roles/${role.id || role.dn}`}>{role.name || role.cn}</a>
+            <a href={`/roles/${utils.name(role)}`}>{utils.name(role)}</a>
           </div>
           <div class="border"></div>
         {/each}

src/lib/Roles.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
   import { onMount } from 'svelte'
-  import { error } from '$lib/notification'
+  import { notification, utils } from '$lib'
   import Spinner from './Spinner.svelte'
 
   let { pk = 0, store } = $props()
@@ -13,10 +13,10 @@
       store.role.fetchAll(),
     ])
     if (!userResponse.ok) {
-      error(userResponse.statusText)
+      notification.error(userResponse.statusText)
     }
     if (!roleResponse.ok) {
-      error(roleResponse.statusText)
+      notification.error(roleResponse.statusText)
     }
     loading = false
   })
@@ -41,21 +41,21 @@
       )
     }
     if (!response.ok) {
-      error(response.statusText)
+      notification.error(response.statusText)
     }
   }
 
   async function fetchPrevious() {
     const response = await store.role.fetchAll(store.role.list.page - 1)
     if (!response.ok) {
-      error(response.statusText)
+      notification.error(response.statusText)
     }
   }
 
   async function fetchNext() {
     const response = await store.role.fetchAll(store.role.list.page + 1)
     if (!response.ok) {
-      error(response.statusText)
+      notification.error(response.statusText)
     }
   }
 </script>
@@ -72,8 +72,8 @@
       <div class="heading">Member</div>
 
       {#each store.role.list.data as role}
-        <div class="data">{role.id ?? role.dn}</div>
-        <a class="data" href={`/roles/${role.id ?? role.dn}`}>{role.name ?? role.cn}</a>
+        <div class="data">{utils.id(role)}</div>
+        <a class="data" href={`/roles/${utils.name(role)}`}>{utils.name(role)}</a>
         <div class="data">
           <input type="checkbox" checked={member(role)} onchange={toggleMembership(role)} />
         </div>

src/lib/User.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
   import { onMount } from 'svelte'
-  import { error } from '$lib/notification'
+  import { notification, utils } from '$lib'
   import Spinner from './Spinner.svelte'
 
   let loading = $state(true)
@@ -9,22 +9,22 @@
   onMount(async () => {
     const response = await store.user.fetchAll()
     if (!response.ok) {
-      error(response.statusText)
+      notification.error(response.statusText)
     }
     loading = false
   })
 
   async function fetchPrevious() {
     const response = await store.user.fetchAll(store.user.list.page - 1)
     if (!response.ok) {
-      error(response.statusText)
+      notification.error(response.statusText)
     }
   }
 
   async function fetchNext() {
     const response = await store.user.fetchAll(store.user.list.page + 1)
     if (!response.ok) {
-      error(response.statusText)
+      notification.error(response.statusText)
     }
   }
 </script>
@@ -40,12 +40,12 @@
       <div class="heading">Active</div>
       <div class="heading">Admin</div>
       {#each store.user.list.data as user}
-        <div class="data">{user.id || user.dn}</div>
+        <div class="data">{utils.uid(user)}</div>
         <div class="data">
-          <a href={`/users/${user.id || user.dn}`}>{user.email}</a>
+          <a href={`/users/${utils.uid(user)}`}>{user.email}</a>
         </div>
         <div class="data">
-          <input disabled type="checkbox" checked={user.active || user.userClass == 'enabled'} />
+          <input disabled type="checkbox" checked={user.active} />
         </div>
         <div class="data">
           <input disabled={!store.user.profile.admin} type="checkbox" checked={user.admin} />

src/lib/Users.svelte

@@ -1,4 +1,4 @@
-import { methods } from '..'
+import { methods, utils } from '..'
 
 export default class AuthStore {
   access = $state(new Date(0))
@@ -38,7 +38,7 @@ export default class AuthStore {
   }
 
   loggedin = () => {
-    return Boolean(this.store.user.profile.id)
+    return Boolean(utils.id(this.store.user.profile))
   }
 
   register = async (email: string, password: string) => {

src/lib/base-store/auth.svelte.ts

@@ -18,3 +18,4 @@ export { default as Users } from './Users.svelte'
 export { default as methods } from './methods'
 export { default as BaseStore } from './base-store'
 export * as notification from './notification'
+export * as utils from './utils'

src/lib/index.ts

@@ -0,0 +1,46 @@
+export const dbtype = (data) => {
+  if (!data) {
+    return null
+  }
+  if (data.id) {
+    return 'sql'
+  }
+  if (data.dn) {
+    return 'ldap'
+  }
+}
+
+export const id = (data) => {
+  const dbt = dbtype(data)
+  if (dbt === 'sql') {
+    return data.id
+  }
+  if (dbt === 'ldap') {
+    return data.dn
+  }
+}
+
+export const uid = (data) => {
+  const dbt = dbtype(data)
+  if (dbt === 'sql') {
+    return data.id
+  }
+  if (dbt === 'ldap') {
+    if (data.uidNumber) {
+      return data.uidNumber
+    }
+    if (data.gidNumber) {
+      return data.gidNumber
+    }
+  }
+}
+
+export const name = (data) => {
+  const dbt = dbtype(data)
+  if (dbt === 'sql') {
+    return data.name
+  }
+  if (dbt === 'ldap') {
+    return data.cn
+  }
+}