From f63872b8b0967ad5901ea6f5f80fff2526711b31 Mon Sep 17 00:00:00 2001
From: Stian Thorgersen <stianst@gmail.com>
Date: Thu, 9 Jan 2014 17:06:29 +0000
Subject: [PATCH 1/2] KEYCLOAK-228 Updated instructions to add Google

---
 .../admin/partials/provider/google-help.html  | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/provider/google-help.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/provider/google-help.html
index 1c2eae13e6..048a8ca956 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/provider/google-help.html
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/provider/google-help.html
@@ -1,36 +1,35 @@
 <p>
-    Open <a href="https://code.google.com/apis/console/" target="_blank">https://code.google.com/apis/console/</a>. From
-    the
-    drop-down menu select <i>Create</i>.
+    Open <a href="https://cloud.google.com/console/project" target="_blank">https://cloud.google.com/console/project</a>.
+    Click <i>Create Project</i>.
 </p>
 
-<p>Use any name that you'd like, click <i>Create Project</i>, select <i>API Access</i> and click on <i>Create an OAuth
-    2.0 client ID</i>.</p>
+<p>Use any project name and id that you'd want and click <i>Create</i>. Wait for the project to be created.</p>
 
-<p>Use any product name you'd like and leave the other fields empty, then click <i>Next</i>. On the next page select <i>Web
-    application</i>
-    as the application type. Click <i>more options</i> next to <i>Your site or hostname</i>. Fill in the form with the
-    following values:</p>
+<p>Click <i>APIs & auth</i>, under <i>APIs</i> make sure <i>Google+ API</i> is <i>ON</i>.
 
-<ul>
-    <li><b>Authorized Redirect URIs:</b> {{callbackUrl}}</li>
-</ul>
+<p>Click <i>Credentials</i> and click on <i>Create New Client ID</i>. Select <i>Web application</i> as <i>Application
+    type</i>. <i>Authorized Javascript origins</i> should be empty. Add <i>{{callbackUrl}}</i> to <i>Authorized redirect
+    URI</i>. Click <i>Create Client ID</i></p>.
 
-<p>Click on <i>Create client ID</i>. Insert <i>Client ID</i> and <i>Client secret</i> in the form below.</p>
+<p>Insert <i>Client ID</i> and <i>Client secret</i> in the form below.</p>
 
 <form class="form-horizontal" name="googleHelpForm">
     <div class="control-group">
         <label class="control-label" for="providerHelp.key">Client ID </label>
+
         <div class="controls">
-            <input type="text" class="input-xlarge" id="providerHelp.key" ng-model="realm.socialProviders[helpPId+'.key']">
+            <input type="text" class="input-xlarge" id="providerHelp.key"
+                   ng-model="realm.socialProviders[helpPId+'.key']">
         </div>
     </div>
     <div class="control-group">
         <label class="control-label" for="providerHelp.secret">Client secret </label>
+
         <div class="controls">
-            <input type="text" class="input-xlarge" id="providerHelp.secret" ng-model="realm.socialProviders[helpPId+'.secret']">
+            <input type="text" class="input-xlarge" id="providerHelp.secret"
+                   ng-model="realm.socialProviders[helpPId+'.secret']">
         </div>
     </div>
 </form>
 
-<p>Close the help panel and click <i>save changes</i>.</p>
+<p>Close the help panel and click <i>save changes</i>.</p>
\ No newline at end of file

From aaae0ff2f7f12dc3353ab5d600f55ecf591eddf7 Mon Sep 17 00:00:00 2001
From: Stian Thorgersen <stianst@gmail.com>
Date: Thu, 9 Jan 2014 17:06:58 +0000
Subject: [PATCH 2/2] Updated Undertow to same version as in WildFly CR1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 80813f6c6a..48246591d2 100755
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
     <properties>
         <keycloak.apache.httpcomponents.version>4.1.2</keycloak.apache.httpcomponents.version>
         <resteasy.version>3.0.5.Final</resteasy.version>
-        <undertow.version>1.0.0.Beta28</undertow.version>
+        <undertow.version>1.0.0.Beta30</undertow.version>
         <picketlink.version>2.5.0.Beta6</picketlink.version>
         <mongo.driver.version>2.11.2</mongo.driver.version>
         <jboss.logging.version>3.1.1.GA</jboss.logging.version>