Umbraco 7.15.3

WebCms/Umbraco/Js/umbraco.security.js

@@ -130,19 +130,24 @@
                     if (filtered) {
                         return promise;
                     }
-                    //A 401 means that the user is not logged in
-                    if (originalResponse.status === 401 && !originalResponse.config.url.endsWith('umbraco/backoffice/UmbracoApi/Authentication/GetCurrentUser')) {
-                        var userService = $injector.get('userService');
-                        // see above
-                        //Associate the user name with the retry to ensure we retry for the right user
-                        promise = userService.getCurrentUser().then(function (user) {
-                            var userName = user ? user.name : null;
-                            //The request bounced because it was not authorized - add a new request to the retry queue
-                            return queue.pushRetryFn('unauthorized-server', userName, function retryRequest() {
-                                // We must use $injector to get the $http service to prevent circular dependency
-                                return $injector.get('$http')(originalResponse.config);
+                    if (originalResponse.status === 401) {
+                        //A 401 means that the user is not logged in
+                        //avoid an infinite loop
+                        var umbRequestHelper = $injector.get('umbRequestHelper');
+                        var getCurrentUserPath = umbRequestHelper.getApiUrl('authenticationApiBaseUrl', 'GetCurrentUser');
+                        if (!originalResponse.config.url.endsWith(getCurrentUserPath)) {
+                            var userService = $injector.get('userService');
+                            // see above
+                            //Associate the user name with the retry to ensure we retry for the right user
+                            promise = userService.getCurrentUser().then(function (user) {
+                                var userName = user ? user.name : null;
+                                //The request bounced because it was not authorized - add a new request to the retry queue
+                                return queue.pushRetryFn('unauthorized-server', userName, function retryRequest() {
+                                    // We must use $injector to get the $http service to prevent circular dependency
+                                    return $injector.get('$http')(originalResponse.config);
+                                });
                             });
-                        });
+                        }
                     } else if (originalResponse.status === 404) {
                         //a 404 indicates that the request was not found - this could be due to a non existing url, or it could
                         //be due to accessing a url with a parameter that doesn't exist, either way we should notifiy the user about it