@live-change/user-service 0.2.8 → 0.2.13

package/authenticator.js

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

package/index.js

@@ -40,6 +40,8 @@ definition.trigger({
     }
   },
   async execute({ user, session }, { client, service }, emit) {
+    const userData = await User.get(user)
+    if(!userData) throw 'userNotFound'
     emit({
       type: "signedIn",
       user, session
@@ -49,16 +51,6 @@ definition.trigger({
 
 definition.action({
   name: 'signOut',
-  properties: {
-    user: {
-      type: User,
-      validation: ['nonEmpty']
-    },
-    session: {
-      type: Session,
-      validation: ['nonEmpty']
-    }
-  },
   async execute({ }, { client, service }, emit) {
     if(!client.user) throw "notSignedIn"
     emit({
@@ -95,5 +87,25 @@ definition.trigger({
   }
 })
 
+definition.action({
+  name: 'deleteMe',
+  properties: {
+  },
+  access: (params, { client }) => {
+    return !!client.user
+  },
+  async execute({ }, { client, service }, emit) {
+    const user = client.user
+    await service.trigger({
+      type: 'userDeleted',
+      user
+    })
+    emit([{
+      type: "deleted",
+      user
+    }])
+    return user
+  }
+})
 
 module.exports = definition

package/model.js

@@ -72,4 +72,17 @@ definition.event({
   }
 })
 
+definition.event({
+  name: "deleted",
+  properties: {
+    user: {
+      type: User
+    }
+  },
+  async execute({ user }) {
+    const authenticated = await AuthenticatedUser.indexRangeGet('byUser', user)
+    await Promise.all([ User.delete(user) ].concat(authenticated.map(auth => AuthenticatedUser.delete(auth))))
+  }
+})
+
 module.exports = { User, AuthenticatedUser }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/user-service",
-  "version": "0.2.8",
+  "version": "0.2.13",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -24,5 +24,5 @@
     "@live-change/framework": "^0.5.7",
     "@live-change/relations-plugin": "^0.1.10"
   },
-  "gitHead": "1e8102d02b6745fea401e967c211c6a9cb03e19b"
+  "gitHead": "add122f25ae8a848c2d24e1a75c3c9ae69d86faa"
 }

package/userItem.js

@@ -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