Skip to content

Commit

Permalink
BAH-3971 | Add. Context Between Logout and Re-Login for All Bahmni Mo…
Browse files Browse the repository at this point in the history 
…dules (#984)

* [Rahul] | BAH-3971 | Add. Context Between Logout and Re-Login for All Bahmni Modules

* [Rahul] | BAH-3971 | Add. Re-Login Context for Home, Orders, Reg
  • Loading branch information
@rahu1ramesh
rahu1ramesh authored Jul 19, 2024
1 parent d3f75d8 commit 08763be
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 16 deletions.
2 changes: 1 addition & 1 deletion ui/app/admin/initialization.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ angular.module('bahmni.admin')
var configNames = ['quickLogoutComboKey', 'contextCookieExpirationTimeInMinutes'];
return configurations.load(configNames).then(function () {
$rootScope.quickLogoutComboKey = configurations.quickLogoutComboKey() || 'Escape';
$rootScope.cookieExpiryTime = configurations.contextCookieExpirationTimeInMinutes() || 30;
$rootScope.cookieExpiryTime = configurations.contextCookieExpirationTimeInMinutes() || 0;
});
};

Expand Down
2 changes: 1 addition & 1 deletion ui/app/adt/initialization.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ angular.module('bahmni.adt').factory('initialization', ['$rootScope', '$q', 'app
$rootScope.relationshipTypeMap = configurations.relationshipTypeMap();
$rootScope.diagnosisStatus = (appService.getAppDescriptor().getConfig("diagnosisStatus") && appService.getAppDescriptor().getConfig("diagnosisStatus").value || "RULED OUT");
$rootScope.quickLogoutComboKey = configurations.quickLogoutComboKey() || 'Escape';
$rootScope.cookieExpiryTime = configurations.contextCookieExpirationTimeInMinutes() || 30;
$rootScope.cookieExpiryTime = configurations.contextCookieExpirationTimeInMinutes() || 0;
config.resolve();
});
return config.promise;
Expand Down
2 changes: 1 addition & 1 deletion ui/app/bedmanagement/initialization.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ angular.module('bahmni.ipd').factory('initialization', ['$rootScope', '$q', '$ba
$rootScope.relationshipTypeMap = configurations.relationshipTypeMap();
$rootScope.diagnosisStatus = ((appService.getAppDescriptor().getConfig("diagnosisStatus") && appService.getAppDescriptor().getConfig("diagnosisStatus").value) || "RULED OUT");
$rootScope.quickLogoutComboKey = configurations.quickLogoutComboKey() || 'Escape';
$rootScope.cookieExpiryTime = configurations.contextCookieExpirationTimeInMinutes() || 30;
$rootScope.cookieExpiryTime = configurations.contextCookieExpirationTimeInMinutes() || 0;
config.resolve();
});
return config.promise;
Expand Down
2 changes: 1 addition & 1 deletion ui/app/clinical/initialization.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ angular.module('bahmni.clinical').factory('initialization',
$rootScope.diagnosisStatus = (appService.getAppDescriptor().getConfig("diagnosisStatus") && appService.getAppDescriptor().getConfig("diagnosisStatus").value || "RULED OUT");
$rootScope.prescriptionEmailToggle = configurations.prescriptionEmailToggle();
$rootScope.quickLogoutComboKey = configurations.quickLogoutComboKey() || 'Escape';
$rootScope.cookieExpiryTime = configurations.contextCookieExpirationTimeInMinutes() || 30;
$rootScope.cookieExpiryTime = configurations.contextCookieExpirationTimeInMinutes() || 0;
});
};

Expand Down
12 changes: 6 additions & 6 deletions ui/app/common/auth/authentication.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,11 @@ angular.module('authentication')
var self = this;

