community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring oauth token handling functions and dependants

Browse Source
This commit is contained in:
dilanua 2016-07-26 17:35:50 +05:30
parent 34edbce1a0
commit d2ec81b12b
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/api-wrapper-util.js
View File

@ -31,7 +31,7 @@ var apiWrapperUtil = function () {
log.error("Could not set up encoded tenant based client credentials " + log.error("Could not set up encoded tenant based client credentials " +
"to session context. No username is found as input."); "to session context. No username is found as input.");
} else { } else {
var dynamicClientCredentials = tokenUtil.getDyanmicClientCredentials(); var dynamicClientCredentials = tokenUtil.getDynamicClientCredentials();
if (!dynamicClientCredentials) { if (!dynamicClientCredentials) {
log.error("Could not set up encoded tenant based client credentials " + log.error("Could not set up encoded tenant based client credentials " +
"to session context as the server is unable to obtain dynamic client credentials."); "to session context as the server is unable to obtain dynamic client credentials.");

12
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/backend-service-invoker.js
View File

@ -43,7 +43,7 @@ var backendServiceInvoker = function () {
privateMethods.getAccessToken = function () { privateMethods.getAccessToken = function () {
var tokenPair = parse(session.get(constants["ACCESS_TOKEN_PAIR_IDENTIFIER"])); var tokenPair = parse(session.get(constants["ACCESS_TOKEN_PAIR_IDENTIFIER"]));
if (tokenPair) { if (tokenPair) {
return tokenPair.accessToken; return tokenPair["accessToken"];
} else { } else {
return null; return null;
} }
@ -78,7 +78,7 @@ var backendServiceInvoker = function () {
}); });
} else { } else {
xmlHttpRequest. xmlHttpRequest.
setRequestHeader(constants["AUTHORIZATION_HEADER"], constants["BEARER_PREFIX"] + accessToken); setRequestHeader(constants["AUTHORIZATION_HEADER"], constants["BEARER_PREFIX"] + accessToken);
} }
} }
@ -307,7 +307,7 @@ var backendServiceInvoker = function () {
publicHTTPClientInvokers.get = function (url, successCallback, errorCallback) { publicHTTPClientInvokers.get = function (url, successCallback, errorCallback) {
var requestPayload = null; var requestPayload = null;
return privateMethods. return privateMethods.
initiateHTTPClientRequest(constants["HTTP_GET"], url, successCallback, errorCallback, requestPayload); initiateHTTPClientRequest(constants["HTTP_GET"], url, successCallback, errorCallback, requestPayload);
}; };
/** /**
@ -319,7 +319,7 @@ var backendServiceInvoker = function () {
*/ */
publicHTTPClientInvokers.post = function (url, payload, successCallback, errorCallback) { publicHTTPClientInvokers.post = function (url, payload, successCallback, errorCallback) {
return privateMethods. return privateMethods.
initiateHTTPClientRequest(constants["HTTP_POST"], url, successCallback, errorCallback, payload); initiateHTTPClientRequest(constants["HTTP_POST"], url, successCallback, errorCallback, payload);
}; };
/** /**
@ -331,7 +331,7 @@ var backendServiceInvoker = function () {
*/ */
publicHTTPClientInvokers.put = function (url, payload, successCallback, errorCallback) { publicHTTPClientInvokers.put = function (url, payload, successCallback, errorCallback) {
return privateMethods. return privateMethods.
initiateHTTPClientRequest(constants["HTTP_PUT"], url, successCallback, errorCallback, payload); initiateHTTPClientRequest(constants["HTTP_PUT"], url, successCallback, errorCallback, payload);
}; };
/** /**
@ -343,7 +343,7 @@ var backendServiceInvoker = function () {
publicHTTPClientInvokers.delete = function (url, successCallback, errorCallback) { publicHTTPClientInvokers.delete = function (url, successCallback, errorCallback) {
var requestPayload = null; var requestPayload = null;
return privateMethods. return privateMethods.
initiateHTTPClientRequest(constants["HTTP_DELETE"], url, successCallback, errorCallback, requestPayload); initiateHTTPClientRequest(constants["HTTP_DELETE"], url, successCallback, errorCallback, requestPayload);
}; };
var publicMethods = {}; var publicMethods = {};

2
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/util.js
View File

@ -27,7 +27,7 @@ var util = function () {
var adminUser = devicemgtProps["adminUser"]; var adminUser = devicemgtProps["adminUser"];
var clientName = devicemgtProps["clientName"]; var clientName = devicemgtProps["clientName"];
module.getDyanmicCredentials = function (owner) { module.getDynamicClientCredentials = function () {
var payload = { var payload = {
"callbackUrl": devicemgtProps.callBackUrl, "callbackUrl": devicemgtProps.callBackUrl,
"clientName": clientName, "clientName": clientName,