Merge pull request #539 from cozy/fix--add-protocol-to-instanceUrl-in…

…-passphrase fix: provide instance URL to passphrase function
cozy · Dec 17, 2022 · dca41c1 · dca41c1
2 parents f97dbf0 + 1f04637
commit dca41c1
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 14 deletions.
diff --git a/src/actions/passphrase.js b/src/actions/passphrase.js
@@ -1,6 +1,5 @@
 import { cozyFetch } from 'actions'
 import { WebVaultClient } from 'cozy-keys-lib'
-import { getStackDomain } from 'actions/domUtils'
 
 export const UPDATE_PASSPHRASE = 'UPDATE_PASSPHRASE'
 export const UPDATE_PASSPHRASE_SUCCESS = 'UPDATE_PASSPHRASE_SUCCESS'
@@ -21,10 +20,6 @@ export const UPDATE_HINT = 'UPDATE_HINT'
 export const UPDATE_HINT_SUCCESS = 'UPDATE_HINT_SUCCESS'
 export const UPDATE_HINT_FAILURE = 'UPDATE_HINT_FAILURE'
 
-const getInstanceURL = () => {
-  return getStackDomain()
-}
-
 const invalidPassphraseErrorAction = {
   type: UPDATE_PASSPHRASE_FAILURE,
   errors: {
@@ -61,8 +56,17 @@ const updatePassphraseFailure = error => {
   return defaultErrorAction
 }
 
-export const updatePassphrase = (currentPassphrase, newPassphrase) => {
-  const instanceURL = getInstanceURL()
+/**
+ * @param {string} currentPassphrase
+ * @param {string} newPassphrase
+ * @param {string} instanceURL - Must be a string usable in the `URL()` constructor
+ * @returns {Promise<void>}
+ */
+export const updatePassphrase = (
+  currentPassphrase,
+  newPassphrase,
+  instanceURL
+) => {
   const vaultClient = new WebVaultClient(instanceURL)
 
   return async dispatch => {
@@ -91,8 +95,12 @@ export const updatePassphrase = (currentPassphrase, newPassphrase) => {
   }
 }
 
-export const updatePassphrase2FAFirst = currentPassphrase => {
-  const instanceURL = getInstanceURL()
+/**
+ * @param {string} currentPassphrase
+ * @param {string} instanceURL - Must be a string usable in the `URL()` constructor
+ * @returns {Promise<void>}
+ */
+export const updatePassphrase2FAFirst = (currentPassphrase, instanceURL) => {
   const vaultClient = new WebVaultClient(instanceURL)
 
   return async dispatch => {
@@ -117,17 +125,25 @@ export const updatePassphrase2FAFirst = currentPassphrase => {
   }
 }
 
+/**
+ * @param {string} currentPassphrase
+ * @param {string} newPassphrase
+ * @param {string} twoFactorCode
+ * @param {string} twoFactorToken
+ * @param {string} instanceURL - Must be a string usable in the `URL()` constructor
+ * @returns {Promise<void>}
+ */
 export const updatePassphrase2FASecond = (
   currentPassphrase,
   newPassphrase,
   twoFactorCode,
-  twoFactorToken
+  twoFactorToken,
+  instanceURL
 ) => {
   return async dispatch => {
     dispatch({ type: UPDATE_PASSPHRASE_2FA_2 })
 
     try {
-      const instanceURL = getInstanceURL()
       const vaultClient = new WebVaultClient(instanceURL)
 
       await vaultClient.login(currentPassphrase)

diff --git a/src/containers/Passphrase.jsx b/src/containers/Passphrase.jsx
@@ -14,6 +14,7 @@ import {
 import { fetchInfos } from 'actions'
 import PassphraseView from 'components/PassphraseView'
 import { useLocation } from 'react-router-dom'
+import { withClient } from 'cozy-client'
 
 const mapStateToProps = state => ({
   fields: state.fields,
@@ -57,7 +58,13 @@ const mapDispatchToProps = (dispatch, ownProps) => ({
   onPassphraseSimpleSubmit: async (currentPassphrase, newPassphrase, hint) => {
     try {
       await dispatch(updateHint(hint))
-      await dispatch(updatePassphrase(currentPassphrase, newPassphrase))
+      await dispatch(
+        updatePassphrase(
+          currentPassphrase,
+          newPassphrase,
+          ownProps.client.getStackClient().uri
+        )
+      )
       showSuccessThenReload(ownProps.t, ownProps.location)
     } catch (e) {
       // eslint-disable-next-line no-console
@@ -66,7 +73,12 @@ const mapDispatchToProps = (dispatch, ownProps) => ({
   },
   onPassphrase2FAStep1: async currentPassphrase => {
     try {
-      await dispatch(updatePassphrase2FAFirst(currentPassphrase))
+      await dispatch(
+        updatePassphrase2FAFirst(
+          currentPassphrase,
+          ownProps.client.getStackClient().uri
+        )
+      )
     } catch (e) {
       // eslint-disable-next-line no-console
       console.error(e)
@@ -86,7 +98,8 @@ const mapDispatchToProps = (dispatch, ownProps) => ({
           currentPassphrase,
           newPassphrase,
           twoFactorCode,
-          twoFactorToken
+          twoFactorToken,
+          ownProps.client.getStackClient().uri
         )
       )
       showSuccessThenReload(ownProps.t, ownProps.location)
@@ -100,6 +113,7 @@ const mapDispatchToProps = (dispatch, ownProps) => ({
 
 const ComposedPassphrase = compose(
   translate(),
+  withClient,
   connect(mapStateToProps, mapDispatchToProps)
 )(PassphraseView)