Merge pull request #224 from TAMULib/2.x-staging

2.x staging

app/controllers/errorPageController.js

@@ -1,5 +1,25 @@
 core.controller("ErrorPageController", function ($scope, AccessControlService) {
 
-    $scope.lastRoute = AccessControlService.getLastRoutePath();
+  $scope.getPath = function (path) {
+
+    if (!!path && path.length > 0) {
+      var paths = path.split('/');
+
+      for (var i in paths) {
+        // Return to top-level when previous path contains route variables.
+        if (paths[i][0] === ':') {
+          paths = [];
+          break;
+        }
+      }
+
+      return paths.join('/');
+    }
+
+    return path;
+  };
+
+  // This is actually a URL path and not a route.
+  $scope.lastRoute = $scope.getPath(AccessControlService.getLastRoutePath());
 
 });

app/services/userService.js

@@ -10,10 +10,24 @@ core.service("UserService", function ($q, StorageService, User, WsApi) {
 
     UserService.fetchUser = function () {
         userEvents.notify('FETCH');
+
         return WsApi.fetch(currentUser.getMapping().instantiate).then(function (res) {
-            delete sessionStorage.role;
-            var credentials = angular.fromJson(res.body).payload.Credentials;
-            currentUser.anonymous = credentials.role === appConfig.anonymousRole ? true : false;
+            var body = !!res && !!res.body ? angular.fromJson(res.body) : {};
+            var credentials = { role: !!currentUser.role ? currentUser.role : appConfig.anonymousRole };
+
+            // Only change credentials when packet structure is valid.
+            if (!!body && !!body.payload && !!body.payload.Credentials) {
+              delete sessionStorage.role;
+              credentials = angular.fromJson(res.body).payload.Credentials;
+            }
+
+            currentUser.anonymous = !credentials.role || credentials.role === appConfig.anonymousRole;
+
+            // Cannot have a token for the anonymous role.
+            if (currentUser.anonymous) {
+              StorageService.delete("token");
+            }
+
             angular.extend(currentUser, credentials);
             StorageService.set("role", currentUser.role);
             userEvents.notify('RECEIVED');

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wvr/core",
-  "version": "2.2.2-rc.13",
+  "version": "2.2.2-rc.14",
   "description": "Weaver AngularJs Core Module",
   "repository": " https://github.com/TAMULib/Weaver-UI-Core.git",
   "license": "MIT",
@@ -70,6 +70,8 @@
     "verdaccio": "^5.13.3"
   },
   "overrides": {
-    "glob-stream": "^7.0.0"
+    "glob-stream": "^7.0.0",
+    "minimatch": "^3.1.2",
+    "qs": "^6.11.0"
   }
 }