fix auto signing bug for sandbox; update examples

FamilySearch · Jun 23, 2015 · d9cc44e · d9cc44e
1 parent efc1209
commit d9cc44e
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 20 deletions.
diff --git a/examples/angularjs.html b/examples/angularjs.html
@@ -7,18 +7,19 @@
   <script>
     function DemoCntl($scope, $location, $http, $q, $timeout) {
       $scope.run = function() {
-        FamilySearch.init({
+        var fsClient = new FamilySearch({
           client_id: 'YOUR_CLIENT_ID_GOES_HERE',
           environment: 'sandbox',
           redirect_uri: 'YOUR_REDIRECT_URI_GOES_HERE',
           http_function: $http,
           deferred_function: $q.defer,
           timeout_function: $timeout,
           save_access_token: true,
-          auto_expire: true
+          auto_expire: true,
+          auto_signin: true
         });
 
-        FamilySearch.getCurrentUser().then(function(response) {
+        fsClient.getCurrentUser().then(function(response) {
           // since the SDK is using AngularJS functions for http, deferred, and timeout, you don't have to call $scope.$apply!
           $scope.contactName = response.getUser().contactName;
         });

diff --git a/examples/jquery-requirejs.html b/examples/jquery-requirejs.html
@@ -9,21 +9,25 @@
 <body>
 <script>
   require(['FamilySearch'], function(FamilySearch) {
-    window.run = function() {
-      FamilySearch.getCurrentUser().then(function(response) {
-        $('#output').append('Hello '+response.getUser().contactName+'!');
-      });
-    };
-
-    FamilySearch.init({
+
+    var fsClient = new FamilySearch({
       client_id: 'YOUR_CLIENT_ID_GOES_HERE',
       environment: 'sandbox',
       redirect_uri: 'YOUR_REDIRECT_URI_GOES_HERE',
       http_function: $.ajax,
       deferred_function: $.Deferred,
       save_access_token: true,
-      auto_expire: true
+      auto_expire: true,
+      auto_signin: true
     });
+
+    window.run = function() {
+      fsClient.getCurrentUser().then(function(response) {
+        $('#output').append('Hello '+response.getUser().contactName+'!');
+      });
+    };
+
+
   });
 </script>
 

diff --git a/examples/jquery.html b/examples/jquery.html
@@ -8,21 +8,24 @@
 
 <body>
 <script>
-  window.run = function() {
-    FamilySearch.getCurrentUser().then(function(response) {
-      $('#output').append('Hello '+response.getUser().contactName+'!');
-    });
-  };
-
-  FamilySearch.init({
+  var fsClient = new FamilySearch({
     client_id: 'YOUR_CLIENT_ID_GOES_HERE',
     environment: 'sandbox',
     redirect_uri: 'YOUR_REDIRECT_URI_GOES_HERE',
     http_function: $.ajax,
     deferred_function: $.Deferred,
     save_access_token: true,
-    auto_expire: true
+    auto_expire: true,
+    auto_signin: true
   });
+
+  window.run = function() {
+    fsClient.getCurrentUser().then(function(response) {
+      $('#output').append('Hello '+response.getUser().contactName+'!');
+    });
+  };
+
+
 </script>
 
 <a href="#" onclick="run()">Run</a>

diff --git a/src/globals.js b/src/globals.js
@@ -31,7 +31,7 @@ module.exports = {
     'production': 'https://familysearch.org'
   },
   oauthServer: {
-    'sandbox'   : 'https://sandbox.familysearch.org/cis-web/oauth2/v3',
+    'sandbox'   : 'https://integration.familysearch.org/cis-web/oauth2/v3',
     'staging'   : 'https://identbeta.familysearch.org/cis-web/oauth2/v3',
     'beta'      : 'https://identbeta.familysearch.org/cis-web/oauth2/v3',
     'production': 'https://ident.familysearch.org/cis-web/oauth2/v3'