sanjana
/
device-mgt-core
forked from community/device-mgt-core
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing redirection upon user session expiration issues

Browse Source
revert-70aa11f8
Dileesha Rajapakse 8 years ago
parent eadb7ea02a
commit 6cff453b24
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File

12
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/device.js
Unescape View File

@ -67,7 +67,9 @@ deviceModule = function () {
var carbonUser = session.get(constants["USER_SESSION_KEY"]);
if (!carbonUser) {
log.error("User object was not found in the session");
throw constants["ERRORS"]["USER_NOT_FOUND"];
userModule.logout(function () {
response.sendRedirect(devicemgtProps["appContext"] + "login");
});
}
var userName = carbonUser.username + "@" + carbonUser.domain;
var locationHistory = [];
@ -272,7 +274,9 @@ deviceModule = function () {
);
} else {
log.error("User object was not found in the session");
throw constants["ERRORS"]["USER_NOT_FOUND"];
userModule.logout(function () {
response.sendRedirect(devicemgtProps["appContext"] + "login");
});
}
};
@ -369,7 +373,9 @@ deviceModule = function () {
var carbonUser = session.get(constants["USER_SESSION_KEY"]);
if (!carbonUser) {
log.error("User object was not found in the session");
throw constants["ERRORS"]["USER_NOT_FOUND"];
userModule.logout(function () {
response.sendRedirect(devicemgtProps["appContext"] + "login");
});
}
var userName = carbonUser.username + "@" + carbonUser.domain;
var config = {};

8
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/policy.js
Unescape View File

@ -127,7 +127,9 @@ policyModule = function () {
var carbonUser = session.get(constants["USER_SESSION_KEY"]);
if (!carbonUser) {
log.error("User object was not found in the session");
throw constants["ERRORS"]["USER_NOT_FOUND"];
userModule.logout(function () {
response.sendRedirect(devicemgtProps["appContext"] + "login");
});
}
try {
var url = devicemgtProps["httpsURL"] + devicemgtProps["backendRestEndpoints"]["deviceMgt"] +
@ -145,7 +147,9 @@ policyModule = function () {
var carbonUser = session.get(constants["USER_SESSION_KEY"]);
if (!carbonUser) {
log.error("User object was not found in the session");
throw constants["ERRORS"]["USER_NOT_FOUND"];
userModule.logout(function () {
response.sendRedirect(devicemgtProps["appContext"] + "login");
});
}
try {
var url = devicemgtProps["httpsURL"] + devicemgtProps["backendRestEndpoints"]["deviceMgt"] +

Write Preview
Loading…
Cancel
Save