@live-change/session-service 0.9.197 → 0.9.199

package/index.js

@@ -2,6 +2,7 @@ import App from '@live-change/framework'
 const app = App.app()
 import definition from './definition.js'
 import { Session } from './model.js'
+import localIdValidator from './localIdValidator.js'
 
 definition.view({
   name: 'currentSession',
@@ -76,8 +77,9 @@ definition.trigger({
   }
 })
 
+definition.validator('localId', localIdValidator)
+
 import './authenticator.js'
-import './localIdValidator.js'
 import './sessionProperty.js'
 import './sessionItem.js'
 

package/localIdValidator.js

@@ -1,16 +1,11 @@
-import definition from './definition.js'
 import { decodeUid } from "@live-change/uid"
 
-definition.processor(function(service, app) {
-  
-  service.validators.localId = (settings) => (value, context) => {
-    if (!value) return
-    //console.log("VALIDATE LOCAL ID", value, "=>", decodeUid(value), "BY", context.client)
-    const {date, number, at} = decodeUid(value)
-    if (at.length < 16) return "tooShortSessionFingerprint"
-    if (context.client.session && at === context.client.session.slice(0, at.length)) return
-    if (context.client.user && at === context.client.user.slice(0, at.length)) return
-    return "sessionFingerPrintMismatch"
-  }
-
-})
+export default (settings) => (value, context) => {
+  if (!value) return
+  //console.log("VALIDATE LOCAL ID", value, "=>", decodeUid(value), "BY", context.client)
+  const { date, number, at } = decodeUid(value)
+  if (at.length < 16) return "tooShortSessionFingerprint"
+  if (context.client.session && at === context.client.session.slice(0, at.length)) return
+  if (context.client.user && at === context.client.user.slice(0, at.length)) return
+  return "sessionFingerPrintMismatch"
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/session-service",
-  "version": "0.9.197",
+  "version": "0.9.199",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -22,9 +22,9 @@
   },
   "type": "module",
   "dependencies": {
-    "@live-change/framework": "^0.9.197",
-    "@live-change/relations-plugin": "^0.9.197",
+    "@live-change/framework": "^0.9.199",
+    "@live-change/relations-plugin": "^0.9.199",
     "pluralize": "^8.0.0"
   },
-  "gitHead": "8231c2ed8bc3beed2c732aa5727174417f19082b"
+  "gitHead": "1900043a10cf9ad49b9cc33a539fb973706de962"
 }

package/sessionItem.js

@@ -1,4 +1,5 @@
 import definition from './definition.js'
+import App from '@live-change/framework'
 import {
   PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition, EventDefinition
 } from '@live-change/framework'
