From 2cd5b63555fbe4c32b6ea99481dcf575874d6180 Mon Sep 17 00:00:00 2001 From: diachedelic Date: Mon, 4 Nov 2013 14:37:22 +1100 Subject: [PATCH] Mocked user is regenerated for each call, fixes user lockout on client Belle --- .../src/common/mocks/resources/user.mocks.js | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/user.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/user.mocks.js index ca28c2dc0d..00ae4450db 100644 --- a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/user.mocks.js +++ b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/user.mocks.js @@ -1,15 +1,18 @@ angular.module('umbraco.mocks'). factory('userMocks', ['$httpBackend', 'mocksUtils', function ($httpBackend, mocksUtils) { 'use strict'; - - var mocked = { - name: "Per Ploug", - email: "test@test.com", - emailHash: "f9879d71855b5ff21e4963273a886bfc", - id: 0, - locale: 'da-DK', - remainingAuthSeconds: 600 - }; + + function generateMockedUser() { + // Ensure a new user object each call + return { + name: "Per Ploug", + email: "test@test.com", + emailHash: "f9879d71855b5ff21e4963273a886bfc", + id: 0, + locale: 'da-DK', + remainingAuthSeconds: 600 + }; + } function isAuthenticated() { //check for existence of a cookie so we can do login/logout in the belle app (ignore for tests). @@ -26,7 +29,7 @@ angular.module('umbraco.mocks'). return [401, null, null]; } else { - return [200, mocked, null]; + return [200, generateMockedUser(), null]; } } @@ -44,7 +47,7 @@ angular.module('umbraco.mocks'). //set the cookie for loging mocksUtils.setAuth(); - return [200, mocked, null]; + return [200, generateMockedUser(), null]; } function logout() {