Minor changes to how resend status is passed

3 files changed, 11 insertions, 7 deletions

diff --git a/web/react/components/email_verify.jsx b/web/react/components/email_verify.jsx
index 4d4d489bb..8d3f15525 100644
--- a/web/react/components/email_verify.jsx
+++ b/web/react/components/email_verify.jsx
@@ -10,14 +10,14 @@ export default class EmailVerify extends React.Component {
         this.state = {};
     }
     handleResend() {
-        const newAddress = window.location.href.replace('?resend_success=true', '').replace('&resend_success=true', '');
+        const newAddress = window.location.href.replace('&resend_success=true', '');
         window.location.href = newAddress + '&resend=true';
     }
     render() {
         var title = '';
         var body = '';
         var resend = '';
-        let resendConfirm = '';
+        var resendConfirm = '';
         if (this.props.isVerified === 'true') {
             title = global.window.config.SiteName + ' Email Verified';
             body = <p>Your email has been verified! Click <a href={this.props.teamURL + '?email=' + this.props.userEmail}>here</a> to log in.</p>;
@@ -32,7 +32,7 @@ export default class EmailVerify extends React.Component {
                     Resend Email
                 </button>
             );
-            if (window.location.href.indexOf('resend_success=true') > -1) {
+            if (this.props.resendSuccess) {
                 resendConfirm = <div><br /><p className='alert alert-success'><i className='fa fa-check'></i>{' Verification email sent.'}</p></div>;
             }
         }
@@ -57,10 +57,12 @@ export default class EmailVerify extends React.Component {
 EmailVerify.defaultProps = {
     isVerified: 'false',
     teamURL: '',
-    userEmail: ''
+    userEmail: '',
+    resendSuccess: 'false'
 };
 EmailVerify.propTypes = {
     isVerified: React.PropTypes.string,
     teamURL: React.PropTypes.string,
-    userEmail: React.PropTypes.string
+    userEmail: React.PropTypes.string,
+    resendSuccess: React.PropTypes.string
 };
diff --git a/web/react/pages/verify.jsx b/web/react/pages/verify.jsx
index e48471bbd..16a9846e5 100644
--- a/web/react/pages/verify.jsx
+++ b/web/react/pages/verify.jsx
@@ -9,6 +9,7 @@ global.window.setupVerifyPage = function setupVerifyPage(props) {
             isVerified={props.IsVerified}
             teamURL={props.TeamURL}
             userEmail={props.UserEmail}
+            resendSuccess={props.ResendSuccess}
         />,
         document.getElementById('verify')
     );
diff --git a/web/web.go b/web/web.go
index b204708b0..9d1946283 100644
--- a/web/web.go
+++ b/web/web.go
@@ -355,6 +355,7 @@ func getChannel(c *api.Context, w http.ResponseWriter, r *http.Request) {
 
 func verifyEmail(c *api.Context, w http.ResponseWriter, r *http.Request) {
 	resend := r.URL.Query().Get("resend")
+	resendSuccess := r.URL.Query().Get("resend_success")
 	name := r.URL.Query().Get("teamname")
 	email := r.URL.Query().Get("email")
 	hashedId := r.URL.Query().Get("hid")
@@ -376,8 +377,7 @@ func verifyEmail(c *api.Context, w http.ResponseWriter, r *http.Request) {
 			user := result.Data.(*model.User)
 			api.FireAndForgetVerifyEmail(user.Id, user.Email, team.Name, team.DisplayName, c.GetSiteURL(), c.GetTeamURLFromTeam(team))
 
-			newAddress := strings.Replace(r.URL.String(), "?resend=true", "?resend_success=true", -1)
-			newAddress = strings.Replace(newAddress, "&resend=true", "&resend_success=true", -1)
+			newAddress := strings.Replace(r.URL.String(), "&resend=true", "&resend_success=true", -1)
 			http.Redirect(w, r, newAddress, http.StatusFound)
 			return
 		}
@@ -403,6 +403,7 @@ func verifyEmail(c *api.Context, w http.ResponseWriter, r *http.Request) {
 	page.Props["IsVerified"] = isVerified
 	page.Props["TeamURL"] = c.GetTeamURLFromTeam(team)
 	page.Props["UserEmail"] = email
+	page.Props["ResendSuccess"] = resendSuccess
 	page.Render(c, w)
 }