@live-change/access-control-service 0.9.193 → 0.9.195

package/accessControl.js

@@ -37,7 +37,7 @@ definition.processor({
         /* console.log("ACTION", service.name, action.name, "ACCESS CONTROL TO",
           objects, 'CLIENT', client, 'CONFIG', config, "ACCESSIBLE", accessible) */
 
-        if(!accessible) throw 'notAuthorized'
+        if(!accessible) throw app.logicError("notAuthorized")
 
         return oldExec.apply(action, args)
       }
@@ -69,7 +69,7 @@ definition.processor({
         console.log("ROLES", config.roles) */
         const accessible = await access.clientHasAccessRoles(client, { objects }, config.roles)
         //console.log("ACCESSIBLE", accessible)
-        if(!accessible) throw 'notAuthorized'
+        if(!accessible) throw app.logicError("notAuthorized")
         return oldGet.apply(view, args)
       }
       view.observable = (...args) => {

package/invite.js

@@ -144,7 +144,7 @@ definition.trigger({
     ])
     console.log("INVITATION", invitation)
     const invitationData = await AccessInvitation.get(invitation)
-    if(!invitationData) throw 'not_found'
+    if(!invitationData) throw app.logicError("not_found")
     const { roles } = invitationData
     /// Create account and sign-in:
     const user = app.generateUid()
@@ -177,12 +177,12 @@ definition.action({
     }
   },
   async execute({ objectType, object }, {client, service}, emit) {
-    if(!client.user) throw 'not_authorized'
+    if(!client.user) throw app.logicError("not_authorized")
     const user = client.user
     const invitation = App.encodeIdentifier(['user_User', user, objectType, object])
     const invitationData = await AccessInvitation.get(invitation)
     console.log("INVITATION", invitation, invitationData)
-    if(!invitationData) throw 'not_found'
+    if(!invitationData) throw app.logicError("not_found")
     const { roles } = invitationData
     emit({
       type: 'userInvitationAccepted',
@@ -193,7 +193,6 @@ definition.action({
 
 import task from '@live-change/task-service/task.js' // need to import taks.js to avoid circular dependency
 
-
 for(const contactType of config.contactTypes) {
 
   const contactTypeUpperCaseName = contactType[0].toUpperCase() + contactType.slice(1)
@@ -281,7 +280,7 @@ for(const contactType of config.contactTypes) {
       const myRoles = await access.getClientObjectRoles(client, { objectType, object }, true)
       if(!myRoles.includes('admin')) {
         for(const requestedRole of roles) {
-          if(!myRoles.includes(requestedRole)) throw 'notAuthorized'
+          if(!myRoles.includes(requestedRole)) throw app.logicError("notAuthorized")
         }
       }
 
@@ -402,7 +401,7 @@ for(const contactType of config.contactTypes) {
       const myRoles = await access.getClientObjectRoles(client, { objectType, object }, true)
       if(!myRoles.includes('admin')) {
         for(const requestedRole of roles) {
-          if(!myRoles.includes(requestedRole)) throw 'notAuthorized'
+          if(!myRoles.includes(requestedRole)) throw app.logicError("notAuthorized")
         }
       }
 
@@ -464,7 +463,7 @@ for(const contactType of config.contactTypes) {
       )
       if(!myRoles.includes('admin')) {
         for(const requestedRole of roles) {
-          if(!myRoles.includes(requestedRole)) throw 'notAuthorized'
+          if(!myRoles.includes(requestedRole)) throw app.logicError("notAuthorized")
         }
       }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/access-control-service",
-  "version": "0.9.193",
+  "version": "0.9.195",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -21,8 +21,8 @@
     "url": "https://www.viamage.com/"
   },
   "dependencies": {
-    "@live-change/framework": "^0.9.193"
+    "@live-change/framework": "^0.9.195"
   },
-  "gitHead": "8a7627bed2cb66684e7169ddb3998191612e57a9",
+  "gitHead": "9f61eddae56ddd89aba20988b8e208d948728496",
   "type": "module"
 }

package/request.js

@@ -40,14 +40,14 @@ definition.action({
     const [sessionOrUserType, sessionOrUser] =
       client.user ? ['user_User', client.user] : ['session_Session', client.session]
 
-    if(!publicAccess.availableRoles) throw 'notAuthorized'
+    if(!publicAccess.availableRoles) throw app.logicError("notAuthorized")
     for(const requestedRole of roles) {
-      if(!publicAccess.availableRoles.includes(requestedRole)) throw 'notAuthorized'
+      if(!publicAccess.availableRoles.includes(requestedRole)) throw app.logicError("notAuthorized")
     }
 
     const request = App.encodeIdentifier([ sessionOrUserType, sessionOrUser, objectType, object ])
     const requestData = await AccessRequest.get(request)
-    if(requestData) throw 'already_requested'
+    if(requestData) throw app.logicError("already_requested")
 
     if(publicAccess.autoGrantRequests) {
       emit({
@@ -108,12 +108,12 @@ definition.action({
     const myRoles = await access.getClientObjectRoles(client, { objectType, object }, true)
     if(!myRoles.includes('admin')) {
       for(const requestedRole of roles) {
-        if(!myRoles.includes(requestedRole)) throw 'notAuthorized'
+        if(!myRoles.includes(requestedRole)) throw app.logicError("notAuthorized")
       }
     }
     const request = App.encodeIdentifier([ sessionOrUserType, sessionOrUser, objectType, object ])
     const requestData = await AccessRequest.get(request)
-    if(!requestData) throw 'not_found'
+    if(!requestData) throw app.logicError("not_found")
     emit({
       type: 'accessRequestAccepted',
       objectType, object, sessionOrUserType, sessionOrUser, roles

package/view.js

@@ -39,7 +39,7 @@ definition.view({
   },
   async daoPath({ objectType, object, objects }, { client, service }, method) {
     const allObjects = ((objectType && object) ? [{ objectType, object }] : []).concat(objects || [])
-    if(allObjects.length === 0) throw 'empty_objects_list'
+    if(allObjects.length === 0) throw app.logicError("empty_objects_list")
     return access.accessPath(client, allObjects)
   }
 })
@@ -69,7 +69,7 @@ definition.view({
     }
   },
   async daoPath({ objects }, { client, service }, method) {
-    if(objects.length === 0) throw 'empty_objects_list'
+    if(objects.length === 0) throw app.logicError("empty_objects_list")
     return access.accessesPath(client, objects)
   }
 })