@live-change/user-service 0.8.22 → 0.8.24

package/authenticator.js

@@ -18,7 +18,7 @@ definition.authenticator({
           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(newUser === user) return
             output.debug("USER CHANGE", user, '=>', newUser)
             if(user) {
               if(userObject) {
@@ -41,7 +41,7 @@ definition.authenticator({
                 output.change(newCredentials, oldCredentials)
                 oldCredentials = newCredentials
               }).then(observer => {
-                if(user == newUser) {
+                if(user === newUser) {
                   userObserver = observer
                 } else { // if user changed before observer loaded data
                   currentUserObject.unobserve(observer)

package/contactOrUserItem.js

@@ -15,7 +15,6 @@ definition.processor(function(service, app) {
 
       const originalModelProperties = { ...model.properties }
       const modelProperties = Object.keys(model.properties)
-      const defaults = App.utils.generateDefault(model.properties)
       const modelPropertyName = modelName.slice(0, 1).toLowerCase() + modelName.slice(1)
 
       function modelRuntime() {

package/contactOrUserProperty.js

@@ -20,7 +20,6 @@ definition.processor(function(service, app) {
 
       const originalModelProperties = { ...model.properties }
       const modelProperties = Object.keys(model.properties)
-      const defaults = App.utils.generateDefault(model.properties)
 
       function modelRuntime() {
         return service._runtime.models[modelName]
@@ -232,7 +231,8 @@ definition.processor(function(service, app) {
                 newObject[propertyName] = properties[propertyName]
               }
             }
-            const data = App.utils.mergeDeep({}, defaults, newObject)
+            const data = App.utils.mergeDeep({},
+              App.computeDefaults(model, properties, { client, service } ), newObject)
             await App.validation.validate(data, validators, { source: action, action, service, app, client })
             const identifiers = {
               ownerType: 'user_User',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/user-service",
-  "version": "0.8.22",
+  "version": "0.8.24",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -22,9 +22,9 @@
   },
   "type": "module",
   "dependencies": {
-    "@live-change/framework": "^0.8.22",
-    "@live-change/relations-plugin": "^0.8.22",
+    "@live-change/framework": "^0.8.24",
+    "@live-change/relations-plugin": "^0.8.24",
     "pluralize": "^8.0.0"
   },
-  "gitHead": "70a56ac3dc54167a2d32ce47a00150e7a94bd04d"
+  "gitHead": "63e942caccbcb1c9bfbd1a3ef1d097124514c5a7"
 }

package/sessionOrUserItem.js

@@ -15,7 +15,6 @@ definition.processor(function(service, app) {
       if (model.properties.sessionOrUser) throw new Error('user property already exists!!!')
       const originalModelProperties = { ...model.properties }
       const modelProperties = Object.keys(model.properties)
-      const defaults = App.utils.generateDefault(model.properties)
       const modelPropertyName = modelName.slice(0, 1).toLowerCase() + modelName.slice(1)
 
       function modelRuntime() {

package/sessionOrUserProperty.js

@@ -20,14 +20,13 @@ definition.processor(function(service, app) {
 
       const originalModelProperties = { ...model.properties }
       const modelProperties = Object.keys(model.properties)
-      const defaults = App.utils.generateDefault(model.properties)
 
       function modelRuntime() {
         return service._runtime.models[modelName]
       }
 
       const config = model.sessionOrUserProperty
-      const writeableProperties = modelProperties || config.writableProperties
+      const writeableProperties = modelProperties || config.writeableProperties
 
       if(model.propertyOf) throw new Error("model " + modelName + " already have owner")
       if(model.propertyOfAny) throw new Error("model " + modelName + " already have owner")
@@ -40,6 +39,8 @@ definition.processor(function(service, app) {
         to: ['sessionOrUser', ...extendedWith]
       }
 
+      modelProperties.push(...extendedWith.map(p => [p, p+'Type']).flat())
+
       const transferEventName = ['sessionOrUser', ...(extendedWith.map(e => e[0].toUpperCase() + e.slice(1)))]
         .join('And') + 'Owned' + modelName + 'Transferred'
 
@@ -167,7 +168,7 @@ definition.processor(function(service, app) {
           access(params, context) {
             return config.ownerReadAccess ? config.ownerReadAccess(params, context) : true
           },
-          daoPath(params, { client, context }) {
+          async daoPath(params, { client, context }) {
             const owner = client.user ? ['user_User', client.user] : ['session_Session', client.session]
             for(const key of extendedWith) {
               owner.push(params[key+'Type'], params[key])
@@ -253,7 +254,8 @@ definition.processor(function(service, app) {
                 newObject[propertyName] = properties[propertyName]
               }
             }
-            const data = App.utils.mergeDeep({}, defaults, newObject)
+            const data = App.utils.mergeDeep({},
+              App.computeDefaults(model, properties, { client, service } ), newObject)
             await App.validation.validate(data, validators, { source: action, action, service, app, client })
             const identifiers = client.user ? {
               sessionOrUserType: 'user_User',
@@ -363,7 +365,8 @@ definition.processor(function(service, app) {
               identifiers[key]=properties[key]
             }
             if(!entity) {
-              const data = App.utils.mergeDeep({}, defaults, updateObject)
+              const data = App.utils.mergeDeep({},
+                App.computeDefaults(model, properties, { client, service } ), updateObject)
               //console.log('V', { ...identifiers, ...data}, validators)
               await App.validation.validate({ ...identifiers, ...data}, validators,
                   { source: action, action, service, app, client })

package/userItem.js

@@ -14,7 +14,6 @@ definition.processor(function(service, app) {
       if (model.properties.user) throw new Error('user property already exists!!!')
       const originalModelProperties = {...model.properties}
       const modelProperties = Object.keys(model.properties)
-      const defaults = App.utils.generateDefault(model.properties)
       const modelPropertyName = modelName.slice(0, 1).toLowerCase() + modelName.slice(1)
 
       function modelRuntime() {

package/userProperty.js

@@ -16,7 +16,6 @@ definition.processor(function(service, app) {
 
       const originalModelProperties = { ...model.properties }
       const modelProperties = Object.keys(model.properties)
-      const defaults = App.utils.generateDefault(model.properties)
 
       function modelRuntime() {
         return service._runtime.models[modelName]
@@ -84,7 +83,8 @@ definition.processor(function(service, app) {
                 newObject[propertyName] = properties[propertyName]
               }
             }
-            const data = App.utils.mergeDeep({}, defaults, newObject)
+            const data = App.utils.mergeDeep({},
+              App.computeDefaults(model, properties, { client, service }), newObject)
             await App.validation.validate(data, validators, { source: action, action, service, app, client })
             emit({
               type: eventName,