From 29c8d81fe59302bb91d62b43d231685dae1f98e6 Mon Sep 17 00:00:00 2001
From: Stian Thorgersen <stianst@gmail.com>
Date: Fri, 25 Oct 2013 15:50:14 +0100
Subject: [PATCH] Updated instructions for adding social providers through
 admin console

---
 .../resources/admin/js/controllers/realm.js    |  2 +-
 .../admin/partials/provider/facebook-help.html | 18 +++++++++++-------
 .../admin/partials/provider/twitter-help.html  | 12 ++++++------
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/realm.js b/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/realm.js
index 2cda1e9976..1b4a4f500d 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/realm.js
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/realm.js
@@ -212,7 +212,7 @@ module.controller('RealmSocialCtrl', function($scope, realm, Realm, $location, N
 
     var oldCopy = angular.copy($scope.realm);
     $scope.changed = false;
-    $scope.callbackUrl = "http://mock.url.org/don/t/know/what/to/place/here";
+    $scope.callbackUrl = $location.absUrl().replace(/\/admin.*/, "/rest/social/callback");
 
     // To get rid of the "undefined" option in the provider select list
     // Setting the 1st option from the list (if the list is not empty)
diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/provider/facebook-help.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/provider/facebook-help.html
index b77979d1a5..33a94e9b8f 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/provider/facebook-help.html
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/provider/facebook-help.html
@@ -1,22 +1,26 @@
-<p>
-    Mock page for <i>Facebook provider help</i>.
-</p>
+<p>Open <a href="https://developers.facebook.com/apps" target="_blank">https://developers.facebook.com/apps</a>. Click on <i>Create New App</i></p>
 
-<p>Fill in name, description and website. For <i>Callback URL</i> use the following value:</p>
+<p>Use any app name that you'd like, click <i>Continue</i></p>
+
+<p>Select <i>Disabled</i> for <i>Sandbox Mode</i></p>
+
+<p>Under <i>Select how your app integrates with Facebook</i> select <i>Website with Facebook login</i>. Fill in the form with the following values:</p>
 
 <ul>
-    <li><b>Callback URL:</b> {{callbackUrl}}</li>
+    <li><b>Site URL:</b> {{callbackUrl}}</li>
 </ul>
 
+<p>Click on <i>Save changes</i>. Insert <i>App ID</i> and <i>App Secret</i> in the form below.</p>
+
 <form class="form-horizontal" name="fbHelpForm">
     <div class="control-group">
-        <label class="control-label" for="providerHelp.key">Consumer key </label>
+        <label class="control-label" for="providerHelp.key">App ID </label>
         <div class="controls">
             <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">Consumer secret </label>
+        <label class="control-label" for="providerHelp.secret">App Secret </label>
         <div class="controls">
             <input type="text" class="input-xlarge" id="providerHelp.secret" ng-model="realm.socialProviders[helpPId+'.secret']">
         </div>
diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/provider/twitter-help.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/provider/twitter-help.html
index 27ea7abd88..19326ab918 100644
--- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/provider/twitter-help.html
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/provider/twitter-help.html
@@ -13,7 +13,12 @@
 
 <p>Agree to the rules, fill in the captcha and click on <i>Create your Twitter application</i></p>
 
-<p>Insert <i>Consumer key</i> and <i>Consumer secret</i> in the form below.</p>
+<p>
+    Now click on <i>Settings</i> and tick the box <i>Allow this application to be used to Sign in with Twitter</i>, and click on <i>Update
+    this Twitter application's settings</i>.
+</p>
+
+<p>Click on <i>Details</i>. Insert <i>Consumer key</i> and <i>Consumer secret</i> in the form below.</p>
 
 <form class="form-horizontal" name="twitterHelpForm">
     <div class="control-group">
@@ -30,11 +35,6 @@
     </div>
 </form>
 
-<p>
-    Now click on <i>Settings</i> and tick the box <i>Allow this application to be used to Sign in with Twitter</i>, and click on <i>Update
-    this Twitter application's settings</i>.
-</p>
-
 <p>
     Close the help panel and click <i>save changes</i>.
 </p>
\ No newline at end of file