artin/community-app
1
0
Fork 0
mirror of https://github.com/openMF/community-app.git synced 2026-02-06 11:26:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1412 from rajuan/MIFOSX-1746

Browse Source 
MIFOSX-1746 : Community-app changes to be able to support Oauth2, con…
This commit is contained in:
Vishwas Babu A J 2015-09-09 13:03:54 +05:30
commit e9f95a7f64
6 changed files with 82 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/scripts/modules/configurations.js
View File

@ -2,4 +2,6 @@ angular.module('configurations', [])
.constant('API_VERSION', '/mifosng-provider/api/v1')
.constant('IDLE_DURATION', 30 * 60)
.constant('WARN_DURATION', 10)
.constant('KEEPALIVE_INTERVAL', 15 * 60);
.constant('KEEPALIVE_INTERVAL', 15 * 60)
.constant('SECURITY', 'basicauth');
// Use SECURITY constant as 'oauth' to enable Oauth2 on community app

49
app/scripts/services/AuthenticationService.js
View File

@ -1,6 +1,6 @@
(function (module) {
mifosX.services = _.extend(module, {
AuthenticationService: function (scope, httpService, localStorageService) {
AuthenticationService: function (scope, httpService, SECURITY, localStorageService,timeout, webStorage) {
var onSuccess = function (data) {
scope.$broadcast("UserAuthenticationSuccessEvent", data);
localStorageService.addToLocalStorage('userData', data);
@ -12,15 +12,54 @@
var apiVer = '/mifosng-provider/api/v1';
this.authenticateWithUsernamePassword = function (credentials) {
scope.$broadcast("UserAuthenticationStartEvent");
httpService.post(apiVer + "/authentication?username=" + credentials.username + "&password=" + credentials.password)
var getUserDetails = function(data){
localStorageService.addToLocalStorage('tokendetails', data);
setTimer(data.expires_in);
httpService.get( apiVer + "/userdetails?access_token=" + data.access_token)
.success(onSuccess)
.error(onFailure);
}
var updateAccessDetails = function(data){
var sessionData = webStorage.get('sessionData');
sessionData.authenticationKey = data.access_token;
webStorage.add("sessionData",sessionData);
localStorageService.addToLocalStorage('tokendetails', data);
var userDate = localStorageService.getFromLocalStorage("userData");
userDate.accessToken = data.access_token;
localStorageService.addToLocalStorage('userData', userDate);
httpService.setAuthorization(data.access_token);
setTimer(data.expires_in);
}
var setTimer = function(time){
timeout(getAccessToken, time * 1000);
}
var getAccessToken = function(){
var refreshToken = localStorageService.getFromLocalStorage("tokendetails").refresh_token;
httpService.cancelAuthorization();
httpService.post( "/mifosng-provider/api/oauth/token?&client_id=community-app&grant_type=refresh_token&client_secret=123&refresh_token=" + refreshToken)
.success(updateAccessDetails);
}
this.authenticateWithUsernamePassword = function (credentials) {
scope.$broadcast("UserAuthenticationStartEvent");
if(SECURITY === 'oauth'){
httpService.post( "/mifosng-provider/api/oauth/token?username=" + credentials.username + "&password=" + credentials.password +"&client_id=community-app&grant_type=password&client_secret=123")
.success(getUserDetails)
.error(onFailure);
} else {
httpService.post(apiVer + "/authentication?username=" + credentials.username + "&password=" + credentials.password)
.success(onSuccess)
.error(onFailure);
}
};
}
});
mifosX.ng.services.service('AuthenticationService', ['$rootScope', 'HttpService', 'localStorageService', mifosX.services.AuthenticationService]).run(function ($log) {
mifosX.ng.services.service('AuthenticationService', ['$rootScope', 'HttpService', 'SECURITY', 'localStorageService','$timeout','webStorage', mifosX.services.AuthenticationService]).run(function ($log) {
$log.info("AuthenticationService initialized");
});
}(mifosX.services || {}));

12
app/scripts/services/HttpServiceProvider.js
View File

@ -39,8 +39,12 @@
return http(config);
};
});
this.setAuthorization = function (key) {
http.defaults.headers.common.Authorization = "Basic " + key;
this.setAuthorization = function (key, isOauth) {
if(isOauth){
http.defaults.headers.common.Authorization = "bearer " + key;
} else {
http.defaults.headers.common.Authorization = "Basic " + key;
}
};
this.cancelAuthorization = function () {
@ -54,6 +58,6 @@
mifosX.ng.services.config(function ($provide) {
$provide.provider('HttpService', mifosX.services.HttpServiceProvider);
}).run(function ($log) {
$log.info("HttpService initialized");
});
$log.info("HttpService initialized");
});
}(mifosX.services || {}));

