@rpcbase/client 0.18.0 → 0.21.0

package/auth/ForgotPassword/index.js

@@ -79,7 +79,7 @@ const ForgotPassword = ({name, logo}) => {
               <p className="text-danger">{errors.form}</p>
             )}
 
-            <div className="form-floating mb-4">
+            <div className="text-start form-floating mb-4">
               <input type="email"
                 disabled={isSuccess}
                 className="form-control"

package/auth/SetNewPassword/index.js

@@ -90,7 +90,7 @@ const SetNewPassword = ({name, logo}) => {
 
           <form onSubmit={onSubmit}>
 
-            <div className="form-floating">
+            <div className="form-floating text-start">
               <input type="password"
                 className="form-control"
                 id="input-password1"
@@ -101,7 +101,7 @@ const SetNewPassword = ({name, logo}) => {
               <label htmlFor="input-password1">Password</label>
             </div>
 
-            <div className="form-floating">
+            <div className="form-floating text-start">
               <input type="password"
                 className="form-control"
                 id="input-password2"

package/auth/SignIn/index.js

@@ -2,6 +2,8 @@
 import {useState, useEffect} from "react"
 import {useSearchParam} from "react-use"
 import isEmail from "validator/lib/isEmail"
+import page from "page"
+import debug from "debug"
 
 import post from "../../helpers/post"
 
@@ -10,6 +12,10 @@ import Footer from "../Footer"
 
 import "./sign-in.scss"
 
+
+const log = debug("rb:auth:signin")
+
+
 const SignIn = ({
   name,
   logo,
@@ -25,7 +31,6 @@ const SignIn = ({
   const redirect = useSearchParam("redirect")
 
   useEffect(() => {
-    console.log("email changed", email)
     if (isEmail(email)) {
       setForgotUrlParam(btoa(email))
     } else {
@@ -39,15 +44,21 @@ const SignIn = ({
     const res = await post("/api/v1/auth/sign_in", {email, password})
     setIsLoading(false)
 
+    // success
     if (res.status === "ok") {
+      log("signed in res: ok", res)
+      log("redirect to:", redirect || onSuccessRedirect)
+
       set_is_signed_in(true)
       if (redirect) {
-        window.location = redirect
-        return
+        page(redirect)
+      } else {
+        page(onSuccessRedirect)
       }
-      window.location = onSuccessRedirect
-
+    // errors
     } else {
+      log("sign in error", res)
+
       setErrors(res.errors)
     }
   }
@@ -83,7 +94,7 @@ const SignIn = ({
               <p className="text-danger">{errors.form}</p>
             )}
 
-            <div className="form-floating">
+            <div className="form-floating text-start">
               <input type="email"
                 className="form-control"
                 id="input-email"
@@ -93,7 +104,7 @@ const SignIn = ({
               <label htmlFor="input-email">Email Address</label>
             </div>
 
-            <div className="form-floating">
+            <div className="form-floating text-start">
               <input type="password"
                 className="form-control"
                 id="input-password"

package/auth/SignUp/index.js

@@ -6,7 +6,11 @@ import Footer from "../Footer"
 
 import "./sign-up.scss"
 
-const SignUp = ({logo, name}) => {
+const SignUp = ({
+  logo,
+  name,
+  onSuccessRedirect = "/dashboard",
+}) => {
   const [email, setEmail] = useState("")
   const [password, setPassword] = useState("")
   const [passwordConfirm, setPasswordConfirm] = useState("")
@@ -20,7 +24,7 @@ const SignUp = ({logo, name}) => {
     }
     const res = await post("/api/v1/auth/sign_up", {email, password})
     if (res.status === "ok") {
-      window.location = "/workspaces"
+      window.location = onSuccessRedirect
     } else if (res.status === "error") {
       setError(res.message)
     }
@@ -61,7 +65,7 @@ const SignUp = ({logo, name}) => {
             </div>
           )}
 
-          <div className="form-floating">
+          <div className="form-floating text-start">
             <input type="email"
               className="form-control"
               id="input-email"
@@ -70,7 +74,7 @@ const SignUp = ({logo, name}) => {
               onChange={onChangeEmail} />
             <label htmlFor="input-email">Email Address</label>
           </div>
-          <div className="form-floating">
+          <div className="form-floating text-start">
             <input type="password"
               className="form-control"
               id="input-password"
@@ -79,7 +83,7 @@ const SignUp = ({logo, name}) => {
               onChange={onChangePassword} />
             <label htmlFor="input-password">Password</label>
           </div>
-          <div className="form-floating">
+          <div className="form-floating text-start">
             <input type="password"
               className="form-control"
               id="input-password-confirm"

package/auth/index.js

@@ -1,5 +1,6 @@
 /* @flow */
 import page from "page"
+import debug from "debug"
 
 import SignIn from "./SignIn"
 import SignUp from "./SignUp"
@@ -19,12 +20,16 @@ export {
 
 const UID_STORAGE_KEY = "rb::session-user_id"
 
+const log = debug("rb:auth")
+
 let __is_authenticated = null
 let __user_id = localStorage.getItem(UID_STORAGE_KEY)
 
+
 const run_session_check = async() => {
   const res = await post("/api/v1/auth/check_session")
   const {is_signed_in, user_id} = res
+  log("check_session response", res)
   __is_authenticated = is_signed_in
   __user_id = user_id
   // cache user_id in localStorage
@@ -42,7 +47,11 @@ const redirect_sign_in = (ctx) => {
 
 
 export const session_restrict = (ctx, next) => {
+  log("session_restrict:__is_authenticated", __is_authenticated)
+
   if (typeof __is_authenticated !== "boolean") {
+    log("session_restrict: will run session check")
+
     run_session_check()
       .then(() => {
         if (__is_authenticated) {
@@ -58,8 +67,8 @@ export const session_restrict = (ctx, next) => {
   } else if (__is_authenticated) {
     next()
   } else {
-    console.log("AUTH", JSON.stringify(__is_authenticated))
-    console.log("NOT AUTHENTICATED, REDIRECT HERE")
+    log("AUTH", JSON.stringify(__is_authenticated))
+    log("NOT AUTHENTICATED, REDIRECT HERE")
     next()
   }
 }

package/package.json

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