Merge pull request #175 from TAMULib/DAME-Aug-Sept-sprint-129-deep-li…

…nking Dame aug sept sprint 129 deep linking
TAMULib · Sep 8, 2021 · 92fdf3c · 92fdf3c
2 parents 0a0de41 + 359ea00
commit 92fdf3c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 17 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -27,7 +27,7 @@ jobs:
       - name: "Setup Node"
         uses: actions/setup-node@v2
         with:
-          node-version: 6
+          node-version: 12
 
       - name: "Install Node"
         run: npm install

diff --git a/app/controllers/authenticationController.js b/app/controllers/authenticationController.js
@@ -69,9 +69,9 @@ core.controller('AuthenticationController', function ($controller, $location, $s
         }
 
         if (appConfig.mockRole) {
-            $window.open(appConfig.authService + "/token?referrer=" + location.origin + path + "&mock=" + appConfig.mockRole, "_self");
+            $window.open(appConfig.authService + "/token?referrer=" + encodeURIComponent(location.origin + path + location.search) + "&mock=" + appConfig.mockRole, "_self");
         } else {
-            $window.open(appConfig.authService + "/token?referrer=" + location.origin + path, "_self");
+            $window.open(appConfig.authService + "/token?referrer=" + encodeURIComponent(location.origin + path + location.search), "_self");
         }
 
     };

diff --git a/app/services/accessControlService.js b/app/services/accessControlService.js
@@ -1,4 +1,4 @@
-core.service("AccessControlService", function ($location, StorageService) {
+core.service("AccessControlService", function ($location, StorageService, UserService) {
 
     var AccessControlService = this;
 
@@ -19,22 +19,26 @@ core.service("AccessControlService", function ($location, StorageService) {
 
         if(allowedUsers === undefined) return;
 
-        var role = StorageService.get("role");
+        var role;
 
-        var restrict = allowedUsers.indexOf(role) < 0;
+        UserService.userReady().then(function() {
+            UserService.getCurrentUser();
+            role = StorageService.get("role");
+        }).then(function() {
+            var restrict = allowedUsers.indexOf(role) < 0;
 
-        var authorizeUrl = StorageService.get("post_authorize_url");
-
-        if (role === 'ROLE_ANONYMOUS') {
-            StorageService.set("post_authorize_url", window.location.pathname);
-            $location.path("/error/401");
-        } else if (authorizeUrl && $location.path() !== "/error/401") {
-            StorageService.delete("post_authorize_url");
-        } else if (restrict) {
-            evt.preventDefault();
-            $location.path("/error/403");
-        }
+            var authorizeUrl = StorageService.get("post_authorize_url");
 
+            if (role === 'ROLE_ANONYMOUS') {
+                StorageService.set("post_authorize_url", window.location.pathname);
+                $location.path("/error/401");
+            } else if (authorizeUrl && $location.path() !== "/error/401") {
+                StorageService.delete("post_authorize_url");
+            } else if (restrict) {
+                evt.preventDefault();
+                $location.path("/error/403");
+            }
+        });
     };
 
     AccessControlService.getLastRoutePath = function () {