29
app/scripts/services/SessionManager.js
View File

@ -1,14 +1,28 @@
(function (module) {
mifosX.services = _.extend(module, {
SessionManager: function (webStorage, httpService, resourceFactory) {
SessionManager: function (webStorage, httpService, SECURITY, resourceFactory, localStorageService) {
var EMPTY_SESSION = {};
this.get = function (data) {
var isOauth = SECURITY === 'oauth';
var accessToken = null;
if(isOauth){
accessToken = localStorageService.getFromLocalStorage("tokendetails").access_token;
}
if (data.shouldRenewPassword) {
httpService.setAuthorization(data.base64EncodedAuthenticationKey);
} else{
webStorage.add("sessionData", {userId: data.userId, authenticationKey: data.base64EncodedAuthenticationKey, userPermissions: data.permissions});
httpService.setAuthorization(data.base64EncodedAuthenticationKey);
if(isOauth){
httpService.setAuthorization(data.accessToken);
} else {
httpService.setAuthorization(data.base64EncodedAuthenticationKey);
}
} else {
if(isOauth){
webStorage.add("sessionData", {userId: data.userId, authenticationKey: data.accessToken, userPermissions: data.permissions});
httpService.setAuthorization(data.accessToken, true);
} else {
webStorage.add("sessionData", {userId: data.userId, authenticationKey: data.base64EncodedAuthenticationKey, userPermissions: data.permissions});
httpService.setAuthorization(data.base64EncodedAuthenticationKey, false);
}
return {user: new mifosX.models.LoggedInUser(data)};
};
}
@ -22,7 +36,8 @@
this.restore = function (handler) {
var sessionData = webStorage.get('sessionData');
if (sessionData !== null) {
httpService.setAuthorization(sessionData.authenticationKey);
var isOauth = SECURITY === 'oauth';
httpService.setAuthorization(sessionData.authenticationKey, isOauth);
resourceFactory.userResource.get({userId: sessionData.userId}, function (userData) {
userData.userPermissions = sessionData.userPermissions;
handler({user: new mifosX.models.LoggedInUser(userData)});
@ -36,7 +51,9 @@
mifosX.ng.services.service('SessionManager', [
'webStorage',
'HttpService',
'SECURITY',
'ResourceFactory',
'localStorageService',
mifosX.services.SessionManager
]).run(function ($log) {
$log.info("SessionManager initialized");

2
test/spec/services/AuthenticationServiceSpec.js
View File

@ -14,7 +14,7 @@ describe("AuthenticationService", function () {
});
});
new mifosX.services.AuthenticationService(scope, httpService, localStorageService).authenticateWithUsernamePassword({
new mifosX.services.AuthenticationService(scope, httpService, 'basicauth', localStorageService).authenticateWithUsernamePassword({
username: "test_username",
password: "test_password"
});

6
test/spec/services/SessionManagerSpec.js
View File

@ -10,7 +10,7 @@ describe("SessionManager", function () {
}};
userConstructor = spyOn(mifosX.models, 'LoggedInUser').andReturn({id: "test_user"});
this.sessionManager = new mifosX.services.SessionManager(webStorage, httpService, resourceFactory);
this.sessionManager = new mifosX.services.SessionManager(webStorage, httpService, 'basicauth', resourceFactory);
});
describe("Session restore", function () {
@ -26,7 +26,7 @@ describe("SessionManager", function () {
});
it("should set the http authorization", function () {
expect(httpService.setAuthorization).toHaveBeenCalledWith("test_key");
expect(httpService.setAuthorization).toHaveBeenCalledWith("test_key", false);
});
it("should retrieve the current user", function () {
expect(resourceFactory.userResource.get).toHaveBeenCalledWith({userId: "test_user"}, jasmine.any(Function))
@ -59,7 +59,7 @@ describe("SessionManager", function () {
});
it("should set the http authorization", function () {
expect(httpService.setAuthorization).toHaveBeenCalledWith("test_key");
expect(httpService.setAuthorization).toHaveBeenCalledWith("test_key", false);
});
it("should store the session data", function () {
expect(webStorage.add).toHaveBeenCalledWith("sessionData", {userId: "test_user", authenticationKey: "test_key"});