@live-change/user-service 0.8.82 → 0.8.83

package/contactOrUserProperty.js

@@ -213,9 +213,11 @@ definition.processor(function(service, app) {
       if(config.ownerSetAccess || config.ownerWriteAccess) {
         const eventName = eventPrefix + modelName + 'Set'
         const actionName = 'setMy' + modelName
+        const identifiers = createIdentifiersProperties(extendedWith)
         service.actions[actionName] = new ActionDefinition({
           name: actionName,
           properties: {
+            ...identifiers,
             ...originalModelProperties
           },
           access: (params, context) => context.client.user
@@ -224,6 +226,11 @@ definition.processor(function(service, app) {
           queuedBy: (command) => command.client.user ? 'u:'+command.client.user : 's:'+command.client.session,
           waitForEvents: true,
           async execute(properties, {client, service}, emit) {
+            const owner = client.user ? ['user_User', client.user] : ['session_Session', client.session]
+            for(const extension of extendedWith) owner.push(properties[extension+'Type'], properties[extension])
+            const id = owner.map(p => JSON.stringify(p)).join(':')
+            const entity = await modelRuntime().get(id)
+            if(entity) throw 'alerady_exists'
             let newObject = {}
             for(const propertyName of writeableProperties) {
               if(properties.hasOwnProperty(propertyName)) {
@@ -234,8 +241,12 @@ definition.processor(function(service, app) {
               App.computeDefaults(model, properties, { client, service } ), newObject)
             await App.validation.validate(data, validators, { source: action, action, service, app, client })
             const identifiers = {
-              ownerType: 'user_User',
-              owner: client.user,
+              contactOrUserType: 'user_User',
+              contactOrUser: client.user,
+            }
+            for(const key of extendedWith) {
+              identifiers[key+'Type'] = properties[key+'Type']
+              identifiers[key]=properties[key]
             }
             emit({
               type: eventName,
@@ -251,9 +262,11 @@ definition.processor(function(service, app) {
       if(config.ownerUpdateAccess || config.ownerWriteAccess) {
         const eventName = eventPrefix + modelName + 'Updated'
         const actionName = 'updateMy' + modelName
+        const identifiers = createIdentifiersProperties(extendedWith)
         service.actions[actionName] = new ActionDefinition({
           name: actionName,
           properties: {
+            ...identifiers,
             ...originalModelProperties
           },
           access: (params, context) => context.client.user
@@ -263,6 +276,7 @@ definition.processor(function(service, app) {
           waitForEvents: true,
           async execute(properties, { client, service }, emit) {
             const owner = client.user ? ['user_User', client.user] : ['session_Session', client.session]
+            for(const extension of extendedWith) owner.push(properties[extension+'Type'], properties[extension])
             const id = owner.map(p => JSON.stringify(p)).join(':')
             const entity = await modelRuntime().get(id)
             if(!entity) throw 'not_found'
@@ -275,8 +289,12 @@ definition.processor(function(service, app) {
             const merged = App.utils.mergeDeep({}, entity, updateObject)
             await App.validation.validate(merged, validators, { source: action, action, service, app, client })
             const identifiers = {
-              ownerType: 'user_User',
-              owner: client.user,
+              contactOrUserType: 'user_User',
+              contactOrUser: client.user,
+            }
+            for(const key of extendedWith) {
+              identifiers[key+'Type'] = properties[key+'Type']
+              identifiers[key]=properties[key]
             }
             emit({
               type: eventName,
@@ -292,20 +310,29 @@ definition.processor(function(service, app) {
       if(config.ownerResetAccess || config.ownerWriteAccess) {
         const eventName = eventPrefix + modelName + 'Reset'
         const actionName = 'resetMy' + modelName
+        const identifiers = createIdentifiersProperties(extendedWith)
         service.actions[actionName] = new ActionDefinition({
           name: actionName,
+          properties: {
+            ...identifiers,
+          },
           access: (params, context) => context.client.user
               && (config.ownerResetAccess || config.ownerWriteAccess)(params, context),
           queuedBy: (command) => command.client.user ? 'u:'+command.client.user : 's:'+command.client.session,
           waitForEvents: true,
           async execute(properties, {client, service}, emit) {
             const owner = client.user ? ['user_User', client.user] : ['session_Session', client.session]
+            for(const extension of extendedWith) owner.push(properties[extension+'Type'], properties[extension])
             const id = owner.map(p => JSON.stringify(p)).join(':')
             const entity = await modelRuntime().get(id)
             if (!entity) throw 'not_found'
             const identifiers = {
-              ownerType: 'user_User',
-              owner: client.user,
+              contactOrUserType: 'user_User',
+              contactOrUser: client.user,
+            }
+            for(const key of extendedWith) {
+              identifiers[key+'Type'] = properties[key+'Type']
+              identifiers[key]=properties[key]
             }
             emit({
               type: eventName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/user-service",
-  "version": "0.8.82",
+  "version": "0.8.83",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -22,9 +22,9 @@
   },
   "type": "module",
   "dependencies": {
-    "@live-change/framework": "^0.8.82",
-    "@live-change/relations-plugin": "^0.8.82",
+    "@live-change/framework": "^0.8.83",
+    "@live-change/relations-plugin": "^0.8.83",
     "pluralize": "^8.0.0"
   },
-  "gitHead": "72f303118f6bb5e324c5d77473b456fc10f7ed04"
+  "gitHead": "a3c85f0869b4c65c2bdd6f181bdfcbe2d6f2bde5"
 }