@cocreate/authorize 1.11.0 → 1.13.0

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+# [1.13.0](https://github.com/CoCreate-app/CoCreate-authorize/compare/v1.12.0...v1.13.0) (2024-01-08)
+
+
+### Bug Fixes
+
+* applied host to define environment/branch ([56ff08a](https://github.com/CoCreate-app/CoCreate-authorize/commit/56ff08a0929003b37658ab394c74bf1e429cecd5))
+
+
+### Features
+
+* bumped CoCreate dependencies to their latest versions ([641c52b](https://github.com/CoCreate-app/CoCreate-authorize/commit/641c52b6af630d7164cc9e720d00e4e40d7e3d11))
+
+# [1.12.0](https://github.com/CoCreate-app/CoCreate-authorize/compare/v1.11.0...v1.12.0) (2023-12-21)
+
+
+### Features
+
+* use dotNotation for merging keys ([ac1177a](https://github.com/CoCreate-app/CoCreate-authorize/commit/ac1177a7445060ab679a3922bbfe544c11d807dc))
+
 # [1.11.0](https://github.com/CoCreate-app/CoCreate-authorize/compare/v1.10.0...v1.11.0) (2023-11-25)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/authorize",
-  "version": "1.11.0",
+  "version": "1.13.0",
   "description": "A simple authorize component in vanilla javascript. Easily configured using HTML5 data-attributes and/or JavaScript API.",
   "keywords": [
     "authorize",
@@ -45,7 +45,7 @@
   },
   "main": "./src/index.js",
   "dependencies": {
-    "@cocreate/crud-client": "^1.31.0",
-    "@cocreate/utils": "^1.29.0"
+    "@cocreate/crud-client": "^1.32.2",
+    "@cocreate/utils": "^1.30.0"
   }
 }

package/src/index.js

@@ -37,7 +37,7 @@
         if (array === 'keys' && object) {
             let authorization = object[0]
             if (authorization && authorization.key && organizations[organization_id] && organizations[organization_id][authorization.key]) {
-                let newAuthorization = await readAuthorization(authorization.key, organization_id)
+                let newAuthorization = await readAuthorization(authorization.key, data)
                 organizations[organization_id][authorization.key] = newAuthorization
             }
         }
@@ -54,24 +54,27 @@
         }
     }
 
-    async function getAuthorization(key, organization_id) {
+    async function getAuthorization(key, data) {
+        let organization_id = data.organization_id
         if (!organizations[organization_id])
             organizations[organization_id] = {}
 
         if (!organizations[organization_id][key])
-            organizations[organization_id][key] = readAuthorization(key, organization_id);
+            organizations[organization_id][key] = readAuthorization(key, data);
 
         organizations[organization_id][key] = await organizations[organization_id][key]
         return organizations[organization_id][key]
     }
 
-    async function readAuthorization(key, organization_id) {
+    async function readAuthorization(key, data) {
         try {
+            let organization_id = data.organization_id
             if (!organization_id)
                 return { error: 'An organization_id is required' };
 
             let request = {
                 method: 'object.read',
+                host: data.host,
                 database: organization_id,
                 array: 'keys',
                 organization_id,
@@ -109,7 +112,9 @@
                     let roles = await crud.send(request)
                     roles = roles.object
 
-                    authorization = await createAuthorization(authorization, roles)
+                    for (let role of roles) {
+                        authorization = dotNotationToObject(authorization, role)
+                    }
                 }
                 return authorization;
             } else
@@ -121,41 +126,6 @@
 
     }
 
-    async function createAuthorization(authorization, roles) {
-        roles.map(role => {
-            for (const roleKey in role) {
-                if (!["_id", "type", "name", "organization_id"].includes(roleKey)) {
-                    if (!authorization[roleKey]) {
-                        authorization[roleKey] = role[roleKey]
-                    } else {
-                        if (Array.isArray(role[roleKey])) {
-                            for (let item of role[roleKey]) {
-                                if (!authorization[roleKey].includes(item))
-                                    authorization[roleKey].push(item)
-                            }
-                        }
-                        else if (typeof role[roleKey] == 'object') {
-                            for (const c of Object.keys(role[roleKey])) {
-                                if (!authorization[roleKey][c]) {
-                                    authorization[roleKey][c] = role[roleKey][c]
-                                } else {
-                                    if (typeof role[roleKey][c] == 'object') {
-                                        authorization[roleKey][c] = { ...authorization[roleKey][c], ...role[roleKey][c] }
-                                    } else {
-                                        authorization[roleKey][c] = role[roleKey][c]
-                                    }
-                                }
-                            }
-                        } else {
-                            authorization[roleKey] = role[roleKey]
-                        }
-                    }
-                }
-            }
-        })
-        return authorization;
-    }
-
     async function check(data, user_id) {
         let authorization = false
         if (user_id) {
@@ -179,7 +149,7 @@
         if (!data.method)
             return { error: 'method is required' };
 
-        let authorized = await getAuthorization(key, data.organization_id)
+        let authorized = await getAuthorization(key, data)
         if (!authorized || authorized.error)
             return authorized
         if (authorized.organization_id !== data.organization_id)
@@ -277,6 +247,17 @@
                 data.$filter.query.push(query)
 
         } else {
+            if (key === '$array' && value === 'questions') {
+                if (typeof data.array === 'string') {
+                    if (typeof value === 'string') {
+                        return data.array === value
+                    } else if (Array.isArray(value)) {
+                        return value.includes(data.array)
+                    }
+                } else if (Array.isArray(data.array)) {
+
+                }
+            }
             // TODO: sanitize data by removing items user does not have access to.
             // console.log('key is a query operator', key)            
         }