@rpcbase/client 0.53.0 → 0.54.0

package/AppProvider/index.js

@@ -10,24 +10,41 @@ import {flagValues} from "config/flags"
 
 import {POSTHOG_KEY} from "env"
 
-const AppProvider = ({children, ...props}) => {
 
+const AnalyticsWrapper = ({children, ...props}) => {
+
+  const {hostname} = window.location
+  if (__DEV__ || hostname === "localhost" || hostname.endsWith(".local")) {
+    return (
+      <>{children}</>
+    )
+  } else {
+    return (
+      <PostHogProvider
+        apiKey={POSTHOG_KEY}
+        options={{
+          api_host: "https://eu.posthog.com",
+          // TODO: this doesn't work
+          bootstrap: {
+            featureFlags: flagValues,
+          },
+        }}
+      >
+        {children}
+      </PostHogProvider>
+    )
+  }
+}
+
+
+const AppProvider = ({children, ...props}) => {
 
   return (
-    <PostHogProvider
-      apiKey={POSTHOG_KEY}
-      options={{
-        api_host: "https://eu.posthog.com",
-        // TODO: this doesn't work
-        bootstrap: {
-          featureFlags: flagValues,
-        },
-      }}
-    >
+    <AnalyticsWrapper>
       <HashStateProvider>
         {children}
       </HashStateProvider>
-    </PostHogProvider>
+    </AnalyticsWrapper>
   )
 
 }

package/auth/SignIn/index.js

@@ -1,4 +1,5 @@
 /* @flow */
+import assert from "assert"
 import {useState, useEffect} from "react"
 import {useSearchParam} from "react-use"
 import isEmail from "validator/lib/isEmail"
@@ -8,7 +9,7 @@ import debug from "debug"
 import post from "../../helpers/post"
 import {reconnect as rts_reconnect} from "../../rts"
 
-import {set_is_signed_in, set_uid} from "../index"
+import {set_is_signed_in, set_uid, set_tenant_id} from "../index"
 import Footer from "../Footer"
 
 import "./sign-in.scss"
@@ -16,7 +17,6 @@ import "./sign-in.scss"
 
 const log = debug("rb:auth:signin")
 
-
 const SIGNIN_WITH_GITHUB = false
 
 const SignIn = ({
@@ -52,7 +52,11 @@ const SignIn = ({
     if (res.status === "ok") {
       log("signed in res: ok", res)
       log("redirect to:", redirect || onSuccessRedirect)
-      set_uid(res.user_id)
+      const {user_id} = res
+      assert(res.user_id, "missing user_id")
+
+      set_uid(user_id)
+      set_tenant_id(user_id.slice(0, 8))
       set_is_signed_in(true)
 
       // we must now reconnect on the websocket as we now have a new cookie

package/auth/get_tenant_id.js

@@ -0,0 +1,11 @@
+/* @flow */
+import {Platform} from "react-native"
+
+import {get_tenant_id as _get_tenant_id} from "./index"
+
+const get_tenant_id = Platform.OS === "web" ? _get_tenant_id : () => {
+  console.warn("native should not call get_tenant_id, use tenantId from AuthContext")
+  return null
+}
+
+export default get_tenant_id

package/auth/index.js

@@ -2,27 +2,50 @@
 import page from "page"
 import debug from "debug"
 
+import {disconnect as rts_disconnect} from "../rts"
 import post from "../helpers/post"
 
-
-const UID_STORAGE_KEY = "rb::session-user_id"
+const LAST_TENANT_KEY = "rb.last_tenant_id"
+const uid_storage_key = (tenant_id) => `rb.${tenant_id}.user_id`
 
 const log = debug("rb:auth")
 
 // TODO: this should be refactored to AuthContext + Provider
 
 let __is_authenticated = null
-let __user_id = typeof localStorage !== "undefined" && localStorage.getItem(UID_STORAGE_KEY)
+
+let __tenant_id = typeof localStorage !== "undefined" && localStorage.getItem(LAST_TENANT_KEY)
+let __user_id = typeof localStorage !== "undefined" && __tenant_id && localStorage.getItem(uid_storage_key(__tenant_id))
 
 
 const run_session_check = async() => {
   const res = await post("/api/v1/auth/check_session")
-  console.log("check_session response", res)
-  __user_id = res.user_id
+
+  log("check_session response", res)
+
   __is_authenticated = res.is_signed_in
-  // cache user_id in localStorage
-  if (__user_id) {
-    localStorage.setItem(UID_STORAGE_KEY, __user_id)
+
+
+  // if not authenticated, clear __user_id + __tenant_id and disconnect socket
+  if (!__is_authenticated) {
+    __user_id = null
+    __tenant_id = null
+    rts_disconnect()
+    return
+  }
+
+  __user_id = res.user_id
+  __tenant_id = __user_id.slice(0, 8)
+
+  // save tenant id
+  // TODO: should we be using session storage here ?
+  if (__tenant_id) {
+    localStorage.setItem(LAST_TENANT_KEY, __tenant_id)
+
+    // cache user_id in localStorage
+    if (__user_id) {
+      localStorage.setItem(uid_storage_key(__tenant_id), __user_id)
+    }
   }
 }
 
@@ -69,6 +92,9 @@ export const session_restrict = (ctx, next) => {
 export const get_uid = () => __user_id
 export const set_uid = (val) => __user_id = val
 
+export const get_tenant_id = () => __tenant_id
+export const set_tenant_id = (val) => __tenant_id = val
+
 export const set_is_signed_in = (val) => __is_authenticated = val
 
 export const is_signed_in = () => __is_authenticated

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/client",
-  "version": "0.53.0",
+  "version": "0.54.0",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 0"
   },

package/rpc_post.js

@@ -7,12 +7,15 @@ import _set from "lodash/set"
 import get_txn_id from "@rpcbase/std/get_txn_id"
 import {add_local_txn} from "@rpcbase/client/rts"
 
+import get_tenant_id from "./auth/get_tenant_id"
 import BASE_URL from "./base_url"
 
+const TENANT_ID_HEADER = "rb-tenant-id"
+
 const client = axios.create({
   withCredentials: true,
   headers: {
-    "Content-Type": "application/json"
+    "Content-Type": "application/json",
   },
 })
 
@@ -25,6 +28,8 @@ const rpc_post = async(url, payload, options = {}) => {
   assert(txn_id, `unable to find txn_id for request ${url}`)
   add_local_txn(txn_id)
 
+  options.headers[TENANT_ID_HEADER] = get_tenant_id()
+
   const res = await client.post(`${BASE_URL}${url}`, payload, options)
 
   if (res.data === "") {

package/rts/getUseQuery.js

@@ -11,7 +11,7 @@ import get_uid from "@rpcbase/client/auth/get_uid"
 import cacheStorage from "./cacheStorage"
 
 
-const log = debug("rb:rts:client")
+const log = debug("rb:useQuery")
 
 const getUseQuery = (register_query) => (
   model_name,

package/rts/index.js

@@ -6,12 +6,16 @@ import _set from "lodash/set"
 import debug from "debug"
 
 import BASE_URL from "../base_url"
+import {get_tenant_id} from "../auth"
 
 import store from "./store"
 import getUseQuery from "./getUseQuery"
 
-const log = debug("rb:rts:client")
+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
 const MAX_TXN_BUF = 2048
 
 let _socket
@@ -83,13 +87,23 @@ const dispatch_query_payload = (payload) => {
 
 
 export const connect = () => new Promise((resolve) => {
-  log("rts client will connect")
+  const tenant_id = get_tenant_id()
+
+  if (tenant_id) {
+    log("rts client will connect")
+  } else {
+    log("no tenant_id, rts connect will skip")
+    return
+  }
+
 
   _socket = io(BASE_URL, {
     forceNew: true,
     transports: ["websocket", "polling"],
     withCredentials: true,
-    // extraHeaders: {},
+    query: {
+      [TENANT_ID_HEADER]: tenant_id,
+    },
     // https://socket.io/docs/v4/client-options/#reconnection
     reconnection: true,
     reconnectionAttempts: 128,
@@ -124,14 +138,23 @@ export const connect = () => new Promise((resolve) => {
   })
 })
 
+
+export const disconnect = () => {
+  if (_socket) {
+    _socket.disconnect()
+    _socket = null
+  }
+}
+
+
 export const reconnect = () => {
   log("socket will force reconnect")
-  _socket?.disconnect()
-  setTimeout(() => {
-    _socket?.connect()
-  }, 200)
-}
 
+  // destroy current socket if exists
+  disconnect()
+
+  connect()
+}
 
 // register a query
 export const register_query = (model_name, query, _options, _callback) => {