frontend: fixes

- route protection
- items in sidebar being displayed after a user has deleted his account

Author: abainczyk

frontend/src/main/javascript/src/js/components/forms/userEditForm.js

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+import {events} from '../../constants';
+
 /**
  * The component for the form to edit the password and the email of a user or to delete the user.
  */
@@ -27,14 +29,16 @@ class UserEditForm {
      * @param {ToastService} ToastService
      * @param {UserResource} UserResource
      * @param {PromptService} PromptService
+     * @param {EventBus} EventBus
      */
     // @ngInject
-    constructor($state, SessionService, ToastService, UserResource, PromptService) {
+    constructor($state, SessionService, ToastService, UserResource, PromptService, EventBus) {
         this.$state = $state;
         this.SessionService = SessionService;
         this.ToastService = ToastService;
         this.UserResource = UserResource;
         this.PromptService = PromptService;
+        this.EventBus = EventBus;
 
         /**
          * The model for the input of the old password.
@@ -116,6 +120,8 @@ class UserEditForm {
 
                         // remove the users jwt so that he cannot do anything after being deleted
                         this.SessionService.removeUser();
+                        this.EventBus.emit(events.USER_LOGGED_IN, {user: null});
+                        this.EventBus.emit(events.PROJECT_OPENED, {project: null});
                         this.$state.go('home');
                     })
                     .catch(response => {

frontend/src/main/javascript/src/js/routes.js

@@ -128,33 +128,31 @@ export function config($stateProvider, $urlRouterProvider) {
 /**
  * Validate routes on state change.
  *
- * @param $rootScope
- * @param $state
+ * @param {TransitionService} $transitions
  * @param {SessionService} SessionService
  * @param {ToastService} ToastService
  */
 // @ngInject
-export function run($rootScope, $state, SessionService, ToastService) {
+export function run($transitions, SessionService, ToastService) {
 
     // route validation
-    $rootScope.$on('$stateChangeStart', stateChangeStart);
+    $transitions.onBefore({}, onBefore, {});
+    $transitions.onSuccess({}, onSuccess, {});
 
-    function stateChangeStart(event, toState) {
-        if (toState.data) {
-            const user = SessionService.getUser();
-            const project = SessionService.getProject();
+    function onBefore(transition) {
+        const user = SessionService.getUser();
+        const project = SessionService.getProject();
 
-            document.querySelector('title').innerHTML = 'ALEX | ' + toState.data.title;
+        const data = transition.to().data;
+        if ((data.roles && (user === null || data.roles.indexOf(user.role) === -1))
+            || (data.requiresProject && project === null)) {
 
-            if ((toState.data.roles && (user === null
-                    || toState.data.roles.indexOf(user.role) === -1))
-                || (toState.data.requiresProject && project === null)) {
-
-                ToastService.danger('You are not allowed to go to this page!');
-
-                $state.go('home');
-                event.preventDefault();
-            }
+            ToastService.danger('You cannot access this page!');
+            return transition.router.stateService.target('home');
         }
     }
+
+    function onSuccess(transition) {
+        document.querySelector('title').innerHTML = 'ALEX | ' + transition.to().data.title;
+    }
 }