@cocreate/authorize 1.12.0 → 1.13.1

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+## [1.13.1](https://github.com/CoCreate-app/CoCreate-authorize/compare/v1.13.0...v1.13.1) (2024-01-17)
+
+
+### Bug Fixes
+
+* get user from socket or data ([1e3a821](https://github.com/CoCreate-app/CoCreate-authorize/commit/1e3a82119e774c9714324e8780e453f43eecb9c4))
+* update to support new query system ([0ddfeca](https://github.com/CoCreate-app/CoCreate-authorize/commit/0ddfeca394ae44b1c56499df38df0b96c0b15396))
+
+# [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)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/authorize",
-  "version": "1.12.0",
+  "version": "1.13.1",
   "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,36 +54,39 @@
         }
     }
 
-    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,
                 $filter: {
-                    query: []
+                    query: {}
                 }
             }
 
             if (key)
-                request.$filter.query.push({ key: 'key', value: key, operator: '$eq' })
+                request.$filter.query.key = key
             else
-                request.$filter.query.push({ key: 'default', value: true, operator: '$eq' })
+                request.$filter.query.default = true
 
 
             let authorization = await crud.send(request)
@@ -146,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)
@@ -230,18 +233,17 @@
 
     async function checkMethodOperators(data, key, value) {
         if (value === 'this.userId' && data.socket)
-            value = data.socket.user_id
+            value = data.socket.user_id || data.user_id
 
+        // TODO: support our standard query system
         let keys = key.split('.')
         if (['$eq', '$ne', '$lt', '$lte', '$gt', '$gte', '$in', '$nin', '$or', '$and', '$not', '$nor', '$exists', '$type', '$mod', '$regex', '$text', '$where', '$all', '$elemMatch', '$size'].includes(keys[0])) {
-            // let keys = key.split('.')
-            let query = { key: keys[1], value, operator: keys[0] }
             if (!data.$filter)
-                data.$filter = { query: [query] }
+                data.$filter = { query: {} }
             else if (!data.$filter.query)
-                data.$filter.query = [query]
-            else
-                data.$filter.query.push(query)
+                data.$filter.query = {}
+
+            data.$filter.query[keys[1]] = { [keys[0]]: value }
 
         } else {
             if (key === '$array' && value === 'questions') {
@@ -272,10 +274,12 @@
                 for (let value of authorized[apikey]) {
                     if (value[key])
                         value = value[key]
+                    if (!data.object.$filter.query.$or)
+                        data.object.$filter.query.$or = []
                     if (unauthorize)
-                        data.object.$filter.query.push({ key, value, operator: '$ne', logicalOperator: 'or' })
+                        data.object.$filter.query.$or.push({ [key]: { $ne: value } })
                     else
-                        data.object.$filter.query.push({ key, value, operator: '$eq', logicalOperator: 'or' })
+                        data.object.$filter.query.$or.push({ [key]: value })
                 }
                 if (!unauthorize)
                     return true