@rpcbase/client 0.158.0 → 0.160.0

package/auth/SignIn/SignInEmailForm.js

@@ -46,11 +46,12 @@ const SignInEmailForm = ({onSuccess, onSuccessRedirect}) => {
       assert(res.user_id, "missing user_id")
 
       setUid(user_id)
-      set_tenant_id(user_id.slice(8, 16))
+      const tenantId = user_id.slice(8, 16)
+      set_tenant_id(tenantId)
       set_is_signed_in(true)
 
       // we must now reconnect on the websocket as we now have a new cookie
-      rts_reconnect()
+      rts_reconnect(tenantId)
       onSuccess()
       if (redirect) {
         page(redirect)

package/auth/SignUp/SignUpEmailForm.js

@@ -25,11 +25,13 @@ const SignUpEmailForm = ({onSuccessRedirect, onSuccess}) => {
     if (res.status === "ok") {
       const {user_id} = res
       setUid(user_id)
-      set_tenant_id(user_id.slice(8, 16))
+
+      const tenantId = user_id.slice(8, 16)
+      set_tenant_id(tenantId)
       set_is_signed_in(true)
 
       // we must now reconnect on the websocket as we have a new cookie
-      rts_reconnect()
+      rts_reconnect(tenantId)
       onSuccess()
       page(onSuccessRedirect)
     } else if (res.status === "error") {

package/auth/index.js

@@ -130,5 +130,3 @@ export const set_tenant_id = (val) => {
 export const set_is_signed_in = (val) => __is_authenticated = val
 
 export const is_signed_in = () => __is_authenticated
-
-export * from "./sign_out"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/client",
-  "version": "0.158.0",
+  "version": "0.160.0",
   "scripts": {
     "test": "../../node_modules/.bin/wireit"
   },

package/rts/rts.js

@@ -7,7 +7,6 @@ import _set from "lodash/set"
 import debug from "debug"
 
 import getBaseUrl from "../getBaseUrl"
-import getTenantId from "../auth/getTenantId"
 
 import store from "./store"
 
@@ -15,7 +14,7 @@ const log = debug("rb:socket")
 
 const TENANT_ID_HEADER = "rb-tenant-id"
 
-// how many local transaction ids are we keeping, it doesn't really need to be that big
+// how many local transaction ids are we keeping, ?it doesn't really need to be that big
 const MAX_TXN_BUF = 2048
 
 let _socket
@@ -88,8 +87,7 @@ const dispatch_query_payload = (payload) => {
 }
 
 
-export const connect = () => new Promise((resolve) => {
-  const tenant_id = getTenantId()
+export const connect = (tenant_id) => new Promise((resolve) => {
 
   if (tenant_id) {
     log("rts client will connect")
@@ -98,7 +96,6 @@ export const connect = () => new Promise((resolve) => {
     return
   }
 
-
   _socket = io(getBaseUrl(), {
     forceNew: true,
     transports: ["websocket", "polling"],
@@ -153,13 +150,13 @@ export const disconnect = () => {
 }
 
 
-export const reconnect = () => {
+export const reconnect = (tenant_id) => {
   log("socket will force reconnect")
 
   // destroy current socket if exists
   disconnect()
 
-  connect()
+  connect(tenant_id)
 }
 
 // register a query