Merge pull request #3484 from blockchain/fix/2fa-session

hotfix(login-2fa): setting new session token with 2fa login
blockchain · Aug 18, 2021 · 7281110 · 7281110
2 parents 749c2e4 + 251df0e
commit 7281110
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 12 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/data/auth/actions.ts b/packages/blockchain-wallet-v4-frontend/src/data/auth/actions.ts
@@ -67,8 +67,8 @@ export const setResetAccount = (resetAccount) => ({
   type: AT.SET_RESET_ACCOUNT
 })
 // 2FA
-export const resendSmsCode = (guid) => ({
-  payload: { guid },
+export const resendSmsCode = (guid, email) => ({
+  payload: { email, guid },
   type: AT.RESEND_SMS_CODE
 })
 

diff --git a/packages/blockchain-wallet-v4-frontend/src/data/auth/sagas.ts b/packages/blockchain-wallet-v4-frontend/src/data/auth/sagas.ts
@@ -351,13 +351,13 @@ export default ({ api, coreSagas, networks }) => {
     const { code, guid, password, sharedKey } = action.payload
     const formValues = yield select(selectors.form.getFormValues('login'))
     const { email, emailToken } = formValues
-    let session = yield select(selectors.session.getSession, email || guid)
+    let session = yield select(selectors.session.getSession, guid, email)
     yield put(startSubmit('login'))
     try {
       if (!session) {
         session = yield call(api.obtainSessionToken)
+        yield put(actions.session.saveSession(assoc(guid, session, {})))
       }
-      yield put(actions.session.saveSession(assoc(guid, session, {})))
       yield put(actions.auth.loginLoading())
       yield call(coreSagas.wallet.fetchWalletSaga, {
         code,
@@ -559,8 +559,8 @@ export default ({ api, coreSagas, networks }) => {
 
   const resendSmsLoginCode = function* (action) {
     try {
-      const { guid } = action.payload
-      const sessionToken = yield select(selectors.session.getSession, guid)
+      const { email, guid } = action.payload
+      const sessionToken = yield select(selectors.session.getSession, guid, email)
       const response = yield call(coreSagas.wallet.resendSmsLoginCode, {
         guid,
         sessionToken
@@ -579,7 +579,8 @@ export default ({ api, coreSagas, networks }) => {
   const deauthorizeBrowser = function* () {
     try {
       const guid = yield select(selectors.core.wallet.getGuid)
-      const sessionToken = yield select(selectors.session.getSession, guid)
+      const email = (yield select(selectors.core.settings.getEmail)).getOrElse(undefined)
+      const sessionToken = yield select(selectors.session.getSession, guid, email)
       yield call(api.deauthorizeBrowser, sessionToken)
       yield put(actions.alerts.displaySuccess(C.DEAUTHORIZE_BROWSER_SUCCESS))
       yield put(actions.cache.disconnectChannelPhone())

diff --git a/packages/blockchain-wallet-v4-frontend/src/data/session/selectors.js b/packages/blockchain-wallet-v4-frontend/src/data/session/selectors.js
@@ -1,3 +1,7 @@
-import { curry, path } from 'ramda'
+import { curry, defaultTo, path } from 'ramda'
 
-export const getSession = curry((state, guid) => path(['session', guid], state))
+export const getSession = curry((state, guid, email) => {
+  const guidSession = path(['session', guid], state)
+  const emailSession = path(['session', email], state)
+  return defaultTo(emailSession)(guidSession)
+})
diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Login/EnterPassword/index.tsx b/packages/blockchain-wallet-v4-frontend/src/scenes/Login/EnterPassword/index.tsx
@@ -22,7 +22,7 @@ import {
 } from '../model'
 
 const EnterPassword = (props: Props) => {
-  const { authType, busy, formActions, guid, invalid, loginError, password, submitting } = props
+  const { authType, busy, formValues, guid, invalid, loginError, password, submitting } = props
   const passwordError = loginError && loginError.toLowerCase().includes('wrong_wallet_password')
   const accountLocked =
     loginError &&
@@ -31,7 +31,7 @@ const EnterPassword = (props: Props) => {
 
   const twoFactorError = loginError && loginError.toLowerCase().includes('authentication code')
   const handleSmsResend = () => {
-    props.authActions.resendSmsCode(guid)
+    props.authActions.resendSmsCode(guid, formValues?.email)
   }
 
   const handleBackArrowClick = () => {

diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Login/index.tsx b/packages/blockchain-wallet-v4-frontend/src/scenes/Login/index.tsx
@@ -75,7 +75,7 @@ class Login extends PureComponent<InjectedFormProps<{}, Props> & Props, StatePro
   }
 
   handleSmsResend = () => {
-    this.props.authActions.resendSmsCode(this.props.guid)
+    this.props.authActions.resendSmsCode(this.props.guid, this.props.formValues?.email)
   }
 
   continueLoginProcess = () => {