@live-change/framework 0.8.75 → 0.8.76

package/lib/App.js

@@ -582,22 +582,22 @@ class App {
     const service = this.startedServices[serviceName]
     const view = service.views[viewName]
     if(!view) throw new Error(`View ${viewName} not found in service ${serviceName}`)
-    const result = view.observable(params)
-    return result.then ? new LcDao.ObservablePromiseProxy(result) : result
+    const result = view.observable(params, { internal: true, roles: ['admin'] })
+    return result.then ? new ReactiveDao.ObservablePromiseProxy(result) : result
   }
 
   async serviceViewGet(serviceName, viewName, params) {
     const service = this.startedServices[serviceName]
     const view = service.views[viewName]
     if(!view) throw new Error(`View ${viewName} not found in service ${serviceName}`)
-    return await view.get(params)
+    return await view.get(params, { internal: true, roles: ['admin'] })
   }
 
   viewObservable(viewName, params) {
     const view = this.globalViews[viewName]
     if(!view) throw new Error(`Global view ${viewName} not found`)
-    const result = view.observable(params)
-    return result.then ? new LcDao.ObservablePromiseProxy(result) : result
+    const result = view.observable(params, { internal: true, roles: ['admin'] })
+    return result.then ? new ReactiveDao.ObservablePromiseProxy(result) : result
   }
 
   async viewGet(viewName, params) {

package/lib/clientSideFilters/accessFilter.js

@@ -23,7 +23,7 @@ export default async function(service, definition, app, client) {
   for(let viewName in definition.views) {
     const view = service.definition.views[viewName]
     if(view.internal &&
-      !(client.roles.includes('admin') || client.roles.includes('administrator'))) {
+      !(client.roles.includes('admin'))) {
       delete definition.views[viewName]
     }
     if(!view.access) continue;

package/lib/processors/accessMethod.js

@@ -4,7 +4,6 @@ export default function getAccessMethod(access) {
   } else if(Array.isArray(access)) {
     return (params, { service, client }) => {
       if(client.internal) return true
-      if(client.roles.includes('administrator')) return true
       if(client.roles.includes('admin')) return true
       for(let role of access) if(client.roles.includes(role)) return true
       return false
@@ -12,7 +11,6 @@ export default function getAccessMethod(access) {
   } else if(access === 'internal') {
     return (params, { service, client }) => {
       if(client.internal) return true
-      if(client.roles.includes('administrator')) return true
       if(client.roles.includes('admin')) return true
       return false
     }

package/lib/runtime/TriggerHandler.js

@@ -22,7 +22,7 @@ class TriggerHandler {
     const preparedParams = await prepareParameters(parameters, this.definition.properties, this.service)
     //console.log("PREP PARAMS", preparedParams)
 
-    let resultPromise = this.definition.execute({
+    let resultPromise = Promise.resolve(this.definition.execute({
       ...preparedParams
     }, {
       ...trig,
@@ -38,8 +38,8 @@ class TriggerHandler {
         cause: trig.id,
         ...trigger
       }, data, returnArray)
-    }, emit)
-
+    }, emit))
+    console.log("RESULT PROMISE", resultPromise, resultPromise.then)
     resultPromise = resultPromise.then(async result => {
       const processedResult = await processReturn(result, this.definition.returns, this.service)
       return processedResult

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/framework",
-  "version": "0.8.75",
+  "version": "0.8.76",
   "description": "Live Change Framework - ultimate solution for real time mobile/web apps",
   "main": "index.js",
   "scripts": {
@@ -22,8 +22,8 @@
   },
   "homepage": "https://github.com/live-change/live-change-stack",
   "devDependencies": {
-    "@live-change/dao": "^0.8.75",
-    "@live-change/uid": "^0.8.75"
+    "@live-change/dao": "^0.8.76",
+    "@live-change/uid": "^0.8.76"
   },
-  "gitHead": "9380bbf47a2a9087840cc71afe5b3eace66fa6ab"
+  "gitHead": "70c9a5ffb257f57b77754027d9c543584ca3423b"
 }