@live-change/user-service 0.2.3 → 0.2.10

package/authenticator.js

@@ -2,8 +2,62 @@ const App = require('@live-change/framework')
 const app = App.app()
 const definition = require('./definition.js')
 
+const { User, AuthenticatedUser } = require('./model.js')
+
 definition.authenticator({
   async credentialsObservable(credentials) {
-
+    return app.dao.observable(
+      ['database', 'queryObject', app.databaseName, `(${
+        async (input, output, { session, authenticatedTableName, userTableName }) => {
+          const authenticatedTable = input.table(authenticatedTableName)
+          const userTable = input.table(userTableName)
+          let user = null
+          let userObject = null
+          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) {
+              if(userObject) {
+                await userObject.unobserve(userObserver)
+              }
+              userObject = null
+              userObserver = null
+            }
+            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
+                  currentUserObject.unobserve(observer)
+                }
+              })
+            } else {
+              output.change(null, oldCredentials)
+              oldCredentials = null
+            }
+          })
+        }
+      })`, {
+        session: credentials.session,
+        authenticatedTableName: AuthenticatedUser.tableName,
+        userTableName: User.tableName
+      }]
+    )
   }
 })

package/definition.js

@@ -1,8 +1,10 @@
-
 const app = require("@live-change/framework").app()
 
+const relationsPlugin = require('@live-change/relations-plugin')
+
 const definition = app.createServiceDefinition({
-  name: "user"
+  name: "user",
+  use: [ relationsPlugin ]
 })
 
 module.exports = definition

package/index.js

@@ -49,16 +49,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({

package/model.js

@@ -31,7 +31,7 @@ definition.event({
 const Session = definition.foreignModel('session', 'Session')
 
 const AuthenticatedUser = definition.model({
-  name: "LoggedInUser",
+  name: "AuthenticatedUser",
   sessionProperty: {
   },
   userItem: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/user-service",
-  "version": "0.2.3",
+  "version": "0.2.10",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -24,5 +24,5 @@
     "@live-change/framework": "^0.5.7",
     "@live-change/relations-plugin": "^0.1.10"
   },
-  "gitHead": "8a862142bf20ec41e48e1f6e7c8cc4312d22c04e"
+  "gitHead": "ae86524e5ac7052eb6b6e7b34e319373b6bdef23"
 }

package/userItem.js

@@ -8,7 +8,6 @@ definition.processor(function(service, app) {
   for(let modelName in service.models) {
     const model = service.models[modelName]
     if(model.userItem) {
-      console.trace("PROCESS MODEL " + modelName)
       if (model.properties.user) throw new Error('user property already exists!!!')
       const originalModelProperties = {...model.properties}
       const modelProperties = Object.keys(model.properties)