@rpcbase/client 0.172.0 → 0.174.0-pagerouterauth.0

package/AppProvider/index.js

@@ -1,8 +1,9 @@
 /* @flow */
 import "./debug"
-
+import {useEffect} from "react"
 import {PostHogProvider} from "posthog-js/react"
 
+import page from "../page"
 import {HashStateProvider} from "../hashState"
 
 import AnalyticsContainer from "./AnalyticsContainer"
@@ -11,6 +12,7 @@ import AnalyticsContainer from "./AnalyticsContainer"
 import {flagValues} from "config/flags"
 
 import {POSTHOG_KEY} from "env"
+import { useAuthRouter } from "../auth/useAuthRouter"
 
 
 const PostHogWrapper = ({children, ...props}) => {
@@ -43,13 +45,18 @@ const PostHogWrapper = ({children, ...props}) => {
   }
 }
 
-
 const AppProvider = ({children, ...props}) => {
 
+  const {authComponent} = useAuthRouter()
+
+  useEffect(() => {
+    page()
+  }, [])
+
   return (
     <PostHogWrapper>
       <HashStateProvider>
-        {children}
+        {authComponent || children}
       </HashStateProvider>
     </PostHogWrapper>
   )

package/auth/SignOut/index.js

@@ -23,7 +23,7 @@ const hasMultiAccounts = authConfig.has_multi_accounts
 const SignOut = ({
   logo,
   name,
-  onSuccess = () => null
+  onSignOutSuccess = () => null
 }) => {
 
   const [isSignedOut, setIsSignedOut] = useState(false)
@@ -51,7 +51,7 @@ const SignOut = ({
     if (res.status === "ok") {
       sign_out()
       setIsSignedOut(true)
-      onSuccess()
+      onSignOutSuccess()
     } else {
       throw new Error("unable to sign out")
     }

package/auth/authProps.js

@@ -0,0 +1,8 @@
+
+let authProps = null
+
+export const getAuthProps = () => authProps
+
+export const setAuthProps = (newAuthProps) => {
+  authProps = newAuthProps
+}

package/auth/sign_out.js

@@ -1,5 +1,4 @@
 /* @flow */
-
 import {set_is_signed_in, setUid, set_tenant_id} from "./index"
 
 export const sign_out = () => {
@@ -10,5 +9,5 @@ export const sign_out = () => {
 
   // TODO: clear DB
   // https://stackoverflow.com/a/15861765
-  console.log("TODO clear DB")
+  console.log("signout: TODO clear DB")
 }

package/auth/useAuthRouter.js

@@ -0,0 +1,56 @@
+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 { getAuthProps } from "./authProps"
+
+const hasInitialized = false
+
+export const useAuthRouter = () => {
+  const [authComponent, setAuthComponent] = useState(null)
+
+  // this method is used because the child component's effects are executed before the parent's one
+  if (!hasInitialized) {
+    page("/signin", (ctx, next) => {
+      const authProps = getAuthProps()
+      console.log("AUTHPROPS", authProps)
+      setAuthComponent(<SignIn {...authProps} />)
+    })
+
+    page("/signout", (ctx, next) => {
+      const authProps = getAuthProps()
+      setAuthComponent(
+        <SignOut {...authProps} />
+      )
+    })
+
+    page("/signup", (ctx, next) => {
+      const authProps = getAuthProps()
+      console.log("AUTHPROPS", authProps)
+      setAuthComponent(<SignUp {...authProps} />)
+    })
+
+    page("/forgot-password", (ctx, next) => {
+      const authProps = getAuthProps()
+      setAuthComponent(<ForgotPassword {...authProps} />)
+    })
+
+    page("/set-new-password", (ctx, next) => {
+      const authProps = getAuthProps()
+      setAuthComponent(<SetNewPassword {...authProps} />)
+    })
+
+    page("*", (ctx, next) => {
+      setAuthComponent(null)
+      next()
+    })
+
+  }
+
+  return {authComponent}
+}

package/package.json

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

package/rts/getUseQuery/index.js

@@ -69,7 +69,7 @@ const getUseQuery = (register_query) => (
     if (options.debug) {
       console.log("use query", model_name, query, options)
     }
-  }, [])
+  }, [model_name, query, options])
 
   const applyNewData = (newData, context) => {
     setData(newData)
@@ -99,6 +99,11 @@ const getUseQuery = (register_query) => (
   useEffect(() => {
     const queryKey = key || id
 
+    if (!model_name) {
+      console.warn("attempting to register query with empty collection, skipping")
+      return
+    }
+
     if (options.debug ) {
       console.log("register query", model_name, query, options)
     }
@@ -165,7 +170,7 @@ const getUseQuery = (register_query) => (
       }
 
       if (isEqual(data, newData) && !isEqualValues(data, newData) && __DEV__) {
-        alert("EQUALITY MISMATCH THIS SHOULD NOT HAPPPEND!!!", data, newData)
+        alert("EQUALITY MISMATCH THIS SHOULD NOT HAPPEN!", data, newData)
       }
 
       if (!isEqualValues(dataRef.current, newData)) {
@@ -187,13 +192,13 @@ const getUseQuery = (register_query) => (
 
 
   const loadNextPage = useCallback(() => {
-    console.log("will load next page after DOC")
+    console.log("NYI: will load next page after DOC")
   }, [])
 
 
   const result = useMemo(() => ({data, source, error, loading}), [data, source, error, loading])
 
-  // TODO: investigate this one
+  // TODO:
   // if (Array.isArray(result.data) && !result.source) {
   //   console.warn("RESULT HAS NO SOURCE", {data, error, loading, source})
   // }

package/rts/store/get_collection.js

@@ -22,6 +22,10 @@ const _cols_store = Object.create(null)
 
 
 const get_collection = (col_name) => {
+  if (!col_name) {
+    console.warn("supplied invalid / empty collection name to rts")
+  }
+
   if (_cols_store[col_name]) {
     return _cols_store[col_name]
   } else {

package/auth/views.js

@@ -1,14 +0,0 @@
-/* @flow */
-import SignIn from "./SignIn"
-import SignUp from "./SignUp"
-import SignOut from "./SignOut"
-import ForgotPassword from "./ForgotPassword"
-import SetNewPassword from "./SetNewPassword"
-
-export {
-  SignIn,
-  SignUp,
-  SignOut,
-  ForgotPassword,
-  SetNewPassword,
-}