@rpcbase/client 0.174.1-pagerouterauth.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 {setIsSignedIn} 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 {setIsSignedIn} 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 {setIsSignedIn, setUid, setTenantId} 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)
@@ -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 {setIsSignedIn, setUid, setTenantId} 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("")
@@ -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/{sign_out.js → signOut.js}

@@ -1,7 +1,7 @@
 /* @flow */
 import {setIsSignedIn, setUid, setTenantId} from "./index"
 
-export const sign_out = () => {
+export const signOut = () => {
   setUid(null)
   setTenantId(null)
   setIsSignedIn(false)

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.1-pagerouterauth.0",
+  "version": "0.175.0",
   "scripts": {
     "test": "../../node_modules/.bin/wireit"
   },