From b07873274d76165b9cd4d4358d1c27a0d87fc842 Mon Sep 17 00:00:00 2001
From: Alex Eng <aeng@redhat.com>
Date: Fri, 20 Feb 2015 15:52:24 +1000
Subject: [PATCH] Fix generate api issue
 https://bugzilla.redhat.com/show_bug.cgi?id=119359

Squashed commit of the following:

commit 1835b479069daf30dc68f8eb1085e9bce1a39be7
Author: Alex Eng <aeng@redhat.com>
Date:   Fri Feb 20 10:39:10 2015 +1000

    Fix generate api issue: https://bugzilla.redhat.com/show_bug.cgi?id=1193597
---
 .../org/zanata/action/UserSettingsAction.java  | 13 +++++++++----
 .../WEB-INF/layout/dashboard/settings.xhtml    | 18 +++++++++++++-----
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java b/zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
index ec56350bac..a453c0f8ce 100644
--- a/zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
+++ b/zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
@@ -28,17 +28,15 @@
 import java.util.List;
 
 import javax.faces.context.ExternalContext;
-import javax.mail.internet.InternetAddress;
 import javax.persistence.EntityManager;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.constraints.Size;
 
-import com.googlecode.totallylazy.collections.PersistentMap;
 import lombok.Getter;
-import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 
+import org.apache.commons.lang.StringEscapeUtils;
 import org.hibernate.validator.constraints.Email;
 import org.hibernate.validator.constraints.NotEmpty;
 import org.jboss.seam.ScopeType;
@@ -55,7 +53,6 @@
 import org.zanata.dao.AccountDAO;
 import org.zanata.dao.CredentialsDAO;
 import org.zanata.dao.PersonDAO;
-import org.zanata.email.EmailStrategy;
 import org.zanata.i18n.Messages;
 import org.zanata.model.HAccount;
 import org.zanata.model.HLocale;
@@ -307,6 +304,14 @@ private String getKeyPrefix() {
         return serverName.replace(".", "_");
     }
 
+    /**
+     * return javascript safe message
+     */
+    public String getRegenerateAPiKeyMsg() {
+        String msg = msgs.get("jsf.apikey.ConfirmGenerate");
+        return StringEscapeUtils.escapeJavaScript(msg);
+    }
+
     public void regenerateApiKey() {
         HAccount account =
                 accountDAO.findById(authenticatedAccount.getId());
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
index adf67081ea..254b1b3afa 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
@@ -6,10 +6,6 @@
   xmlns:a4j="http://richfaces.org/a4j"
   xmlns:zanata="http://java.sun.com/jsf/composite/zanata">
 
-  <a4j:jsFunction name="regenerateApiKey"
-    action="#{userSettingsAction.regenerateApiKey}"
-    render="apiKeyForm" status="client-loader"/>
-
   <h1>#{msgs['jsf.dashboard.settings.title']}</h1>
   <div class="tabs--vertical js-tabs">
     <ul class="tabs__nav js-tabs-nav">
@@ -273,6 +269,11 @@
           #{msgs['jsf.dashboard.settings.clientSettings.label']}
         </h2>
         <h:form id="apiKeyForm">
+          <a4j:jsFunction name="regenerateApiKey"
+            action="#{userSettingsAction.regenerateApiKey}"
+            render="apiKeyForm" status="client-loader"
+            limitRender="true"/>
+
           <p class="txt--meta">
             <h:outputText value="#{msgs['jsf.dashboard.settings.apiKeyNeeded.message']}"/>
             <a href="http://zanata.org/help/cli/cli-configuration/"
@@ -301,8 +302,15 @@
               </p>
             </s:fragment>
           </div>
+          <script>
+            function confirmGenerateApiKey() {
+              if (confirm("#{userSettingsAction.regenerateAPiKeyMsg}")) {
+                regenerateApiKey();
+              }
+            }
+          </script>
           <button id="generateKeyButton" class="button"
-            onclick="if (confirm('#{msgs['jsf.apikey.ConfirmGenerate']}')) {regenerateApiKey();} return false;">
+            onclick="confirmGenerateApiKey();return false;">
             #{msgs['jsf.dashboard.settings.generateNewApiKey.label']}
           </button>
           <div class="form__item l--push-top-1">