angular: load basic user info via ajax on first load

backend/src/appenlight/static/js/appenlight.js

@@ -2709,7 +2709,6 b" angular.module('appenlight.plugins', pluginsToLoad);"
 var app = angular.module('appenlight', [
     'appenlight.base',
     'appenlight.config',
-    'appenlight.user',
     'appenlight.templates',
     'appenlight.filters',
     'appenlight.services',
@@ -2718,10 +2717,8 b" var app = angular.module('appenlight', ["
     'appenlight.plugins'
 ]);
 
-function kickstartAE() {
-
-
-
+// needs manual execution because of plugin files
+function kickstartAE(initialUserData) {
     app.config(['$httpProvider', '$uibTooltipProvider', '$locationProvider', function ($httpProvider, $uibTooltipProvider, $locationProvider) {
         $locationProvider.html5Mode(true);
         $httpProvider.interceptors.push(['$q', '$rootScope', '$timeout', 'stateHolder', function ($q, $rootScope, $timeout, stateHolder) {
@@ -2773,14 +2770,14 b' function kickstartAE() {'
         });
     });
 
-    app.run(['$rootScope', '$timeout', 'stateHolder', '$state', '$location', '$transitions', '$window', 'AeConfig', 'AeUser',
-        function ($rootScope, $timeout, stateHolder, $state, $location, $transitions, $window, AeConfig, AeUser) {
+    app.run(['$rootScope', '$timeout', 'stateHolder', '$state', '$location', '$transitions', '$window', 'AeConfig',
+        function ($rootScope, $timeout, stateHolder, $state, $location, $transitions, $window, AeConfig) {
+            stateHolder.AeUser = buildUser(initialUserData || {"user_name": null, "id": null});
             $rootScope.$state = $state;
             $rootScope.stateHolder = stateHolder;
             $rootScope.flash = stateHolder.flashMessages.list;
             $rootScope.closeAlert = stateHolder.flashMessages.closeAlert;
             $rootScope.AeConfig = AeConfig;
-            $rootScope.AeUser = AeUser;
 
             var transitionApp = function($transition$, $state) {
                 // redirect user to /register unless its one of open views
@@ -2807,14 +2804,22 b' function kickstartAE() {'
                         isOpenView = true;
                     }
                 });
-                if (AeUser.id === null && !isGuestState && !isOpenView) {
+                if (stateHolder.AeUser.id === null && !isGuestState && !isOpenView) {
                     if (window.location.toString().indexOf(AeConfig.urls.otherRoutes.register) === -1) {
                         
-                        $window.location = AeConfig.urls.otherRoutes.register + '?came_from=' + encodeURIComponent(window.location);
+                        var newLocation = AeConfig.urls.otherRoutes.register + '?came_from=' + encodeURIComponent(window.location);
+                        // fix infinite digest here
+                        $rootScope.$on('$locationChangeStart',
+                            function(event, toState, toParams, fromState, fromParams, options){
+                                event.preventDefault();
+                                $window.location = newLocation;
+                            });
+                        $window.location = newLocation;
                         return false;
                     }
                     return false;
                 }
+                return true;
             };
             $transitions.onBefore({}, transitionApp);
 
@@ -4853,20 +4858,20 b' function kickstartAE() {'
     "<div class=\"row\">\n" +
     "    <div class=\"col-sm-12 dashboard\" id=\"content\">\n" +
     "\n" +
-    "        <div ng-if=\"!AeUser.applications.length\">\n" +
+    "        <div ng-if=\"!stateHolder.AeUser.applications.length\">\n" +
     "\n" +
     "            <div ng-include=\"'templates/quickstart.html'\"></div>\n" +
     "\n" +
     "        </div>\n" +
     "\n" +
-    "        <div ng-if=\"AeUser.applications.length\">\n" +
+    "        <div ng-if=\"stateHolder.AeUser.applications.length\">\n" +
     "\n" +
     "            <div class=\"row\">\n" +
     "                <div class=\"col-sm-6\">\n" +
     "                    <div class=\"panel panel-default\">\n" +
     "                        <div class=\"panel-body\">\n" +
     "                            <form class=\"graph-type form-inline\">\n" +
-    "                                <select ng-model=\"index.resource\" ng-options=\"r.resource_id as r.resource_name for r in AeUser.applications\" ng-change=\"index.updateSearchParams()\"\n" +
+    "                                <select ng-model=\"index.resource\" ng-options=\"r.resource_id as r.resource_name for r in stateHolder.AeUser.applications\" ng-change=\"index.updateSearchParams()\"\n" +
     "                                        class=\"SelectField form-control input-sm slim-input\"></select>\n" +
     "\n" +
     "                                <select class=\"SelectField form-control input-sm slim-input\" ng-model=\"index.timeSpan\"\n" +
@@ -6138,7 +6143,7 b' function kickstartAE() {'
     "\n" +
     "<div ng-if=\"report.report !== null && !report.is_loading.report\">\n" +
     "\n" +
-    "    <div ng-if=\"AeUser.id\" class=\"row\">\n" +
+    "    <div ng-if=\"stateHolder.AeUser.id\" class=\"row\">\n" +
     "      <div class=\"col-lg-12\">\n" +
     "        <a onclick=\"window.history.back()\" class=\"btn btn-default\" ng-if=\"report.window.history.length > 2\"><span class=\"fa fa-arrow-circle-o-left\"></span>\n" +
     "            Go back</a>\n" +
@@ -7684,9 +7689,9 b' function AdminUsersController(usersResource) {'
 angular.module('appenlight.controllers')
     .controller('ApplicationsUpdateController', ApplicationsUpdateController)
 
-ApplicationsUpdateController.$inject = ['$state', 'applicationsNoIdResource', 'applicationsResource', 'applicationsPropertyResource', 'AeUser'];
+ApplicationsUpdateController.$inject = ['$state', 'applicationsNoIdResource', 'applicationsResource', 'applicationsPropertyResource', 'stateHolder'];
 
-function ApplicationsUpdateController($state, applicationsNoIdResource, applicationsResource, applicationsPropertyResource, AeUser) {
+function ApplicationsUpdateController($state, applicationsNoIdResource, applicationsResource, applicationsPropertyResource, stateHolder) {
     'use strict';
     
     var vm = this;
@@ -7732,9 +7737,7 b' function ApplicationsUpdateController($state, applicationsNoIdResource, applicat'
         vm.loading.application = true;
         if (vm.resource.resource_id === null) {
             applicationsNoIdResource.save(null, vm.resource, function (data) {
-                
-                AeUser.addApplication(data);
-                
+                stateHolder.AeUser.addApplication(data);
                 $state.go('applications.update', {resourceId: data.resource_id});
                 setServerValidation(vm.BasicForm);
             }, function (response) {
@@ -7801,9 +7804,7 b' function ApplicationsUpdateController($state, applicationsNoIdResource, applicat'
                 key: 'delete_resource'
             }, vm.formDeleteModel,
             function (data) {
-                
-                AeUser.removeApplicationById(vm.resource.resource_id);
-                
+                stateHolder.AeUser.removeApplicationById(vm.resource.resource_id);
                 $state.go('applications.list');
             },
             function (response) {
@@ -8120,9 +8121,9 b' function EventsController(eventsNoIdResource, eventsResource) {'
 angular.module('appenlight.controllers')
     .controller('IndexDashboardController', IndexDashboardController);
 
-IndexDashboardController.$inject = ['$scope', '$location','$cookies', '$interval', 'stateHolder', 'userSelfPropertyResource', 'applicationsPropertyResource', 'AeConfig', 'AeUser'];
+IndexDashboardController.$inject = ['$scope', '$location','$cookies', '$interval', 'stateHolder', 'userSelfPropertyResource', 'applicationsPropertyResource', 'AeConfig'];
 
-function IndexDashboardController($scope, $location, $cookies, $interval, stateHolder, userSelfPropertyResource, applicationsPropertyResource, AeConfig, AeUser) {
+function IndexDashboardController($scope, $location, $cookies, $interval, stateHolder, userSelfPropertyResource, applicationsPropertyResource, AeConfig) {
     var vm = this;
     stateHolder.section = 'dashboard';
     vm.timeOptions = {};
@@ -8133,7 +8134,7 b' function IndexDashboardController($scope, $location, $cookies, $interval, stateH'
         }
     });
     vm.urls = AeConfig.urls;
-    vm.applications = AeUser.applications_map;
+    vm.applications = stateHolder.AeUser.applications_map;
     vm.show_dashboard = false;
     vm.resource = null;
     vm.graphType = {selected: null};
@@ -8527,7 +8528,7 b' function IndexDashboardController($scope, $location, $cookies, $interval, stateH'
     });
 
     vm.determineStartState = function () {
-        if (AeUser.applications.length) {
+        if (stateHolder.AeUser.applications.length) {
             vm.resource = Number($location.search().resource);
 
             if (!vm.resource){
@@ -8538,7 +8539,7 b' function IndexDashboardController($scope, $location, $cookies, $interval, stateH'
                     vm.resource = cookieResource;
                 }
                 else{
-                    vm.resource = AeUser.applications[0].resource_id;
+                    vm.resource = stateHolder.AeUser.applications[0].resource_id;
                 }
             }
         }
@@ -8782,7 +8783,7 b' function IndexDashboardController($scope, $location, $cookies, $interval, stateH'
         ;
     }
 
-    if (AeUser.applications.length){
+    if (stateHolder.AeUser.applications.length){
         vm.show_dashboard = true;
         vm.determineStartState();
         vm.refreshData();
@@ -8821,13 +8822,13 b' function IndexDashboardController($scope, $location, $cookies, $interval, stateH'
 angular.module('appenlight.controllers')
     .controller('HeaderCtrl', HeaderCtrl);
 
-HeaderCtrl.$inject = ['$state', 'stateHolder', 'AeUser'];
+HeaderCtrl.$inject = ['$state', 'stateHolder'];
 
-function HeaderCtrl($state, stateHolder, AeUser) {
+function HeaderCtrl($state, stateHolder) {
     var vm = this;
     vm.stateHolder = stateHolder;
-    vm.assignedReports = AeUser.assigned_reports;
-    vm.latestEvents = AeUser.latest_events;
+    vm.assignedReports = stateHolder.AeUser.assigned_reports;
+    vm.latestEvents = stateHolder.AeUser.latest_events;
     vm.activeEvents = 0;
     _.each(vm.latestEvents, function (event) {
         if (event.status === 1 && event.end_date === null) {
@@ -9193,9 +9194,9 b' function JiraIntegrationCtrl($uibModalInstance, $state, report, integrationName,'
 
 angular.module('appenlight.controllers').controller('LogsController', LogsController);
 
-LogsController.$inject = ['$scope', '$location', 'stateHolder', 'typeAheadTagHelper', 'logsNoIdResource', 'sectionViewResource', 'AeUser'];
+LogsController.$inject = ['$scope', '$location', 'stateHolder', 'typeAheadTagHelper', 'logsNoIdResource', 'sectionViewResource'];
 
-function LogsController($scope, $location, stateHolder, typeAheadTagHelper, logsNoIdResource, sectionViewResource, AeUser) {
+function LogsController($scope, $location, stateHolder, typeAheadTagHelper, logsNoIdResource, sectionViewResource) {
     var vm = this;
     vm.logEventsChartConfig = {
         data: {
@@ -9257,7 +9258,7 b' function LogsController($scope, $location, stateHolder, typeAheadTagHelper, logs'
     };
     vm.today();
 
-    vm.applications = AeUser.applications_map;
+    vm.applications = stateHolder.AeUser.applications_map;
     vm.logsPage = [];
     vm.itemCount = 0;
     vm.itemsPerPage = 250;
@@ -9645,11 +9646,11 b" angular.module('appenlight.controllers')"
     .controller('ReportsListSlowController', ReportsListSlowController);
 
 ReportsListSlowController.$inject = ['$scope', '$location', '$cookies',
-    'stateHolder', 'typeAheadTagHelper', 'slowReportsResource', 'AeUser']
+    'stateHolder', 'typeAheadTagHelper', 'slowReportsResource']
 
-function ReportsListSlowController($scope, $location, $cookies, stateHolder, typeAheadTagHelper, slowReportsResource, AeUser) {
+function ReportsListSlowController($scope, $location, $cookies, stateHolder, typeAheadTagHelper, slowReportsResource) {
     var vm = this;
-    vm.applications = AeUser.applications_map;
+    vm.applications = stateHolder.AeUser.applications_map;
     stateHolder.section = 'slow_reports';
     vm.today = function () {
         vm.pickerDate = new Date();
@@ -9787,7 +9788,7 b' function ReportsListSlowController($scope, $location, $cookies, stateHolder, typ'
             tag: 'Status ' + status.toUpperCase()
         });
     });
-    _.each(AeUser.applications, function (item) {
+    _.each(stateHolder.AeUser.applications, function (item) {
         vm.filterTypeAheadOptions.push({
             type: 'resource',
             text: 'resource:' + item.resource_id + ':' + item.resource_name,
@@ -9940,12 +9941,12 b" angular.module('appenlight.controllers')"
     .controller('ReportsListController', ReportsListController);
 
 ReportsListController.$inject = ['$scope', '$location', '$cookies',
-    'stateHolder', 'typeAheadTagHelper', 'reportsResource', 'AeUser'];
+    'stateHolder', 'typeAheadTagHelper', 'reportsResource'];
 
 function ReportsListController($scope, $location, $cookies, stateHolder,
-                               typeAheadTagHelper, reportsResource, AeUser) {
+                               typeAheadTagHelper, reportsResource) {
     var vm = this;
-    vm.applications = AeUser.applications_map;
+    vm.applications = stateHolder.AeUser.applications_map;
     stateHolder.section = 'reports';
     vm.today = function () {
         vm.pickerDate = new Date();
@@ -10103,7 +10104,7 b' function ReportsListController($scope, $location, $cookies, stateHolder,'
             tag: 'Status ' + status.toUpperCase()
         });
     });
-    _.each(AeUser.applications, function (item) {
+    _.each(stateHolder.AeUser.applications, function (item) {
         vm.filterTypeAheadOptions.push({
             type: 'resource',
             text: 'resource:' + item.resource_id + ':' + item.resource_name,
@@ -10260,9 +10261,9 b' function ReportsListController($scope, $location, $cookies, stateHolder,'
 angular.module('appenlight.controllers').controller('ReportsViewController', ReportsViewController);
 ReportsViewController.$inject = ['$window', '$location', '$state', '$uibModal',
     '$cookies', 'reportGroupPropertyResource', 'reportGroupResource',
-    'logsNoIdResource', 'AeUser'];
+    'logsNoIdResource', 'stateHolder'];
 
-function ReportsViewController($window, $location, $state, $uibModal, $cookies, reportGroupPropertyResource, reportGroupResource, logsNoIdResource, AeUser) {
+function ReportsViewController($window, $location, $state, $uibModal, $cookies, reportGroupPropertyResource, reportGroupResource, logsNoIdResource, stateHolder) {
     var vm = this;
     vm.window = $window;
     vm.reportHistoryConfig = {
@@ -10442,7 +10443,7 b' function ReportsViewController($window, $location, $state, $uibModal, $cookies, '
                 vm.rawTraceback += '    ' + frame.cline + "\r\n";
             });
 
-            if (AeUser.id){
+            if (stateHolder.AeUser.id){
                 vm.fetchHistory();
             }
 
@@ -12772,6 +12773,7 b" angular.module('appenlight.services.stateHolder', []).factory('stateHolder', ['$"
         resource: null,
         plugins: Plugins,
         flashMessages: flashMessages,
+        AeUser: {"user_name": null, "id": null}
     };
     return stateHolder;
 }]);
@@ -12910,21 +12912,17 b" underscore.factory('_', function () {"
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
-var aeuser = angular.module('appenlight.user', []);
-aeuser.factory('AeUser', ['AeConfig', function () {
-    var decodedAeUser = decodeEncodedJSON(window.AE.user);
-    
+function buildUser(jsonData){
     var AeUser = {
-        user_name: decodedAeUser.user_name || null,
-        id: decodedAeUser.id,
-        assigned_reports: decodedAeUser.assigned_reports || null,
-        latest_events: decodedAeUser.latest_events || null,
-        permissions: decodedAeUser.permissions || null,
-        groups: decodedAeUser.groups || null,
+        user_name: jsonData.user_name || null,
+        id: jsonData.id,
+        assigned_reports: jsonData.assigned_reports || null,
+        latest_events: jsonData.latest_events || null,
+        permissions: jsonData.permissions || null,
+        groups: jsonData.groups || null,
         applications: [],
         dashboards: []
     };
-    
     AeUser.applications_map = {};
     AeUser.dashboards_map = {};
     AeUser.addApplication = function (item) {
@@ -12973,12 +12971,11 b" aeuser.factory('AeUser', ['AeConfig', function () {"
         return hasPerm;
     };
 
-    _.each(decodedAeUser.applications, function (item) {
+    _.each(jsonData.applications, function (item) {
         AeUser.addApplication(item);
     });
-    _.each(decodedAeUser.dashboards, function (item) {
+    _.each(jsonData.dashboards, function (item) {
         AeUser.addDashboard(item);
     });
-
     return AeUser;
-}]);
+}

backend/src/appenlight/templates/dashboard/index.jinja2

@@ -6,4 +6,8 b''
     <h1 class="page-title">{{ _('Dashboard') }}</h1>
 {% endblock %}
 
-{% block content%}{% endblock %}
+{% block content%}
+    <div class="text-center">
+        <span class="fa fa-cog fa-spin fa-5x m-a-4"></span>
+    </div>
+{% endblock %}

backend/src/appenlight/templates/layout_base.jinja2

@@ -1,6 +1,6 b''
 {% import 'widgets.jinja2' as widgets %}
 <!DOCTYPE html>
-<html  {% block ng_controller %}{% endblock %} {% block ng_app %}data-ng-app="appenlight"{% endblock %}>
+<html  {% block ng_controller %}{% endblock %}>
 <head>
     <title>{% block title %}Application performance, exception and error monitoring for Python,
         Django, Flask and Javascript - AppEnlight{% endblock %}</title>
@@ -22,23 +22,14 b''
 
     {% endblock %}
     {% block additional_styles %}{% endblock %}
-
     <script type="text/javascript">
         var AE = {};
         AE.urls = {{ url_list|tojson|safe }};
         AE.ws_url = '{{ request.registry.settings['cometd.ws_url'] }}';
-        {% if request.user %}
-                AE.user = {{ request.user.get_dict(include_keys=['user_name','id', 'applications', 'assigned_reports', 'latest_events', 'permissions', 'groups'], extended_info=True) |toJSONUnsafe}}
-        {% else %}
-                AE.user = '{"user_name": null, "id": null}';
-        {% endif %}
         AE.flash_messages = {{ flash_msgs|toJSONUnsafe }};
         AE.timeOptions = {{ h.time_options|toJSONUnsafe }};
         AE.plugins = {{ js_plugins|toJSONUnsafe }};
     </script>
-    {% block scripts %}
-        {% block additional_layout_scripts %}{% endblock %}
-    {% endblock %}
     {% if request.registry.settings.get('appenlight.public_api_key') %}
         <script type="application/javascript">
             var initAppEnlight = function () {
@@ -76,7 +67,36 b''
     {% for plugin in js_plugins %}
     <script src="{{ request.static_url('appenlight:webassets/{}/js/{}'.format(plugin['name'], plugin['config']['src']), _query={'rev':js_hash}) }}"></script>
     {% endfor %}
-    <script> kickstartAE(); </script>
+    <script>
+        var xhr = new XMLHttpRequest();
+        xhr.open('GET', AE.urls.userSelf);
+        xhr.onload = function() {
+            if (xhr.status === 200) {
+                kickstartAE(JSON.parse(xhr.responseText));
+                angular.bootstrap(document, ['appenlight']);
+            }
+            else {
+                kickstartAE(null);
+                angular.bootstrap(document, ['appenlight']);
+            }
+        };
+        // do not run angular on register page
+
+        var noAngularRoutes = [
+                AE.urls.otherRoutes.register,
+                AE.urls.otherRoutes.lostPassword,
+            AE.urls.otherRoutes.lostPasswordGenerate,
+        ];
+        shouldRunAngular = true;
+        for (var i=0; i< noAngularRoutes.length; i++){
+            if (window.location.toString().indexOf(noAngularRoutes[i]) !== -1) {
+                shouldRunAngular = false;
+            }
+        }
+        if (shouldRunAngular) {
+            xhr.send();
+        }
+    </script>
 </head>
 <body class="{% block section_name %}{% endblock %} {% raw %}top-state-{{$state.current.name.split('.')[0].replace('.', '-').replace('.', '-')}} state-{{$state.current.name.replace('.', '-').replace('.', '-')}}{% endraw %} {% if request.user %}user-logged {% else %}user-unlogged{% endif %}" id="html_body">
 <div class="extra-deco1"></div>

backend/src/appenlight/templates/tests/styling.jinja2

@@ -1,8 +1,5 b''
 {% extends "/layout.jinja2" %}
 {% from '/reports/reports_small_list_old.jinja2' import render_reports with context %}
-{% block additional_layout_scripts %}
-dojo.require('appenlight.dashboard.index');
-{% endblock %}
 {% block content_class %}{% endblock %}
 {% set layout_disable_menu = True %}
 

backend/src/appenlight/templates/user/lost_password.jinja2

@@ -1,5 +1,4 b''
 {% extends "/layout.jinja2" %}
-{% block ng_app %}{% endblock %}
 {% block content %}
 
 <div class="col-sm-offset-1 col-sm-10">

backend/src/appenlight/templates/user/lost_password_generate.jinja2

@@ -1,5 +1,4 b''
 {% extends "/layout.jinja2" %}
-{% block ng_app %}{% endblock %}
 {% block content %}
 <div class="col-sm-offset-1 col-sm-10">
 

backend/src/appenlight/templates/user/register.jinja2

@@ -1,5 +1,4 b''
 {% extends "/layout.jinja2" %}
-{% block ng_app %}{% endblock %}
 {% block ng_controller %} data-ng-controller="RegisterController as
     register" {% endblock %}
 {% block content_class %}two-col equal{% endblock %}

backend/src/appenlight/views/user.py

@@ -181,9 +181,10 b' def users_self(request):'
             request.session.flash(_('Your profile got updated.'))
         else:
             return HTTPUnprocessableEntity(body=form.errors_json)
-    return request.user.get_dict(exclude_keys=['security_code_date', 'notes',
-                                               'security_code',
-                                               'user_password'])
+    return request.user.get_dict(
+        exclude_keys=['security_code_date', 'notes', 'security_code',
+                      'user_password'],
+        extended_info=True)
 
 
 @view_config(route_name='users_self_property',
@@ -440,7 +441,7 b' def alert_channel_DELETE(request):'
     channel = None
     for chan in user.alert_channels:
         if (chan.channel_name == request.params.get('channel_name') and
-                chan.channel_value == request.params.get('channel_value')):
+                    chan.channel_value == request.params.get('channel_value')):
             channel = chan
             break
     if channel:

frontend/src/app.js

@@ -74,7 +74,6 b" angular.module('appenlight.plugins', pluginsToLoad);"
 var app = angular.module('appenlight', [
     'appenlight.base',
     'appenlight.config',
-    'appenlight.user',
     'appenlight.templates',
     'appenlight.filters',
     'appenlight.services',
@@ -83,10 +82,8 b" var app = angular.module('appenlight', ["
     'appenlight.plugins'
 ]);
 
-function kickstartAE() {
-
-
-
+// needs manual execution because of plugin files
+function kickstartAE(initialUserData) {
     app.config(['$httpProvider', '$uibTooltipProvider', '$locationProvider', function ($httpProvider, $uibTooltipProvider, $locationProvider) {
         $locationProvider.html5Mode(true);
         $httpProvider.interceptors.push(['$q', '$rootScope', '$timeout', 'stateHolder', function ($q, $rootScope, $timeout, stateHolder) {
@@ -138,14 +135,14 b' function kickstartAE() {'
         });
     });
 
-    app.run(['$rootScope', '$timeout', 'stateHolder', '$state', '$location', '$transitions', '$window', 'AeConfig', 'AeUser',
-        function ($rootScope, $timeout, stateHolder, $state, $location, $transitions, $window, AeConfig, AeUser) {
+    app.run(['$rootScope', '$timeout', 'stateHolder', '$state', '$location', '$transitions', '$window', 'AeConfig',
+        function ($rootScope, $timeout, stateHolder, $state, $location, $transitions, $window, AeConfig) {
+            stateHolder.AeUser = buildUser(initialUserData || {"user_name": null, "id": null});
             $rootScope.$state = $state;
             $rootScope.stateHolder = stateHolder;
             $rootScope.flash = stateHolder.flashMessages.list;
             $rootScope.closeAlert = stateHolder.flashMessages.closeAlert;
             $rootScope.AeConfig = AeConfig;
-            $rootScope.AeUser = AeUser;
 
             var transitionApp = function($transition$, $state) {
                 // redirect user to /register unless its one of open views
@@ -172,14 +169,22 b' function kickstartAE() {'
                         isOpenView = true;
                     }
                 });
-                if (AeUser.id === null && !isGuestState && !isOpenView) {
+                if (stateHolder.AeUser.id === null && !isGuestState && !isOpenView) {
                     if (window.location.toString().indexOf(AeConfig.urls.otherRoutes.register) === -1) {
                         console.log('redirect to register');
-                        $window.location = AeConfig.urls.otherRoutes.register + '?came_from=' + encodeURIComponent(window.location);
+                        var newLocation = AeConfig.urls.otherRoutes.register + '?came_from=' + encodeURIComponent(window.location);
+                        // fix infinite digest here
+                        $rootScope.$on('$locationChangeStart',
+                            function(event, toState, toParams, fromState, fromParams, options){
+                                event.preventDefault();
+                                $window.location = newLocation;
+                            });
+                        $window.location = newLocation;
                         return false;
                     }
                     return false;
                 }
+                return true;
             };
             $transitions.onBefore({}, transitionApp);
 

frontend/src/controllers/applications/applications_create.js

@@ -20,9 +20,9 b''
 angular.module('appenlight.controllers')
     .controller('ApplicationsUpdateController', ApplicationsUpdateController)
 
-ApplicationsUpdateController.$inject = ['$state', 'applicationsNoIdResource', 'applicationsResource', 'applicationsPropertyResource', 'AeUser'];
+ApplicationsUpdateController.$inject = ['$state', 'applicationsNoIdResource', 'applicationsResource', 'applicationsPropertyResource', 'stateHolder'];
 
-function ApplicationsUpdateController($state, applicationsNoIdResource, applicationsResource, applicationsPropertyResource, AeUser) {
+function ApplicationsUpdateController($state, applicationsNoIdResource, applicationsResource, applicationsPropertyResource, stateHolder) {
     'use strict';
     console.debug('ApplicationsUpdateController');
     var vm = this;
@@ -68,9 +68,7 b' function ApplicationsUpdateController($state, applicationsNoIdResource, applicat'
         vm.loading.application = true;
         if (vm.resource.resource_id === null) {
             applicationsNoIdResource.save(null, vm.resource, function (data) {
-                console.log('apps',AeUser.applications);
-                AeUser.addApplication(data);
-                console.log('apps',AeUser.applications);
+                stateHolder.AeUser.addApplication(data);
                 $state.go('applications.update', {resourceId: data.resource_id});
                 setServerValidation(vm.BasicForm);
             }, function (response) {
@@ -137,9 +135,7 b' function ApplicationsUpdateController($state, applicationsNoIdResource, applicat'
                 key: 'delete_resource'
             }, vm.formDeleteModel,
             function (data) {
-                console.log('apps',AeUser.applications);
-                AeUser.removeApplicationById(vm.resource.resource_id);
-                console.log('apps',AeUser.applications);
+                stateHolder.AeUser.removeApplicationById(vm.resource.resource_id);
                 $state.go('applications.list');
             },
             function (response) {

frontend/src/controllers/front_dashboard.js

@@ -20,9 +20,9 b''
 angular.module('appenlight.controllers')
     .controller('IndexDashboardController', IndexDashboardController);
 
-IndexDashboardController.$inject = ['$scope', '$location','$cookies', '$interval', 'stateHolder', 'userSelfPropertyResource', 'applicationsPropertyResource', 'AeConfig', 'AeUser'];
+IndexDashboardController.$inject = ['$scope', '$location','$cookies', '$interval', 'stateHolder', 'userSelfPropertyResource', 'applicationsPropertyResource', 'AeConfig'];
 
-function IndexDashboardController($scope, $location, $cookies, $interval, stateHolder, userSelfPropertyResource, applicationsPropertyResource, AeConfig, AeUser) {
+function IndexDashboardController($scope, $location, $cookies, $interval, stateHolder, userSelfPropertyResource, applicationsPropertyResource, AeConfig) {
     var vm = this;
     stateHolder.section = 'dashboard';
     vm.timeOptions = {};
@@ -33,7 +33,7 b' function IndexDashboardController($scope, $location, $cookies, $interval, stateH'
         }
     });
     vm.urls = AeConfig.urls;
-    vm.applications = AeUser.applications_map;
+    vm.applications = stateHolder.AeUser.applications_map;
     vm.show_dashboard = false;
     vm.resource = null;
     vm.graphType = {selected: null};
@@ -427,7 +427,7 b' function IndexDashboardController($scope, $location, $cookies, $interval, stateH'
     });
 
     vm.determineStartState = function () {
-        if (AeUser.applications.length) {
+        if (stateHolder.AeUser.applications.length) {
             vm.resource = Number($location.search().resource);
 
             if (!vm.resource){
@@ -438,7 +438,7 b' function IndexDashboardController($scope, $location, $cookies, $interval, stateH'
                     vm.resource = cookieResource;
                 }
                 else{
-                    vm.resource = AeUser.applications[0].resource_id;
+                    vm.resource = stateHolder.AeUser.applications[0].resource_id;
                 }
             }
         }
@@ -682,7 +682,7 b' function IndexDashboardController($scope, $location, $cookies, $interval, stateH'
         ;
     }
 
-    if (AeUser.applications.length){
+    if (stateHolder.AeUser.applications.length){
         vm.show_dashboard = true;
         vm.determineStartState();
         vm.refreshData();

frontend/src/controllers/header.js

@@ -20,13 +20,13 b''
 angular.module('appenlight.controllers')
     .controller('HeaderCtrl', HeaderCtrl);
 
-HeaderCtrl.$inject = ['$state', 'stateHolder', 'AeUser'];
+HeaderCtrl.$inject = ['$state', 'stateHolder'];
 
-function HeaderCtrl($state, stateHolder, AeUser) {
+function HeaderCtrl($state, stateHolder) {
     var vm = this;
     vm.stateHolder = stateHolder;
-    vm.assignedReports = AeUser.assigned_reports;
-    vm.latestEvents = AeUser.latest_events;
+    vm.assignedReports = stateHolder.AeUser.assigned_reports;
+    vm.latestEvents = stateHolder.AeUser.latest_events;
     vm.activeEvents = 0;
     _.each(vm.latestEvents, function (event) {
         if (event.status === 1 && event.end_date === null) {

frontend/src/controllers/logs.js

@@ -19,9 +19,9 b''
 
 angular.module('appenlight.controllers').controller('LogsController', LogsController);
 
-LogsController.$inject = ['$scope', '$location', 'stateHolder', 'typeAheadTagHelper', 'logsNoIdResource', 'sectionViewResource', 'AeUser'];
+LogsController.$inject = ['$scope', '$location', 'stateHolder', 'typeAheadTagHelper', 'logsNoIdResource', 'sectionViewResource'];
 
-function LogsController($scope, $location, stateHolder, typeAheadTagHelper, logsNoIdResource, sectionViewResource, AeUser) {
+function LogsController($scope, $location, stateHolder, typeAheadTagHelper, logsNoIdResource, sectionViewResource) {
     var vm = this;
     vm.logEventsChartConfig = {
         data: {
@@ -83,7 +83,7 b' function LogsController($scope, $location, stateHolder, typeAheadTagHelper, logs'
     };
     vm.today();
 
-    vm.applications = AeUser.applications_map;
+    vm.applications = stateHolder.AeUser.applications_map;
     vm.logsPage = [];
     vm.itemCount = 0;
     vm.itemsPerPage = 250;

frontend/src/controllers/reports/list.js

@@ -21,12 +21,12 b" angular.module('appenlight.controllers')"
     .controller('ReportsListController', ReportsListController);
 
 ReportsListController.$inject = ['$scope', '$location', '$cookies',
-    'stateHolder', 'typeAheadTagHelper', 'reportsResource', 'AeUser'];
+    'stateHolder', 'typeAheadTagHelper', 'reportsResource'];
 
 function ReportsListController($scope, $location, $cookies, stateHolder,
-                               typeAheadTagHelper, reportsResource, AeUser) {
+                               typeAheadTagHelper, reportsResource) {
     var vm = this;
-    vm.applications = AeUser.applications_map;
+    vm.applications = stateHolder.AeUser.applications_map;
     stateHolder.section = 'reports';
     vm.today = function () {
         vm.pickerDate = new Date();
@@ -184,7 +184,7 b' function ReportsListController($scope, $location, $cookies, stateHolder,'
             tag: 'Status ' + status.toUpperCase()
         });
     });
-    _.each(AeUser.applications, function (item) {
+    _.each(stateHolder.AeUser.applications, function (item) {
         vm.filterTypeAheadOptions.push({
             type: 'resource',
             text: 'resource:' + item.resource_id + ':' + item.resource_name,

frontend/src/controllers/reports/list_slow.js

@@ -25,11 +25,11 b" angular.module('appenlight.controllers')"
     .controller('ReportsListSlowController', ReportsListSlowController);
 
 ReportsListSlowController.$inject = ['$scope', '$location', '$cookies',
-    'stateHolder', 'typeAheadTagHelper', 'slowReportsResource', 'AeUser']
+    'stateHolder', 'typeAheadTagHelper', 'slowReportsResource']
 
-function ReportsListSlowController($scope, $location, $cookies, stateHolder, typeAheadTagHelper, slowReportsResource, AeUser) {
+function ReportsListSlowController($scope, $location, $cookies, stateHolder, typeAheadTagHelper, slowReportsResource) {
     var vm = this;
-    vm.applications = AeUser.applications_map;
+    vm.applications = stateHolder.AeUser.applications_map;
     stateHolder.section = 'slow_reports';
     vm.today = function () {
         vm.pickerDate = new Date();
@@ -167,7 +167,7 b' function ReportsListSlowController($scope, $location, $cookies, stateHolder, typ'
             tag: 'Status ' + status.toUpperCase()
         });
     });
-    _.each(AeUser.applications, function (item) {
+    _.each(stateHolder.AeUser.applications, function (item) {
         vm.filterTypeAheadOptions.push({
             type: 'resource',
             text: 'resource:' + item.resource_id + ':' + item.resource_name,

frontend/src/controllers/reports/view.js

@@ -20,9 +20,9 b''
 angular.module('appenlight.controllers').controller('ReportsViewController', ReportsViewController);
 ReportsViewController.$inject = ['$window', '$location', '$state', '$uibModal',
     '$cookies', 'reportGroupPropertyResource', 'reportGroupResource',
-    'logsNoIdResource', 'AeUser'];
+    'logsNoIdResource', 'stateHolder'];
 
-function ReportsViewController($window, $location, $state, $uibModal, $cookies, reportGroupPropertyResource, reportGroupResource, logsNoIdResource, AeUser) {
+function ReportsViewController($window, $location, $state, $uibModal, $cookies, reportGroupPropertyResource, reportGroupResource, logsNoIdResource, stateHolder) {
     var vm = this;
     vm.window = $window;
     vm.reportHistoryConfig = {
@@ -202,7 +202,7 b' function ReportsViewController($window, $location, $state, $uibModal, $cookies, '
                 vm.rawTraceback += '    ' + frame.cline + "\r\n";
             });
 
-            if (AeUser.id){
+            if (stateHolder.AeUser.id){
                 vm.fetchHistory();
             }
 

frontend/src/services/state_holder.js

@@ -86,6 +86,7 b" angular.module('appenlight.services.stateHolder', []).factory('stateHolder', ['$"
         resource: null,
         plugins: Plugins,
         flashMessages: flashMessages,
+        AeUser: {"user_name": null, "id": null}
     };
     return stateHolder;
 }]);

frontend/src/templates/dashboard.html

@@ -14,20 +14,20 b''
 <div class="row">
     <div class="col-sm-12 dashboard" id="content">
 
-        <div ng-if="!AeUser.applications.length">
+        <div ng-if="!stateHolder.AeUser.applications.length">
 
             <div ng-include="'templates/quickstart.html'"></div>
 
         </div>
 
-        <div ng-if="AeUser.applications.length">
+        <div ng-if="stateHolder.AeUser.applications.length">
 
             <div class="row">
                 <div class="col-sm-6">
                     <div class="panel panel-default">
                         <div class="panel-body">
                             <form class="graph-type form-inline">
-                                <select ng-model="index.resource" ng-options="r.resource_id as r.resource_name for r in AeUser.applications" ng-change="index.updateSearchParams()"
+                                <select ng-model="index.resource" ng-options="r.resource_id as r.resource_name for r in stateHolder.AeUser.applications" ng-change="index.updateSearchParams()"
                                         class="SelectField form-control input-sm slim-input"></select>
 
                                 <select class="SelectField form-control input-sm slim-input" ng-model="index.timeSpan"

frontend/src/templates/reports/view.html

@@ -94,7 +94,7 b''
 
 <div ng-if="report.report !== null && !report.is_loading.report">
 
-    <div ng-if="AeUser.id" class="row">
+    <div ng-if="stateHolder.AeUser.id" class="row">
       <div class="col-lg-12">
         <a onclick="window.history.back()" class="btn btn-default" ng-if="report.window.history.length > 2"><span class="fa fa-arrow-circle-o-left"></span>
             Go back</a>

frontend/src/user.js

@@ -17,21 +17,17 b''
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
-var aeuser = angular.module('appenlight.user', []);
-aeuser.factory('AeUser', ['AeConfig', function () {
-    var decodedAeUser = decodeEncodedJSON(window.AE.user);
-    console.log('decodedAeUser', decodedAeUser);
+function buildUser(jsonData){
     var AeUser = {
-        user_name: decodedAeUser.user_name || null,
-        id: decodedAeUser.id,
-        assigned_reports: decodedAeUser.assigned_reports || null,
-        latest_events: decodedAeUser.latest_events || null,
-        permissions: decodedAeUser.permissions || null,
-        groups: decodedAeUser.groups || null,
+        user_name: jsonData.user_name || null,
+        id: jsonData.id,
+        assigned_reports: jsonData.assigned_reports || null,
+        latest_events: jsonData.latest_events || null,
+        permissions: jsonData.permissions || null,
+        groups: jsonData.groups || null,
         applications: [],
         dashboards: []
     };
-    console.log('AeUser', AeUser);
     AeUser.applications_map = {};
     AeUser.dashboards_map = {};
     AeUser.addApplication = function (item) {
@@ -80,12 +76,11 b" aeuser.factory('AeUser', ['AeConfig', function () {"
         return hasPerm;
     };
 
-    _.each(decodedAeUser.applications, function (item) {
+    _.each(jsonData.applications, function (item) {
         AeUser.addApplication(item);
     });
-    _.each(decodedAeUser.dashboards, function (item) {
+    _.each(jsonData.dashboards, function (item) {
         AeUser.addDashboard(item);
     });
-
     return AeUser;
-}]);
+}