@live-change/session-service 0.1.11 → 0.1.12

package/authenticator.js

@@ -3,30 +3,33 @@ const app = App.app()
 const definition = require('./definition.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

@@ -3,10 +3,6 @@ const app = App.app()
 const definition = require('./definition.js')
 const Session = require('./model.js')
 
-
-const User = definition.foreignModel('user', 'User')
-
-
 definition.view({
   name: 'currentSession',
   properties: {},
@@ -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

@@ -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,114 +25,10 @@ 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 })
   }
 })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/session-service",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "description": "",
   "main": "index.js",
   "scripts": {

package/sessionProperty.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)
-      const modelPropertyName = modelName.slice(0, 1).toLowerCase() + modelName.slice(1)
 
       function modelRuntime() {
         return service._runtime.models[modelName]