tested on listen page

QutEcoacoustics · Nov 30, 2014 · c24d957 · c24d957
1 parent 8069254
commit c24d957
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 34 deletions.
diff --git a/src/app/app.js b/src/app/app.js
@@ -312,9 +312,8 @@ var app = angular.module('baw',
               // cross-site scripting token storage
               $rootScope.csrfToken = null;
 
-              // storage of auth_token
-              $rootScope.authorisationToken = null;
-
+              // storage of auth_token - now done in authenticator
+              /* deprecated */
               $rootScope.authTokenParams = function () {
                   if ($rootScope.authorisationToken) {
                       return {
@@ -327,14 +326,15 @@ var app = angular.module('baw',
                   return $url.toKeyValue($rootScope.authTokenParams());
               };
 
+
               $rootScope.loggedIn = false;
 
               $rootScope.$watch('userData', function () {
                   var token = $rootScope.authorisationToken,
                       userData = $rootScope.userData;
                   $rootScope.loggedIn = (token && userData) ? true : false;
 
-              });
+              });    /* /deprecated */
 
               $rootScope.downloadAnnotationLink = AudioEvent.csvLink();
 

diff --git a/src/app/listen/listen.js b/src/app/listen/listen.js
@@ -136,9 +136,9 @@ angular.module('bawApp.listen', ['decipher.tags', 'ui.bootstrap.typeahead'])
                     }
                 });
 
-                /* // NOT NECESSARY - we aren't using auth keys atm    */
-                $scope.$on('event:auth-loginRequired', function(){ $scope.model.media.formatPaths(); });
-                $scope.$on('event:auth-loginConfirmed', function(){ $scope.model.media.formatPaths(); });
+                // update urls on login events
+                $scope.$on('event:auth-loginRequired', function(){ if($scope.model.media) {$scope.model.media.formatPaths();} });
+                $scope.$on('event:auth-loginConfirmed', function(){ if($scope.model.media) {$scope.model.media.formatPaths();} });
 
                 var media = MediaService
                     .get(

diff --git a/src/components/services/services.js b/src/components/services/services.js
@@ -412,6 +412,33 @@
     // authentication...
     bawss.factory('Authenticator', ['$rootScope', 'authService', '$http', 'conf.paths',
         function ($rootScope, authService, $http, paths) {
+            // As soon as the module is initiated...
+            // WARNING: Cookies required for this to work
+            checkLogin();
+
+            var that = {
+                loginSuccess: loginSuccess,
+                loginFailure: loginFailure,
+                logoutSuccess: function logoutSuccess(data, status, headers, config) {
+                    $rootScope.$safeApply($rootScope, function () {
+                        that.authToken = null;
+                        $rootScope.userData = null;
+                        $http.defaults.headers.common["Authorization"] = null;
+
+                        console.log("Logout successful", data);
+                    });
+                },
+                logoutFailure: function logoutFailure(data, status, headers, config) {
+                    console.error("Logout failure: ", data, status, headers, config);
+                },
+                checkLogin: checkLogin,
+                authToken: null
+            };
+
+            return that;
+
+            // functions
+
             function loginSuccess(data, status, headers, config) {
                 // a provider has just logged in
                 // the response arg, is the response from our server (devise)
@@ -421,13 +448,13 @@
                     throw "Authenticator.loginSuccess: this function should not be called unless a successful response was received";
                 }
 
-                if (data.authorisationToken === undefined) {
+                if (data.authToken === undefined) {
                     throw "The authorisation token can not be undefined at this point";
                 }
 
-                this.authorisationToken = data.authToken;
+                that.authToken = data.authToken;
                 $http.defaults.headers.common["Authorization"] = 'Token token="' +
-                                                                 $rootScope.authorisationToken +
+                                                                 that.authToken +
                                                                  '"';
 
                 $rootScope.$safeApply($rootScope, function () {
@@ -439,7 +466,7 @@
 
             function loginFailure(data, status, headers, config) {
                 $rootScope.$safeApply($rootScope, function () {
-                    $rootScope.authorisationToken = null;
+                    that.authToken = null;
                     $rootScope.userData = null;
                     $http.defaults.headers.common["Authorization"] = null;
 
@@ -490,29 +517,6 @@
 
                 return true;
             }
-
-            // As soon as the module is initiated...
-            // WARNING: Cookies required for this to work
-            checkLogin();
-
-            return {
-                loginSuccess: loginSuccess,
-                loginFailure: loginFailure,
-                logoutSuccess: function logoutSuccess(data, status, headers, config) {
-                    $rootScope.$safeApply($rootScope, function () {
-                        $rootScope.authorisationToken = null;
-                        $rootScope.userData = null;
-                        $http.defaults.headers.common["Authorization"] = null;
-
-                        console.log("Logout successful", data);
-                    });
-                },
-                logoutFailure: function logoutFailure(data, status, headers, config) {
-                    console.error("Logout failure: ", data, status, headers, config);
-                },
-                checkLogin: checkLogin,
-                authToken: null
-            };
         }]);
 
     bawss.factory('AuthenticationProviders',