var destroySessionFromServer = function () {
var currentTime = new Date();
var expiryTime = new Date(currentTime.getTime() + $rootScope.cookieExpiryTime * 60000);
if ($window.location.hash.includes("careViewDashboard") || $window.location.hash.includes("ipd")) {
$bahmniCookieStore.put($rootScope.currentProvider.uuid, $window.location.pathname + $window.location.hash, {path: '/', expires: expiryTime});
if ($rootScope.cookieExpiryTime && $rootScope.cookieExpiryTime > 0) {
var currentTime = new Date();
var expiryTime = new Date(currentTime.getTime() + $rootScope.cookieExpiryTime * 60000);
var params = (decodeURIComponent($window.location.search.substring(1)));
$bahmniCookieStore.put($rootScope.currentProvider.uuid, $window.location.pathname + (params ? '?' + params : '') + $window.location.hash, {path: '/', expires: expiryTime});
}
return $http.delete(sessionResourcePath);
};
Expand Down Expand Up @@ -139,8 +140,7 @@ angular.module('authentication')
userService.getProviderForUser(data.results[0].uuid).then(function (providers) {
if (!_.isEmpty(providers.results) && hasAnyActiveProvider(providers.results)) {
$rootScope.currentUser = new Bahmni.Auth.User(data.results[0]);
$rootScope.currentUser.provider = providers.results[0];
$rootScope.currentUser.currentLocation = null;
$rootScope.currentUser.currentLocation = $bahmniCookieStore.get(Bahmni.Common.Constants.locationCookieName).name;
$rootScope.$broadcast('event:user-credentialsLoaded', data.results[0]);
deferrable.resolve(data.results[0]);
} else {
Expand Down
2 changes: 1 addition & 1 deletion ui/app/document-upload/initialization.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ angular.module('opd.documentupload').factory('initialization',
return configurations.load(configNames).then(function () {
$rootScope.genderMap = configurations.genderMap();
$rootScope.quickLogoutComboKey = configurations.quickLogoutComboKey() || 'Escape';
$rootScope.cookieExpiryTime = configurations.contextCookieExpirationTimeInMinutes() || 30;
$rootScope.cookieExpiryTime = configurations.contextCookieExpirationTimeInMinutes() || 0;
});
};

Expand Down
3 changes: 2 additions & 1 deletion ui/app/home/initialization.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ angular.module('bahmni.home')
.factory('initialization', ['$rootScope', 'appService', 'spinner', 'configurationService',
function ($rootScope, appService, spinner, configurationService) {
var getConfigs = function () {
configurationService.getConfigurations(['quickLogoutComboKey']).then(function (response) {
configurationService.getConfigurations(['quickLogoutComboKey', 'contextCookieExpirationTimeInMinutes']).then(function (response) {
$rootScope.quickLogoutComboKey = response.quickLogoutComboKey || 'Escape';
$rootScope.cookieExpiryTime = response.contextCookieExpirationTimeInMinutes || 0;
});
};
var initApp = function () {
Expand Down
3 changes: 2 additions & 1 deletion ui/app/orders/initialization.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ angular.module('bahmni.orders')
function ($rootScope, $q, appService, spinner, configurations, orderTypeService, locationService) {
var getConfigs = function () {
var config = $q.defer();
var configNames = ['encounterConfig', 'patientConfig', 'genderMap', 'relationshipTypeMap', 'quickLogoutComboKey'];
var configNames = ['encounterConfig', 'patientConfig', 'genderMap', 'relationshipTypeMap', 'quickLogoutComboKey', 'contextCookieExpirationTimeInMinutes'];
configurations.load(configNames).then(function () {
var conceptConfig = appService.getAppDescriptor().getConfigValue("conceptSetUI");
var customLocationTags = _.get(conceptConfig, 'facilityLocationTags');
Expand All @@ -18,6 +18,7 @@ angular.module('bahmni.orders')
$rootScope.genderMap = configurations.genderMap();
$rootScope.relationshipTypeMap = configurations.relationshipTypeMap();
$rootScope.quickLogoutComboKey = configurations.quickLogoutComboKey() || 'Escape';
$rootScope.cookieExpiryTime = configurations.contextCookieExpirationTimeInMinutes() || 0;
config.resolve();
});
return config.promise;
Expand Down
2 changes: 1 addition & 1 deletion ui/app/ot/initialization.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ angular.module('bahmni.ot').factory('initialization', ['$rootScope', '$q', 'surg
var configNames = ['quickLogoutComboKey', 'contextCookieExpirationTimeInMinutes'];
return configurations.load(configNames).then(function () {
$rootScope.quickLogoutComboKey = configurations.quickLogoutComboKey() || 'Escape';
$rootScope.cookieExpiryTime = configurations.contextCookieExpirationTimeInMinutes() || 30;
$rootScope.cookieExpiryTime = configurations.contextCookieExpirationTimeInMinutes() || 0;
});
};
var initApp = function () {
Expand Down
3 changes: 2 additions & 1 deletion ui/app/registration/initialization.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ angular.module('bahmni.registration').factory('initialization',
['$rootScope', '$q', 'configurations', 'authenticator', 'appService', 'spinner', 'preferences', 'locationService', 'mergeService', '$translate',
function ($rootScope, $q, configurations, authenticator, appService, spinner, preferences, locationService, mergeService, $translate) {
var getConfigs = function () {
var configNames = ['encounterConfig', 'patientAttributesConfig', 'identifierTypesConfig', 'addressLevels', 'genderMap', 'relationshipTypeConfig', 'relationshipTypeMap', 'loginLocationToVisitTypeMapping', 'helpDeskNumber', 'quickLogoutComboKey'];
var configNames = ['encounterConfig', 'patientAttributesConfig', 'identifierTypesConfig', 'addressLevels', 'genderMap', 'relationshipTypeConfig', 'relationshipTypeMap', 'loginLocationToVisitTypeMapping', 'helpDeskNumber', 'quickLogoutComboKey', 'contextCookieExpirationTimeInMinutes'];
return configurations.load(configNames).then(function () {
var mandatoryPersonAttributes = appService.getAppDescriptor().getConfigValue("mandatoryPersonAttributes");
var patientAttributeTypes = new Bahmni.Common.Domain.AttributeTypeMapper().mapFromOpenmrsAttributeTypes(configurations.patientAttributesConfig(), mandatoryPersonAttributes, {}, $rootScope.currentUser.userProperties.defaultLocale);
Expand All @@ -22,6 +22,7 @@ angular.module('bahmni.registration').factory('initialization',
$rootScope.relationshipTypeMap = configurations.relationshipTypeMap();
$rootScope.relationshipTypes = configurations.relationshipTypes();
$rootScope.quickLogoutComboKey = configurations.quickLogoutComboKey() || 'Escape';
$rootScope.cookieExpiryTime = configurations.contextCookieExpirationTimeInMinutes() || 0;
});
};

Expand Down
2 changes: 1 addition & 1 deletion ui/app/reports/initialization.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ angular.module('bahmni.reports').factory('initialization',
var configNames = ['quickLogoutComboKey', 'contextCookieExpirationTimeInMinutes'];
return configurations.load(configNames).then(function () {
$rootScope.quickLogoutComboKey = configurations.quickLogoutComboKey() || 'Escape';
$rootScope.cookieExpiryTime = configurations.contextCookieExpirationTimeInMinutes() || 30;
$rootScope.cookieExpiryTime = configurations.contextCookieExpirationTimeInMinutes() || 0;
});
};
var initApp = function () {
Expand Down

0 comments on commit 08763be

Please sign in to comment.