@live-change/user-service 0.2.11 → 0.2.15

package/authenticator.js

@@ -16,7 +16,7 @@ definition.authenticator({
           let userObserver = null
           let oldCredentials = null
           await authenticatedTable.object(session).onChange(async (authData, oldAuthData) => {
-            output.debug("NEW USER AUTH", authData, "FROM", oldAuthData)
+            //output.debug("NEW USER AUTH", authData, "FROM", oldAuthData)
             const newUser = authData ? authData.user : null
             if(newUser == user) return
             if(user) {
@@ -28,7 +28,7 @@ definition.authenticator({
             }
             if(newUser) {
               user = newUser
-              output.debug("NEW USER", user)
+              //output.debug("NEW USER", user)
               userObject = userTable.object(user)
               const currentUserObject = userObject
               await userObject.onChange(async (userData, oldUserData) => {
@@ -37,7 +37,7 @@ definition.authenticator({
                   user,
                   roles: userData.roles
                 } : null
-                output.debug("NEW CREDENTIALS", newCredentials)
+                //output.debug("NEW CREDENTIALS", newCredentials)
                 output.change(newCredentials, oldCredentials)
                 oldCredentials = newCredentials
               }).then(observer => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/user-service",
-  "version": "0.2.11",
+  "version": "0.2.15",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -24,5 +24,5 @@
     "@live-change/framework": "^0.5.7",
     "@live-change/relations-plugin": "^0.1.10"
   },
-  "gitHead": "2b95c89678f276d6b3a039652169c5fc819df8df"
+  "gitHead": "86bc53700aca24da682d1dd414428f03cdc8d2f5"
 }

package/userItem.js

@@ -21,7 +21,7 @@ definition.processor(function(service, app) {
       const config = model.userItem
       const writeableProperties = modelProperties || config.writableProperties
 
-      console.log("USER ITEM", model)
+      //console.log("USER ITEM", model)
 
       model.itemOf = {
         what: User,
@@ -32,7 +32,10 @@ definition.processor(function(service, app) {
         const viewName = 'myUser' + modelName + 's'
         service.views[viewName] = new ViewDefinition({
           name: viewName,
-          access: config.userReadAccess,
+          access(params, context) {
+            if(!context.client.user) return false
+            return config.userReadAccess ? config.userReadAccess(params, context) : true
+          },
           properties: App.rangeProperties,
           daoPath(range, { client, context }) {
             const path = modelRuntime().indexRangePath('byUser', [client.user], range )
@@ -44,7 +47,10 @@ definition.processor(function(service, app) {
           const viewName = 'myUser' + modelName + 'sBy' + sortFieldUc
           service.views[viewName] = new ViewDefinition({
             name: viewName,
-            access: config.readAccess,
+            access(params, context) {
+              if(!context.client.user) return false
+              return config.userReadAccess ? config.userReadAccess(params, context) : true
+            },
             properties: App.rangeProperties,
             daoPath(range, { client, context }) {
               return modelRuntime().sortedIndexRangePath('byUser' + sortFieldUc, [client.user], range )

package/userProperty.js

@@ -32,13 +32,34 @@ definition.processor(function(service, app) {
         const viewName = 'myUser' + modelName
         service.views[viewName] = new ViewDefinition({
           name: viewName,
-          access: config.userReadAccess,
+          access(params, context) {
+            if(!context.client.user) return false
+            return config.userReadAccess ? config.userReadAccess(params, context) : true
+          },
           daoPath(params, { client, context }) {
             return modelRuntime().path(client.user)
           }
         })
       }
 
+      if(config.userViews) {
+        for(const view of config.userViews) {
+          const viewName = view.name || ('myUser' + (view.prefix || '') + modelName + (view.suffix || ''))
+          service.views[viewName] = new ViewDefinition({
+            name: viewName,
+            access(params, context) {
+              if(!context.client.user) return false
+              return view.access ? view.access(params, context) : true
+            },
+            daoPath(params, { client, context }) {
+              return view.fields
+              ? modelRuntime().limitedPath(client.user, view.fields)
+              : modelRuntime().path(client.user)
+            }
+          })
+        }
+      }
+
       if(config.userSetAccess || config.userWriteAccess) {
         const eventName = 'userOwned' + modelName + 'Set'
         const actionName = 'setMyUser' + modelName