@rpcbase/client 0.174.0 → 0.175.0

package/auth/{AccountsList → components/AccountsList}/AccountListItem.js

@@ -1,9 +1,6 @@
 /* @flow */
-import assert from "assert"
-
-import page from "../../page"
-import getInitials from "../../helpers/getInitials"
-import Avatar from "../../ui/Avatar"
+import getInitials from "../../../helpers/getInitials"
+import Avatar from "../../../ui/Avatar"
 
 import "./account-list-item.scss"
 
@@ -47,7 +44,7 @@ const getUserName = (user) => {
   return name
 }
 
-const AccountListItem = ({account, onClick, avatarProps}) => {
+export const AccountListItem = ({account, onClick, avatarProps}) => {
 
   return (
     <div
@@ -62,5 +59,3 @@ const AccountListItem = ({account, onClick, avatarProps}) => {
     </div>
   )
 }
-
-export default AccountListItem

package/auth/{AccountsList → components/AccountsList}/index.js

@@ -1,8 +1,8 @@
 /* @flow */
-import AccountListItem from "./AccountListItem"
+import {AccountListItem} from "./AccountListItem"
 
 
-const AccountsList = ({accounts}) => {
+export const AccountsList = ({accounts}) => {
 
   return (
     <>
@@ -15,5 +15,3 @@ const AccountsList = ({accounts}) => {
     </>
   )
 }
-
-export default AccountsList

package/auth/{Footer.js → components/Footer/index.js}

@@ -1,8 +1,7 @@
 /* @flow */
-
 const year = (new Date).getFullYear()
 
-const Footer = ({name}) => {
+export const Footer = ({name}) => {
 
   return (
     <footer className="pt-5 my-5 text-muted border-top">
@@ -10,5 +9,3 @@ const Footer = ({name}) => {
     </footer>
   )
 }
-
-export default Footer

package/auth/{ForgotPassword → components/ForgotPassword}/index.js

@@ -4,14 +4,13 @@ import {useHash} from "react-use"
 import {ActivityIndicator} from "react-native"
 import isEmail from "validator/lib/isEmail"
 
-import post from "../../helpers/post"
+import post from "../../../helpers/post"
 
-import {set_is_signed_in} from "../index"
-import Footer from "../Footer"
+import {Footer} from "../Footer"
 
 import "./forgot-password.scss"
 
-const ForgotPassword = ({name, logo}) => {
+export const ForgotPassword = ({name, logo}) => {
   const [hash, setHash] = useHash()
 
   const [isLoading, setIsLoading] = useState(false)
@@ -113,5 +112,3 @@ const ForgotPassword = ({name, logo}) => {
     </div>
   )
 }
-
-export default ForgotPassword

package/auth/{SetNewPassword → components/SetNewPassword}/index.js

@@ -2,16 +2,14 @@
 import {useState, useEffect} from "react"
 import {useSearchParam} from "react-use"
 import {ActivityIndicator} from "react-native"
-import isEmail from "validator/lib/isEmail"
 
-import post from "../../helpers/post"
+import post from "../../../helpers/post"
 
-import {set_is_signed_in} from "../index"
-import Footer from "../Footer"
+import {Footer} from "../Footer"
 
 import "./set-new-password.scss"
 
-const SetNewPassword = ({name, logo}) => {
+export const SetNewPassword = ({name, logo}) => {
   const [isLoading, setIsLoading] = useState(false)
   const [error, setError] = useState()
   const [isSuccess, setIsSuccess] = useState(false)
@@ -22,10 +20,6 @@ const SetNewPassword = ({name, logo}) => {
   const user_id = useSearchParam("uid")
   const token = useSearchParam("token")
 
-  // useEffect(() => {
-  //   console.log("TOKEN", user_id, token)
-  // }, [user_id, token])
-
   const onSubmit = async(e) => {
     e.preventDefault()
 
@@ -134,5 +128,3 @@ const SetNewPassword = ({name, logo}) => {
     </div>
   )
 }
-
-export default SetNewPassword

package/auth/{SignIn → components/SignIn}/SignInEmailForm.js

@@ -5,15 +5,15 @@ import {useState, useEffect} from "react"
 import useSearchParam from "react-use/lib/useSearchParam"
 import isEmail from "validator/lib/isEmail"
 
-import page from "../../page"
-import post from "../../helpers/post"
-import {reconnect as rts_reconnect} from "../../rts/rts"
-import {set_is_signed_in, setUid, set_tenant_id} from "../index"
+import page from "../../../page"
+import post from "../../../helpers/post"
+import {reconnect as rts_reconnect} from "../../../rts/rts"
+import {setIsSignedIn, setUid, setTenantId} from "../../index"
 
 
 const log = debug("rb:auth:signin")
 
-const SignInEmailForm = ({onSuccess, onSuccessRedirect}) => {
+export const SignInEmailForm = ({onSuccess, onSuccessRedirect}) => {
   const redirect = useSearchParam("redirect")
 
   const [isLoading, setIsLoading] = useState(false)
@@ -47,8 +47,8 @@ const SignInEmailForm = ({onSuccess, onSuccessRedirect}) => {
 
       setUid(user_id)
       const tenantId = user_id.slice(8, 16)
-      set_tenant_id(tenantId)
-      set_is_signed_in(true)
+      setTenantId(tenantId)
+      setIsSignedIn(true)
 
       // we must now reconnect on the websocket as we now have a new cookie
       rts_reconnect(tenantId)
@@ -111,5 +111,3 @@ const SignInEmailForm = ({onSuccess, onSuccessRedirect}) => {
     </form>
   )
 }
-
-export default SignInEmailForm

package/auth/{SignIn → components/SignIn}/index.js

@@ -3,10 +3,10 @@ import assert from "assert"
 
 import authConfig from "@rpcbase/dot-rb/auth"
 
-import {AUTH_BUTTONS} from "../../src/ui/oauth"
-import Footer from "../Footer"
+import {AUTH_BUTTONS} from "../../../src/ui/oauth"
+import {Footer} from "../Footer"
 
-import SignInEmailForm from "./SignInEmailForm"
+import {SignInEmailForm} from "./SignInEmailForm"
 
 import "./sign-in.scss"
 
@@ -14,7 +14,7 @@ import "./sign-in.scss"
 const hasOAuth = authConfig.oauth_providers?.length > 0
 const hasEmail = authConfig.has_email_signup
 
-const SignIn = ({
+export const SignIn = ({
   name,
   logo,
   onSuccessRedirect = "/",
@@ -66,5 +66,3 @@ const SignIn = ({
     </div>
   )
 }
-
-export default SignIn

package/auth/{SignOut → components/SignOut}/index.js

@@ -1,18 +1,16 @@
 /* @flow */
 import assert from "assert"
 import {useState, useEffect} from "react"
-import {ActivityIndicator} from "react-native"
 import Alert from "react-bootstrap/Alert"
 
 import authConfig from "@rpcbase/dot-rb/auth"
 
-import page from "../../page"
-import {sign_out} from "../sign_out"
+import {signOut} from "../../signOut"
 
-import post from "../../helpers/post"
+import post from "../../../helpers/post"
 
-import AccountListItem from "../AccountsList/AccountListItem"
-import Footer from "../Footer"
+import {AccountListItem} from "../AccountsList/AccountListItem"
+import {Footer} from "../Footer"
 
 import "./sign-out.scss"
 
@@ -20,7 +18,7 @@ import "./sign-out.scss"
 // TODO: clear cache + db
 const hasMultiAccounts = authConfig.has_multi_accounts
 
-const SignOut = ({
+export const SignOut = ({
   logo,
   name,
   onSignOutSuccess = () => null
@@ -45,11 +43,11 @@ const SignOut = ({
   }, [])
 
 
-  const signOut = async() => {
+  const onSignOut = async() => {
     // TODO: NYI handle sign out from multiple accounts here
     const res = await post("/api/v1/auth/sign_out")
     if (res.status === "ok") {
-      sign_out()
+      signOut()
       setIsSignedOut(true)
       onSignOutSuccess()
     } else {
@@ -60,7 +58,7 @@ const SignOut = ({
 
   const onSubmit = () => {
     console.log("sign out from selected accounts", selectedAccounts)
-    signOut()
+    onSignOut()
   }
 
   const message = hasMultiAccounts ? "Select accounts to sign out of:" : "Click here to sign out of your account:"
@@ -134,5 +132,3 @@ const SignOut = ({
     </div>
   )
 }
-
-export default SignOut

package/auth/{SignUp → components/SignUp}/SignUpEmailForm.js

@@ -1,14 +1,14 @@
 /* @flow */
 import {useState} from "react"
 
-import page from "../../page"
-import {reconnect as rts_reconnect} from "../../rts/rts"
+import page from "../../../page"
+import {reconnect as rts_reconnect} from "../../../rts/rts"
 
-import {set_is_signed_in, setUid, set_tenant_id} from "../index"
-import post from "../../helpers/post"
+import {setIsSignedIn, setUid, setTenantId} from "../../index"
+import post from "../../../helpers/post"
 
 
-const SignUpEmailForm = ({onSuccessRedirect, onSuccess}) => {
+export const SignUpEmailForm = ({onSuccessRedirect, onSuccess}) => {
   const [email, setEmail] = useState("")
   const [password, setPassword] = useState("")
   const [passwordConfirm, setPasswordConfirm] = useState("")
@@ -27,8 +27,8 @@ const SignUpEmailForm = ({onSuccessRedirect, onSuccess}) => {
       setUid(user_id)
 
       const tenantId = user_id.slice(8, 16)
-      set_tenant_id(tenantId)
-      set_is_signed_in(true)
+      setTenantId(tenantId)
+      setIsSignedIn(true)
 
       // we must now reconnect on the websocket as we have a new cookie
       rts_reconnect(tenantId)
@@ -97,5 +97,3 @@ const SignUpEmailForm = ({onSuccessRedirect, onSuccess}) => {
     </>
   )
 }
-
-export default SignUpEmailForm

package/auth/{SignUp → components/SignUp}/index.js

@@ -3,11 +3,11 @@ import assert from "assert"
 
 import authConfig from "@rpcbase/dot-rb/auth"
 
-import {AUTH_BUTTONS} from "../../src/ui/oauth"
+import {AUTH_BUTTONS} from "../../../src/ui/oauth"
 
-import Footer from "../Footer"
+import {Footer} from "../Footer"
 
-import SignUpEmailForm from "./SignUpEmailForm"
+import {SignUpEmailForm} from "./SignUpEmailForm"
 
 import "./sign-up.scss"
 
@@ -15,7 +15,7 @@ import "./sign-up.scss"
 const hasOAuth = authConfig.oauth_providers?.length > 0
 const hasEmail = authConfig.has_email_signup
 
-const SignUp = ({
+export const SignUp = ({
   logo,
   name,
   onSuccessRedirect = "/",
@@ -64,5 +64,3 @@ const SignUp = ({
     </div>
   )
 }
-
-export default SignUp

package/auth/helpers/{redirect_sign_in.native.js → redirectSignIn.native.js}

@@ -1,11 +1,9 @@
 /* @flow */
 
-const redirect_sign_in = (ctx) => {
+export const redirectSignIn = (ctx) => {
   console.log("REDIRECT SIGN IN NYI NATIVE")
   console.log("CTX", ctx)
 
   // const redirect_path = ctx.canonicalPath
   // page.redirect(`/signin?redirect=${encodeURIComponent(redirect_path)}`)
 }
-
-export default redirect_sign_in

package/auth/helpers/{redirect_sign_in.web.js → redirectSignIn.web.js}

@@ -1,9 +1,7 @@
 /* @flow */
 import page from "../../page"
 
-const redirect_sign_in = (ctx) => {
+export const redirectSignIn = (ctx) => {
   const redirect_path = ctx.canonicalPath
   page.redirect(`/signin?redirect=${encodeURIComponent(redirect_path)}`)
 }
-
-export default redirect_sign_in

package/auth/index.js

@@ -4,26 +4,26 @@ import {Platform} from "react-native"
 import isHexadecimal from "validator/lib/isHexadecimal"
 
 import storage from "../storage"
-import {disconnect as rts_disconnect} from "../rts/rts"
+import {disconnect as rtsDisconnect} from "../rts/rts"
 import post from "../helpers/post"
 
-import redirect_sign_in from "./helpers/redirect_sign_in"
+import {redirectSignIn} from "./helpers/redirectSignIn"
 
 
 const LAST_TENANT_KEY = "rb.last_tenant_id"
-const uid_storage_key = (tenant_id) => `rb.${tenant_id}.user_id`
+const uidStorageKey = (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 __isAuthenticated = null
 
-let __tenant_id = typeof storage !== "undefined" && storage.getItem(LAST_TENANT_KEY)
-let __user_id = typeof storage !== "undefined" && __tenant_id && storage.getItem(uid_storage_key(__tenant_id))
+let __tenantId = typeof storage !== "undefined" && storage.getItem(LAST_TENANT_KEY)
+let __userId = typeof storage !== "undefined" && __tenantId && storage.getItem(uidStorageKey(__tenantId))
 
 
-const get_querystring_auth_id = () => {
+const getQueryStringAuthId = () => {
   const url = new URL(window.location.href)
   const val = url.searchParams.get("auth_id")
   if (!val) return null
@@ -34,14 +34,14 @@ const get_querystring_auth_id = () => {
 }
 
 
-const run_session_check = async() => {
+const runSessionCheck = async() => {
   // TODO: TMP: we're skipping the session check on mobile for now,
   // this assumes having a token on mobile means we're authenticated
   if (Platform.OS !== "web") {
     return
   }
 
-  const auth_user_id = get_querystring_auth_id()
+  const auth_user_id = getQueryStringAuthId()
 
   if (auth_user_id) {
     log("check_session with auth user_id", auth_user_id)
@@ -51,27 +51,27 @@ const run_session_check = async() => {
 
   log("check_session response", res)
 
-  __is_authenticated = res.is_signed_in
+  __isAuthenticated = res.is_signed_in
 
 
-  // if not authenticated, clear __user_id + __tenant_id and disconnect socket
-  if (!__is_authenticated) {
-    __user_id = null
-    __tenant_id = null
-    rts_disconnect()
+  // if not authenticated, clear __userId + __tenantId and disconnect socket
+  if (!__isAuthenticated) {
+    __userId = null
+    __tenantId = null
+    rtsDisconnect()
     return
   }
 
-  __user_id = res.user_id
-  __tenant_id = __user_id.slice(8, 16)
+  __userId = res.user_id
+  __tenantId = __userId.slice(8, 16)
 
   // save tenant id
-  if (__tenant_id) {
-    storage.setItem(LAST_TENANT_KEY, __tenant_id)
+  if (__tenantId) {
+    storage.setItem(LAST_TENANT_KEY, __tenantId)
 
     // cache user_id in storage
-    if (__user_id) {
-      storage.setItem(uid_storage_key(__tenant_id), __user_id)
+    if (__userId) {
+      storage.setItem(uidStorageKey(__tenantId), __userId)
     }
   }
 }
@@ -79,54 +79,54 @@ const run_session_check = async() => {
 
 // Force trigger run first session check (when we are not in a webworker (or mobile))
 const isJest = !!process?.env?.JEST_WORKER_ID
-if (typeof window !== "undefined" && !isJest) run_session_check()
+if (typeof window !== "undefined" && !isJest) runSessionCheck()
 
 
-export const session_restrict = (ctx, next) => {
-  log("session_restrict:__is_authenticated", __is_authenticated)
+export const getSessionRestrictMiddleware = () => (ctx, next) => {
+  log("session_restrict:__isAuthenticated", __isAuthenticated)
 
-  if (typeof __is_authenticated !== "boolean") {
+  if (typeof __isAuthenticated !== "boolean") {
     log("session_restrict: will run session check")
 
-    run_session_check()
+    runSessionCheck()
       .then(() => {
-        if (__is_authenticated) {
+        if (__isAuthenticated) {
           next()
         } else {
-          redirect_sign_in(ctx)
+          redirectSignIn(ctx)
         }
       })
       .catch((err) => {
         console.log("warning error in check session request", err)
         throw err
       })
-  } else if (__is_authenticated) {
+  } else if (__isAuthenticated) {
     next()
   } else {
-    log("AUTH", JSON.stringify(__is_authenticated))
+    log("AUTH", JSON.stringify(__isAuthenticated))
     log("NOT AUTHENTICATED, REDIRECT HERE")
-    redirect_sign_in(ctx)
+    redirectSignIn(ctx)
     // next()
   }
 }
 
 
-export const privateGetUid = () => __user_id
+export const privateGetUid = () => __userId
 export const setUid = (val) => {
-  __user_id = val
+  __userId = val
 
   if (typeof val === "string") {
     const tenant_id_prefix = val.slice(8, 16)
-    storage.setItem(uid_storage_key(tenant_id_prefix), val)
+    storage.setItem(uidStorageKey(tenant_id_prefix), val)
   }
 }
 
-export const getTenantId = () => __tenant_id
-export const set_tenant_id = (val) => {
-  __tenant_id = val
+export const getTenantId = () => __tenantId
+export const setTenantId = (val) => {
+  __tenantId = val
   storage.setItem(LAST_TENANT_KEY, val)
 }
 
-export const set_is_signed_in = (val) => __is_authenticated = val
+export const setIsSignedIn = (val) => __isAuthenticated = val
 
-export const is_signed_in = () => __is_authenticated
+export const getIsSignedIn = () => __isAuthenticated

package/auth/{sign_out.js → signOut.js}

@@ -1,10 +1,10 @@
 /* @flow */
-import {set_is_signed_in, setUid, set_tenant_id} from "./index"
+import {setIsSignedIn, setUid, setTenantId} from "./index"
 
-export const sign_out = () => {
+export const signOut = () => {
   setUid(null)
-  set_tenant_id(null)
-  set_is_signed_in(false)
+  setTenantId(null)
+  setIsSignedIn(false)
   localStorage.clear()
 
   // TODO: clear DB

package/auth/useAuthRouter.js

@@ -2,11 +2,11 @@ import {useState} from "react"
 
 import page from "../page"
 
-import SignIn from "./SignIn"
-import SignUp from "./SignUp"
-import SignOut from "./SignOut"
-import ForgotPassword from "./ForgotPassword"
-import SetNewPassword from "./SetNewPassword"
+import {SignIn} from "./components/SignIn"
+import {SignUp} from "./components/SignUp"
+import {SignOut} from "./components/SignOut"
+import {ForgotPassword} from "./components/ForgotPassword"
+import {SetNewPassword} from "./components/SetNewPassword"
 import { getAuthProps } from "./authProps"
 
 const hasInitialized = false

package/package.json

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