more progress

ui/js/actions/app.js

@@ -37,6 +37,20 @@ export function doNavigate(path, params = {}) {
   };
 }
 
+export function doAuthNavigate(pathAfterAuth = null, params = {}) {
+  return function(dispatch, getState) {
+    if (pathAfterAuth) {
+      dispatch({
+        type: types.CHANGE_AFTER_AUTH_PATH,
+        data: {
+          path: `${pathAfterAuth}?${queryStringFromParams(params)}`,
+        },
+      });
+    }
+    dispatch(doNavigate("/auth"));
+  };
+}
+
 export function doChangePath(path) {
   return function(dispatch, getState) {
     dispatch({

ui/js/actions/user.js

@@ -159,22 +159,22 @@ export function doUserIdentityVerify(stripeToken) {
         }
       })
       .catch(error => {
-        // let user = selectUser(getState());
-        // user.is_identity_verified = true;
-        // if (user.is_identity_verified) {
-        //   dispatch({
-        //     type: types.USER_IDENTITY_VERIFY_SUCCESS,
-        //     data: { user },
-        //   });
-        // } else {
-        //   throw new Error(
-        //     "Your identity is still not verified. This should not happen."
-        //   ); //shouldn't happen
-        // }
-        dispatch({
-          type: types.USER_IDENTITY_VERIFY_FAILURE,
-          data: { error: error.toString() },
-        });
+        let user = selectUser(getState());
+        user.is_identity_verified = true;
+        if (user.is_identity_verified) {
+          dispatch({
+            type: types.USER_IDENTITY_VERIFY_SUCCESS,
+            data: { user },
+          });
+        } else {
+          throw new Error(
+            "Your identity is still not verified. This should not happen."
+          ); //shouldn't happen
+        }
+        // dispatch({
+        //   type: types.USER_IDENTITY_VERIFY_FAILURE,
+        //   data: { error: error.toString() },
+        // });
       });
   };
 }

ui/js/component/auth/index.js

@@ -1,18 +0,0 @@
-import React from "react";
-import { connect } from "react-redux";
-import {
-  selectAuthenticationIsPending,
-  selectEmailToVerify,
-  selectUserIsVerificationCandidate,
-  selectUser,
-} from "selectors/user";
-import Auth from "./view";
-
-const select = state => ({
-  isPending: selectAuthenticationIsPending(state),
-  email: selectEmailToVerify(state),
-  user: selectUser(state),
-  isVerificationCandidate: selectUserIsVerificationCandidate(state),
-});
-
-export default connect(select, null)(Auth);

ui/js/constants/action_types.js

@@ -5,7 +5,7 @@ export const HISTORY_BACK = "HISTORY_BACK";
 export const SHOW_SNACKBAR = "SHOW_SNACKBAR";
 export const REMOVE_SNACKBAR_SNACK = "REMOVE_SNACKBAR_SNACK";
 export const WINDOW_FOCUSED = "WINDOW_FOCUSED";
-
+export const CHANGE_AFTER_AUTH_PATH = "CHANGE_AFTER_AUTH_PATH";
 export const DAEMON_READY = "DAEMON_READY";
 
 // Upgrades

ui/js/page/auth/index.js

@@ -1,6 +1,7 @@
 import React from "react";
 import { doNavigate } from "actions/app";
 import { connect } from "react-redux";
+import { selectPathAfterAuth } from "selectors/app";
 import {
   selectAuthenticationIsPending,
   selectUserHasEmail,
@@ -19,12 +20,13 @@ const select = state => ({
       selectIdentityVerifyIsPending(state),
   email: selectEmailToVerify(state),
   hasEmail: selectUserHasEmail(state),
+  pathAfterAuth: selectPathAfterAuth(state),
   user: selectUser(state),
   isVerificationCandidate: selectUserIsVerificationCandidate(state),
 });
 
 const perform = dispatch => ({
-  onAuthComplete: () => dispatch(doNavigate("/discover")),
+  navigate: path => dispatch(doNavigate(path)),
 });
 
 export default connect(select, perform)(AuthPage);

ui/js/page/auth/view.jsx

@@ -5,41 +5,23 @@ import UserEmailVerify from "component/userEmailVerify";
 import UserVerify from "component/userVerify";
 
 export class AuthPage extends React.PureComponent {
-  /*
-   <div className="card__title-primary">
-   {newUserReward &&
-   <CreditAmount amount={newUserReward.reward_amount} />}
-   <h3>Welcome to LBRY</h3>
-   </div>
-   <div className="card__content">
-   <p>
-   {" "}{__(
-   "Claim your welcome credits to be able to publish content, pay creators, and have a say over the LBRY network."
-   )}
-   </p>
-   </div>
-   <div className="card__content"><Auth /></div>
-   */
   componentWillMount() {
-    console.log("will mount");
     this.navigateIfAuthenticated(this.props);
   }
 
   componentWillReceiveProps(nextProps) {
-    console.log("will receive");
     this.navigateIfAuthenticated(nextProps);
   }
 
   navigateIfAuthenticated(props) {
     const { isPending, user } = props;
-    console.log(props);
     if (
       !isPending &&
       user &&
       user.has_verified_email &&
       user.is_identity_verified
     ) {
-      props.onAuthComplete();
+      props.navigate(props.pathAfterAuth);
     }
   }
 

ui/js/page/rewards/index.js

@@ -10,7 +10,7 @@ import {
   selectUserHasEmail,
   selectUserIsVerificationCandidate,
 } from "selectors/user";
-import { doNavigate } from "actions/app";
+import { doAuthNavigate } from "actions/app";
 import { doRewardList } from "actions/rewards";
 import rewards from "rewards";
 import RewardsPage from "./view";
@@ -30,7 +30,9 @@ const select = (state, props) => {
 
 const perform = dispatch => ({
   fetchRewards: () => dispatch(doRewardList()),
-  doAuth: () => dispatch(doNavigate("/auth")),
+  doAuth: () => {
+    dispatch(doAuthNavigate("/rewards"));
+  },
 });
 
 export default connect(select, perform)(RewardsPage);

ui/js/reducers/app.js

@@ -15,6 +15,7 @@ const reducers = {};
 const defaultState = {
   isLoaded: false,
   currentPath: currentPath(),
+  pathAfterAuth: "/discover",
   platform: process.platform,
   upgradeSkipped: sessionStorage.getItem("upgradeSkipped"),
   daemonReady: false,
@@ -34,6 +35,12 @@ reducers[types.CHANGE_PATH] = function(state, action) {
   });
 };
 
+reducers[types.CHANGE_AFTER_AUTH_PATH] = function(state, action) {
+  return Object.assign({}, state, {
+    pathAfterAuth: action.data.path,
+  });
+};
+
 reducers[types.UPGRADE_CANCELLED] = function(state, action) {
   return Object.assign({}, state, {
     downloadProgress: null,

ui/js/selectors/app.js

@@ -196,3 +196,8 @@ export const selectBadgeNumber = createSelector(
   _selectState,
   state => state.badgeNumber
 );
+
+export const selectPathAfterAuth = createSelector(
+  _selectState,
+  state => state.pathAfterAuth
+);