@rpcbase/client 0.20.0 → 0.22.0

package/auth/ForgotPassword/index.js

@@ -29,7 +29,8 @@ const ForgotPassword = ({name, logo}) => {
         setEmail(decoded)
         // remove the hash
         // isn't there a better way
-        history.pushState(
+        // fixes go back twice on change password
+        history.replaceState(
           "",
           document.title,
           window.location.pathname + window.location.search

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)
     }
   }

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
@@ -33,6 +38,9 @@ const run_session_check = async() => {
   }
 }
 
+// Force trigger run first session check
+run_session_check()
+
 // manually run first check
 // TODO: this should come from localStorage
 const redirect_sign_in = (ctx) => {
@@ -42,7 +50,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 +70,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.20.0",
+  "version": "0.22.0",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 0"
   },