npm - @live-change/session-service - Versions diffs - 0.1.11 → 0.2.2 - Mend

@live-change/session-service 0.1.11 → 0.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/authenticator.js CHANGED Viewed

@@ -1,32 +1,35 @@
 const App = require('@live-change/framework')
 const app = App.app()
 const definition = require('./definition.js')
-const Session = require('./model.js')
+const { Session } = require('./model.js')
 const { createHmac } = require('crypto')
+const config = definition.config
-definition.authenticator(async function(credentials, config) {
-  const sessionKey = credentials.sessionKey
-  if(!sessionKey) throw new Error("sessionKey required!")
-  const sessions = await app.dao.get(
-      ['database', 'indexRange', app.databaseName, Session.tableName + '_byKey', {
-        gt: `"${sessionKey}"_`,
-        lt: `"${sessionKey}"_\xFF`
-      }])
-  //console.log("FOUND SESSIONS", sessions)
-  let session = sessions[0]?.to
-  if(!session) {
-    if(config.createSessionOnUpdate) {
-      session = createHmac('sha256', config.sessionHmacSecret || 'secret')
-          .update(credentials.sessionKey)
-          .digest('base64').slice(0, 32)
-    } else {
-      const createResult = await app.triggerService(definition.name, {
-        type: "createSessionKeyIfNotExists",
-        sessionKey
-      })
-      //console.log("CREATE SESSION RESULT", createResult)
-      session = createResult.session
+definition.authenticator({
+  async prepareCredentials(credentials) {
+    const sessionKey = credentials.sessionKey
+    if(!sessionKey) throw new Error("sessionKey required!")
+    const sessions = await app.dao.get(
+        ['database', 'indexRange', app.databaseName, Session.tableName + '_byKey', {
+          gt: `"${sessionKey}"_`,
+          lt: `"${sessionKey}"_\xFF`
+        }])
+    //console.log("FOUND SESSIONS", sessions)
+    let session = sessions[0]?.to
+    if(!session) {
+      if(config.createSessionOnUpdate) {
+        session = createHmac('sha256', config.sessionHmacSecret || 'secret')
+            .update(credentials.sessionKey)
+            .digest('base64').slice(0, 32)
+      } else {
+        const createResult = await app.triggerService(definition.name, {
+          type: "createSessionKeyIfNotExists",
+          sessionKey
+        })
+        //console.log("CREATE SESSION RESULT", createResult)
+        session = createResult.session
+      }
     }
+    credentials.session = session
   }
-  credentials.session = session
 })

package/index.js CHANGED Viewed

@@ -1,11 +1,7 @@
 const App = require("@live-change/framework")
 const app = App.app()
 const definition = require('./definition.js')
-const Session = require('./model.js')
-const User = definition.foreignModel('user', 'User')
+const { Session } = require('./model.js')
 definition.view({
   name: 'currentSession',
@@ -20,7 +16,6 @@ definition.view({
       async (input, output, { session, tableName }) => {
         const mapper = (obj) => (obj || {
           id: session,
-          user: null,
           roles: []
         })
         let storedObj = undefined
@@ -81,50 +76,9 @@ definition.trigger({
   }
 })
-definition.action({
-  name: "logout",
-  properties: {
-  },
-  async execute({ session }, { client, service }, emit) {
-    if(!session) session = client.session
-    if(session != client.session) throw new Error("Wrong session id")
-    const sessionRow = await Session.get(session)
-    if(!sessionRow) throw 'notFound'
-    if(!sessionRow.user) throw "loggedOut"
-    emit({
-      type: "loggedOut",
-      session
-    })
-    await service.trigger({
-      type: "OnLogout",
-      user: sessionRow.user,
-      session: client.session
-    })
-    return 'loggedOut'
-  }
-})
-definition.trigger({
-  name: "UserDeleted",
-  properties: {
-    user: {
-      type: User,
-      idOnly: true
-    }
-  },
-  async execute({ user }, context, emit) {
-    emit([{
-      type: "UserDeleted",
-      user
-    }])
-  }
-})
 require('./authenticator.js')
 require('./localIdValidator.js')
 require('./sessionProperty.js')
 require('./sessionItem.js')
 module.exports = definition

package/model.js CHANGED Viewed

@@ -1,29 +1,15 @@
 const definition = require("./definition.js")
-const User = definition.foreignModel('user', 'User')
 const Session = definition.model({
   name: "Session",
   properties: {
     key: {
       type: String
-    },
-    user: {
-      type: User
-    },
-    roles: {
-      type: Array,
-      of: {
-        type: String
-      }
     }
   },
   indexes: {
     byKey: {
       property: 'key'
-    },
-    byUser: {
-      property: "user"
     }
   }
 })
@@ -39,115 +25,11 @@ definition.event({
     }
   },
   async execute({ session, key }) {
-    console.log("SESSION CREATING!", session, "AT", (new Date()).toISOString())
     await Session.create({
       id: session,
-      key: key,
-      user: null,
-      roles: []
+      key: key
     })
-    console.log("SESSION CREATED!", session, "AT", (new Date()).toISOString())
-  }
-})
-definition.event({
-  name: "loggedIn",
-  properties: {
-    session: {
-      type: Session
-    },
-    user: {
-      type: User
-    },
-    roles: {
-      type: Array,
-      of: {
-        type: String
-      }
-    },
-    expire: {
-      type: Date
-    }
-  },
-  async execute({ session, user, roles, expire, language, timezone }) {
-    console.log("SESSION UPDATE", session, { user, roles, expire, language, timezone })
-    await Session.update(session, { user, roles, expire, language, timezone })
-  }
-})
-definition.event({
-  name: "loggedOut",
-  properties: {
-    session: {
-      type: Session
-    }
-  },
-  async execute({ session }) {
-    await Session.update(session, [
-      { op: 'reverseMerge', value: { id: session } },
-      { op: 'merge', value: { user: null, roles: [] } }
-    ])
-  }
-})
-definition.event({
-  name: "UserDeleted",
-  properties: {
-    user: {
-      type: User
-    }
-  },
-  async execute({ user }) {
-    await app.dao.request(['database', 'query'], app.databaseName, `(${
-        async (input, output, { table, index, user }) => {
-          const prefix = `"${user}"_`
-          await (await input.index(index)).range({
-            gte: prefix,
-            lte: prefix+"\xFF\xFF\xFF\xFF"
-          }).onChange((ind, oldInd) => {
-            if(ind && ind.to) {
-              output.table(table).update(ind.to, [
-                { op: 'reverseMerge', value: { id: ind.to } },
-                { op: 'merge', value: { user: null, roles: [], expire: null } }
-              ])
-            }
-          })
-        }
-    })`, { table: Session.tableName, index: Session.tableName + '_byUser', user })
-  }
-})
-definition.event({
-  name: "rolesUpdated",
-  properties: {
-    user: {
-      type: User
-    },
-    roles: {
-      type: Array,
-      of: {
-        type: String
-      }
-    }
-  },
-  async execute({ user, roles }) {
-    await app.dao.request(['database', 'query'], app.databaseName, `(${
-        async (input, output, { table, index, user, roles }) => {
-          const prefix = `"${user}"_`
-          await (await input.index(index)).range({
-            gte: prefix,
-            lte: prefix+"\xFF\xFF\xFF\xFF"
-          }).onChange((ind, oldInd) => {
-            if(ind && ind.to) {
-              output.table(table).update(ind.to, [
-                { op: 'reverseMerge', value: { id: session } },
-                { op: 'merge', value: { roles } }
-              ])
-            }
-          })
-        }
-    })`, { table: Session.tableName, index: Session.tableName + '_byUser', user, roles })
   }
 })
-module.exports = Session
+module.exports = { Session }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/session-service",
-  "version": "0.1.11",
+  "version": "0.2.2",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -8,13 +8,13 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/live-change/session-service.git"
+    "url": "git+https://github.com/live-change/live-change-services.git"
   },
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/live-change/session-service/issues"
+    "url": "https://github.com/live-change/live-change-services/issues"
   },
-  "homepage": "https://github.com/live-change/session-service",
+  "homepage": "https://github.com/live-change/live-change-services",
   "author": {
     "email": "michal@laszczewski.pl",
     "name": "Michał Łaszczewski",
@@ -23,5 +23,6 @@
   "dependencies": {
     "@live-change/framework": "^0.5.7",
     "@live-change/relations-plugin": "^0.1.10"
-  }
+  },
+  "gitHead": "7691357c7569a18373668691eb6a81a9e161194d"
 }

package/sessionItem.js CHANGED Viewed

@@ -1,7 +1,7 @@
 const definition = require("./definition.js")
 const App = require("@live-change/framework")
 const { PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition, EventDefinition } = App
-const Session = require("./model.js")
+const { Session } = require("./model.js")
 definition.processor(function(service, app) {

package/sessionProperty.js CHANGED Viewed

@@ -1,13 +1,12 @@
 const definition = require("./definition.js")
 const App = require("@live-change/framework")
 const { PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition, EventDefinition } = App
-const Session = require("./model.js")
+const { Session } = require("./model.js")
 definition.processor(function(service, app) {
   for(let modelName in service.models) {
     const model = service.models[modelName]
-    console.log("SP", modelName)
     if(model.sessionProperty) {
       console.log("MODEL " + modelName + " IS SESSION PROPERTY, CONFIG:", model.sessionProperty)
@@ -16,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() {
         return service._runtime.models[modelName]
@@ -30,14 +28,6 @@ definition.processor(function(service, app) {
         ...config
       }
-      model.properties.session = new PropertyDefinition({
-        type: Session,
-        validation: ['nonEmpty']
-      })
-      if(!model.indexes) model.indexes = {}
-      model.indexes.bySession = new IndexDefinition({
-        property: 'session'
-      })
       if(config.sessionReadAccess) {
         const viewName = 'mySession' + modelName
         service.views[viewName] = new ViewDefinition({