Use oauth module from PJC

zooniverse · Sep 1, 2016 · decff8a · decff8a
1 parent 6bee11f
commit decff8a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 14 deletions.
diff --git a/app/modules/auth/scripts/init.js b/app/modules/auth/scripts/init.js
@@ -57,20 +57,14 @@
             _setToken(params.access_token);
             _startTimer();
             return _setUserData()
-                .then(function () {
-                    $window.location.href = localStorageService.get('redirectOnSignIn');
-                });
+                // .then(function () {
+                //     $window.location.href = localStorageService.get('redirectOnSignIn');
+                // });
         }
 
         function signIn() {
             localStorageService.set('redirectOnSignIn', $location.absUrl());
-            $window.location.href = zooAPI.root.match(/^(.*)\/[^/]*$/)[1] +
-                '/oauth/authorize' +
-                '?response_type=token' +
-                '&client_id=' +
-                zooAPIConfig.app_id +
-                '&redirect_uri=' +
-                $location.absUrl().match(/.+?(?=\#\/)/)[0];
+            $window.zooOAuth.signIn($location.absUrl().match(/.+?(?=\#\/)/)[0]);
         }
 
         function _setToken(token) {

diff --git a/app/modules/zoo-api/scripts/project-service.js b/app/modules/zoo-api/scripts/project-service.js
@@ -29,8 +29,7 @@
 
     module.factory('zooAPI', function ($window, zooAPIConfig) {
       console.log('zooAPIConfig = ', zooAPIConfig);
-      $window.zooAPI.root = zooAPIConfig.url;
-      $window.zooAPI.appID = zooAPIConfig.app_id;
+      $window.zooOAuth.init(zooAPIConfig.app_id);
       return $window.zooAPI;
     });
 

diff --git a/package.json b/package.json
@@ -47,7 +47,7 @@
     "karma-firefox-launcher": "^0.1.6",
     "karma-jasmine": "0.3.5",
     "nib": "1.1.0",
-    "panoptes-client": "^2.5.1",
+    "panoptes-client": "^2.5.2",
     "run-sequence": "^1.1.0",
     "stylus": "^0.51.1"
   },

diff --git a/panoptes-client-wrapper/index.js b/panoptes-client-wrapper/index.js
@@ -1,2 +1,3 @@
 window.zooAPI = require('panoptes-client/lib/api-client');
-window.zooAuth = require('panoptes-client/lib/auth');
+window.zooAuth = require('panoptes-client/lib/auth');
+window.zooOAuth = require('panoptes-client/lib/oauth');