@live-change/framework 0.5.12 → 0.5.13

package/lib/App.js

@@ -73,7 +73,7 @@ class App {
     this.databaseName = config?.db?.name || 'test'
 
     this.instanceId = randomString(4)
-    this.uidGenerator = uidGenerator(this.instanceId)
+    this.uidGenerator = uidGenerator(this.instanceId, this.config.uidBorders)
 
     this.activeTimeouts = new Set()
   }

package/lib/runtime/ApiServer.js

@@ -28,24 +28,24 @@ class ApiServer {
 
   async daoFactory(credentialsp, ip) {
     let credentials = { ...credentialsp, ip, roles: [] }
+    const allAuthenticators = []
     if(this.config.authenticators) {
       const auth = Array.isArray(this.config.authenticators)
           ? this.config.authenticators : [this.config.authenticators]
-      for(const authenticator of auth) {
-        if(authenticator && authenticator.prepareCredentials)
-          await authenticator.prepareCredentials(credentials, this.config)
-      }
+      allAuthenticators.push(...auth.filter(a => !!a))
     }
     for(const service of this.config.services) {
-      console.log("SERIVCE AUTH", service.name, service.authenticators)
+      //console.log("SERIVCE AUTH", service.name, service.authenticators)
       if(service.authenticators) {
-        for(const authenticator of service.authenticators) {
-          if(authenticator && authenticator.prepareCredentials)
-            await authenticator.prepareCredentials(credentials, this.config)
-        }
+        allAuthenticators.push(...service.authenticators.filter(a => !!a))
       }
     }
-    const dao = new this.DaoConstructor(this.config, { ...credentials })
+    for(const authenticator of allAuthenticators) {
+      if(authenticator.prepareCredentials) {
+        await authenticator.prepareCredentials(credentials, this.config)
+      }
+    }     
+    const dao = new this.DaoConstructor({ ...this.config, authenticators: allAuthenticators }, { ...credentials })
     await dao.start()
     return dao
   }

package/lib/runtime/LiveDao.js

@@ -11,21 +11,7 @@ class LiveDao extends LcDao.DaoProxy {
 
     this.authenticators = []
     if(this.config.authenticators) {
-      const auth = Array.isArray(this.config.authenticators)
-          ? this.config.authenticators : [this.config.authenticators]
-      for(const authenticator of auth) {
-        if(authenticator && authenticator.authenticatorObservable)
-          this.authenticators.push(authenticator)
-      }
-    }
-    for(const service of this.config.services) {
-      console.log("SERIVCE AUTH", service.name, service.authenticators)
-      if(service.authenticators) {
-        for(const authenticator of service.authenticators) {
-          if(authenticator && authenticator.authenticatorObservable)
-            this.authenticators.push(authenticator)
-        }
-      }
+      this.authenticators = this.config.authenticators.filter(a => a.credentialsObservable)
     }
 
     this.currentDao = null
@@ -48,8 +34,8 @@ class LiveDao extends LcDao.DaoProxy {
     for(const credentialsObserver of this.credentialsObservations) {
       credentials = {
         ...credentials,
-        ...credentialsObservers.credentials,
-        roles: [...credentials.roles, ...credentialsObserver.credentials.roles]
+        ...credentialsObserver.credentials,
+        roles: [...credentials.roles, ...(credentialsObserver.credentials.roles || [])]
       }
     }
     return credentials
@@ -57,13 +43,21 @@ class LiveDao extends LcDao.DaoProxy {
 
   async start() {
     this.credentialsObservations = this.authenticators.map(authenticator => {
-      const observable = authenticator.authenticatorObservable(this.initialCredentials)
+      const result = authenticator.credentialsObservable(this.initialCredentials)
+      const observable = result.then ? new LcDao.ObservablePromiseProxy(result) : result
       const observer = {
-        set: (newCredentials) => {
-          state.credentials = newCredentials
+        set: (data) => {
+          console.log("NEW CREDENTIALS", data)
+          if(data) {
+            const { id, ...newCredentials } = data
+            state.credentials = newCredentials
+          } else {
+            state.credentials = {}
+          }
           this.refreshCredentials()
         }
       }
+      observable.observe(observer)
       const promise = waitForSignal(observable)
       const state = {
         observable, observer, promise, credentials: {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/framework",
-  "version": "0.5.12",
+  "version": "0.5.13",
   "description": "Live Change Framework - ultimate solution for real time mobile/web apps",
   "main": "index.js",
   "scripts": {