@@ -32,8 +33,11 @@ definition.processor(function(service, app) {
         ...config
       }
 
+      if (!model.ownerCrud) model.ownerCrud = {}
+
       if(config.sessionReadAccess) {
         const viewName = 'mySession' + pluralize(modelName)
+        model.ownerCrud.range ??= viewName
         service.views[viewName] = new ViewDefinition({
           name: viewName,
           access: config.sessionReadAccess,
@@ -57,11 +61,32 @@ definition.processor(function(service, app) {
         }
       }
 
+      if(config.sessionReadAccess) {
+        const viewName = 'mySession' + modelName
+        model.ownerCrud.read ??= viewName
+        service.views[viewName] = new ViewDefinition({
+          name: viewName,
+          async access(params, context) {
+            if(!context.client.session) return false
+            if(context.visibilityTest) return true
+            const data = await modelRuntime().get(params[modelPropertyName])
+            if(data.session !== context.client.session) return false
+            return config.sessionReadAccess ? config.sessionReadAccess(params, context) : true
+          },
+          properties: App.rangeProperties,
+          daoPath(params, { client, context }) {
+            const path = modelRuntime().path(params[modelPropertyName])
+            return path
+          }
+        })
+      }
+
       if(config.sessionCreateAccess || config.sessionWriteAccess) {
         const eventName = modelName + 'Created'
         const actionName = 'createMySession' + modelName
         service.actions[actionName] = new ActionDefinition({
           name: actionName,
+          skipValidation: true,
           access: config.sessionCreateAccess || config.sessionWriteAccess,
           properties: {
             ...originalModelProperties,
@@ -76,17 +101,29 @@ definition.processor(function(service, app) {
             const id = properties[modelPropertyName] || app.generateUid()
             const entity = await modelRuntime().get(id)
             if(entity) throw app.logicError("exists")
+            let newObject = {}
+            for(const propertyName of writeableProperties) {
+              if(properties.hasOwnProperty(propertyName)) {
+                newObject[propertyName] = properties[propertyName]
+              }
+            }
+            const data = App.utils.mergeDeep({},
+              App.computeDefaults(model, properties, { client, service }), newObject)
+            await App.validation.validate(data, validators, validationContext)
             emit({
               type: eventName,
               [modelPropertyName]: id,
               identifiers: {
                 session: client.session,
               },
-              data: properties
+              data
             })
             return id
           }
         })
+        model.ownerCrud.create ??= actionName
+        const action = service.actions[actionName]
+        const validators = App.validation.getValidators(action, service, action)
       }
       if(config.sessionUpdateAccess || config.sessionWriteAccess) {
         const eventName =  modelName + 'Updated'
@@ -114,18 +151,21 @@ definition.processor(function(service, app) {
                 updateObject[propertyName] = properties[propertyName]
               }
             }
-            const merged = App.utils.mergeDeep({}, entity, updateObject)
-            await App.validation.validate(merged, validators, validationContext)
+            const computedUpdates = App.computeUpdates(model, { ...entity, ...properties }, { client, service })
+            const data = App.utils.mergeDeep({}, updateObject, computedUpdates)
+            const merged = App.utils.mergeDeep({}, entity, data)
+            await App.validation.validate({ ...merged, [modelPropertyName]: entity.id }, validators, validationContext)
             emit({
               type: eventName,
               [modelPropertyName]: entity.id,
               identifiers: {
                 session: client.session,
               },
-              data: properties
+              data
             })
           }
         })
+        model.ownerCrud.update ??= actionName
         const action = service.actions[actionName]
         const validators = App.validation.getValidators(action, service, action)
       }
@@ -156,6 +196,7 @@ definition.processor(function(service, app) {
             })
           }
         })
+        model.ownerCrud.delete ??= actionName
       }
     }
   }

package/sessionProperty.js

@@ -28,8 +28,11 @@ definition.processor(function(service, app) {
         ...config
       }
 
+      if (!model.ownerCrud) model.ownerCrud = {}
+
       if(config.sessionReadAccess) {
         const viewName = 'mySession' + modelName
+        model.ownerCrud.read ??= viewName
         service.views[viewName] = new ViewDefinition({
           name: viewName,
           access: config.sessionReadAccess,
@@ -85,6 +88,7 @@ definition.processor(function(service, app) {
             })
           }
         })
+        model.ownerCrud.create ??= actionName
         const action = service.actions[actionName]
         const validators = App.validation.getValidators(action, service, action)
       }
@@ -110,17 +114,21 @@ definition.processor(function(service, app) {
                 updateObject[propertyName] = properties[propertyName]
               }
             }
-            const merged = App.utils.mergeDeep({}, entity, updateObject)
-            await App.validation.validate(merged, validators, validationContext)
+            const computedUpdates = App.computeUpdates(model, { ...entity, ...properties }, { client, service })
+            const data = App.utils.mergeDeep({}, updateObject, computedUpdates)
+            const merged = App.utils.mergeDeep({}, entity, data)
+            await App.validation.validate({ session: client.session, ...merged }, validators,
+              validationContext)
             emit({
               type: eventName,
               identifiers: {
                 session: client.session
               },
-              data: properties || {}
+              data
             })
           }
         })
+        model.ownerCrud.update ??= actionName
         const action = service.actions[actionName]
         const validators = App.validation.getValidators(action, service, action)
       }
@@ -144,6 +152,7 @@ definition.processor(function(service, app) {
             })
           }
         })
+        model.ownerCrud.reset ??= actionName
       }
 
     }