Workaroud for in-app Password Recovery (#342)

* Change funtion name [skip ci]

* Workaround #312

2 files changed, 11 insertions, 6 deletions

diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js
index 74b9fef47..3de576ca6 100644
--- a/src/components/auth/Login.js
+++ b/src/components/auth/Login.js
@@ -6,6 +6,7 @@ import { defineMessages, injectIntl } from 'react-intl';
 
 import { LIVE_FRANZ_API } from '../../config';
 import { API_VERSION } from '../../environment-remote';
+import { serverBase } from '../../api/apiBase'; // TODO: Remove this line after fixing password recovery in-app
 import Form from '../../lib/Form';
 import { required, email } from '../../helpers/validation-helpers';
 import Input from '../ui/Input';
@@ -69,7 +70,7 @@ class Login extends Component {
     isTokenExpired: PropTypes.bool.isRequired,
     isServerLogout: PropTypes.bool.isRequired,
     signupRoute: PropTypes.string.isRequired,
-    passwordRoute: PropTypes.string.isRequired,
+    // passwordRoute: PropTypes.string.isRequired, // TODO: Uncomment this line after fixing password recovery in-app
     error: globalErrorPropType.isRequired,
   };
 
@@ -111,7 +112,7 @@ class Login extends Component {
       isTokenExpired,
       isServerLogout,
       signupRoute,
-      passwordRoute,
+      // passwordRoute, // TODO: Uncomment this line after fixing password recovery in-app
       error,
     } = this.props;
 
@@ -177,7 +178,11 @@ class Login extends Component {
           <Link to={signupRoute}>
             {intl.formatMessage(messages.signupLink)}
           </Link>
-          <Link to={passwordRoute}>
+          <Link 
+            // to={passwordRoute} // TODO: Uncomment this line after fixing password recovery in-app
+            to={`${serverBase()}/user/forgot`} // TODO: Remove this line after fixing password recovery in-app
+            target='_blank' // TODO: Remove this line after fixing password recovery in-app
+          >
             {intl.formatMessage(messages.passwordLink)}
           </Link>
         </div>
diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js
index 05b6576fa..eaa68f918 100644
--- a/src/components/auth/Signup.js
+++ b/src/components/auth/Signup.js
@@ -11,7 +11,7 @@ import Button from '../ui/button';
 import Link from '../ui/Link';
 
 import { globalError as globalErrorPropType } from '../../prop-types';
-import { termsBase } from '../../api/apiBase';
+import { serverBase } from '../../api/apiBase';
 import { H1 } from '../ui/headline';
 
 const messages = defineMessages({
@@ -160,7 +160,7 @@ class Signup extends Component {
               {intl.formatMessage(messages.legalInfo)}
               <br />
               <Link
-                to={`${termsBase()}/terms`}
+                to={`${serverBase()}/terms`}
                 target="_blank"
                 className="link"
               >
@@ -168,7 +168,7 @@ class Signup extends Component {
               </Link>
               &nbsp;&amp;&nbsp;
               <Link
-                to={`${termsBase()}/privacy`}
+                to={`${serverBase()}/privacy`}
                 target="_blank"
                 className="link"
               >