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

Updating OAuth UI Module

Browse Source
revert-70aa11f8
dilanua 8 years ago
parent 020f35cb4e
commit bc4192280c
3 changed files with 46 additions and 43 deletions
Show Stats Download Patch File Download Diff File

2
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/user-api.jag
Unescape View File

@ -28,7 +28,7 @@ var userModule = require("/app/modules/user.js").userModule;
var deviceModule = require("/app/modules/device.js").deviceModule; var deviceModule = require("/app/modules/device.js").deviceModule;
var utility = require("/app/modules/utility.js").utility; var utility = require("/app/modules/utility.js").utility;
var apiWrapperUtil = require("/app/modules/oauth/token-handlers.js")["handlers"]; var apiWrapperUtil = require("/app/modules/oauth/token-handlers.js")["handlers"];
var util = require("/app/modules/oauth/util.js").util; var util = require("/app/modules/oauth/token-handler-utils.js")["utils"];
var responseProcessor = require('utils').response; var responseProcessor = require('utils').response;

77
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/oauth/util.js → components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/oauth/token-handler-utils.js
Unescape View File

@ -16,18 +16,18 @@
* under the License. * under the License.
*/ */
var util = function () { var utils = function () {
var log = new Log("/app/modules/oauth/util.js"); var log = new Log("/app/modules/oauth/token-handler-utils.js");
var privateMethods = {}; var deviceMgtProps = require("/app/conf/reader/main.js")["conf"];
var publicMethods = {}; var constants = require("/app/modules/constants.js");
var carbon = require("carbon");
var Base64 = Packages.org.apache.commons.codec.binary.Base64; var Base64 = Packages.org.apache.commons.codec.binary.Base64;
var String = Packages.java.lang.String; var String = Packages.java.lang.String;
var deviceMgtProps = require("/app/conf/reader/main.js")["conf"]; var publicMethods = {};
var constants = require("/app/modules/constants.js"); var privateMethods = {};
var carbon = require("carbon");
publicMethods.encode = function (payload) { publicMethods.encode = function (payload) {
return new String(Base64.encodeBase64(new String(payload).getBytes())); return new String(Base64.encodeBase64(new String(payload).getBytes()));
@ -64,11 +64,11 @@ var util = function () {
dynamicClientAppCredentials["clientId"] = responsePayload["client_id"]; dynamicClientAppCredentials["clientId"] = responsePayload["client_id"];
dynamicClientAppCredentials["clientSecret"] = responsePayload["client_secret"]; dynamicClientAppCredentials["clientSecret"] = responsePayload["client_secret"];
} else if (xhr["status"] == 400) { } else if (xhr["status"] == 400) {
log.error("{/app/modules/oauth/util.js - getDynamicClientAppCredentials()} " + log.error("{/app/modules/oauth/token-handler-utils.js - getDynamicClientAppCredentials()} " +
"Bad request. Invalid data provided as dynamic client application properties."); "Bad request. Invalid data provided as dynamic client application properties.");
dynamicClientAppCredentials = null; dynamicClientAppCredentials = null;
} else { } else {
log.error("{/app/modules/oauth/util.js - getDynamicClientAppCredentials()} " + log.error("{/app/modules/oauth/token-handler-utils.js - getDynamicClientAppCredentials()} " +
"Error in retrieving dynamic client credentials."); "Error in retrieving dynamic client credentials.");
dynamicClientAppCredentials = null; dynamicClientAppCredentials = null;
} }
@ -76,11 +76,11 @@ var util = function () {
return dynamicClientAppCredentials; return dynamicClientAppCredentials;
}; };
publicMethods.getAccessTokenByPasswordGrantType = function (username, password, encodedClientAppCredentials, scopes) { publicMethods.getTokenPairByPasswordGrantType = function (username, password, encodedClientAppCredentials, scopes) {
if (!username || !password || !encodedClientAppCredentials || !scopes) { if (!username || !password || !encodedClientAppCredentials || !scopes) {
log.error("{/app/modules/oauth/util.js} Error in retrieving access token by password " + log.error("{/app/modules/oauth/token-handler-utils.js} Error in retrieving access token by password " +
"grant type. No username, password, encoded client app credentials or scopes are " + "grant type. No username, password, encoded client app credentials or scopes are " +
"found - getAccessTokenByPasswordGrantType(a, b, c, d)"); "found - getTokenPairByPasswordGrantType(a, b, c, d)");
return null; return null;
} else { } else {
// calling oauth provider token service endpoint // calling oauth provider token service endpoint
@ -101,18 +101,18 @@ var util = function () {
tokenPair["refreshToken"] = responsePayload["refresh_token"]; tokenPair["refreshToken"] = responsePayload["refresh_token"];
return tokenPair; return tokenPair;
} else { } else {
log.error("{/app/modules/oauth/util.js} Error in retrieving access token by password " + log.error("{/app/modules/oauth/token-handler-utils.js} Error in retrieving access token " +
"grant type - getAccessTokenByPasswordGrantType(a, b, c, d)"); "by password grant type - getTokenPairByPasswordGrantType(a, b, c, d)");
return null; return null;
} }
} }
}; };
publicMethods.getAccessTokenBySAMLGrantType = function (assertion, encodedClientAppCredentials, scopes) { publicMethods.getTokenPairBySAMLGrantType = function (assertion, encodedClientAppCredentials, scopes) {
if (!assertion || !encodedClientAppCredentials || !scopes) { if (!assertion || !encodedClientAppCredentials || !scopes) {
log.error("{/app/modules/oauth/util.js} Error in retrieving access token by saml " + log.error("{/app/modules/oauth/token-handler-utils.js} Error in retrieving access token by saml " +
"grant type. No assertion, encoded client app credentials or scopes are " + "grant type. No assertion, encoded client app credentials or scopes are " +
"found - getAccessTokenBySAMLGrantType(x, y, z)"); "found - getTokenPairBySAMLGrantType(x, y, z)");
return null; return null;
} else { } else {
var assertionXML = publicMethods.decode(assertion); var assertionXML = publicMethods.decode(assertion);
@ -127,8 +127,8 @@ var util = function () {
var extractedAssertion; var extractedAssertion;
if (assertionStartIndex == -1 || assertionEndIndex == -1) { if (assertionStartIndex == -1 || assertionEndIndex == -1) {
log.error("{/app/modules/oauth/util.js} Error in retrieving access token by saml grant type. " + log.error("{/app/modules/oauth/token-handler-utils.js} Error in retrieving access " +
"Issue in assertion format - getAccessTokenBySAMLGrantType(x, y, z)"); "token by saml grant type. Issue in assertion format - getTokenPairBySAMLGrantType(x, y, z)");
return null; return null;
} else { } else {
extractedAssertion = assertionXML. extractedAssertion = assertionXML.
@ -153,19 +153,19 @@ var util = function () {
tokenPair["refreshToken"] = responsePayload["refresh_token"]; tokenPair["refreshToken"] = responsePayload["refresh_token"];
return tokenPair; return tokenPair;
} else { } else {
log.error("{/app/modules/oauth/util.js} Error in retrieving access token by password " + log.error("{/app/modules/oauth/token-handler-utils.js} Error in retrieving access token " +
"grant type - getAccessTokenBySAMLGrantType(x, y, z)"); "by password grant type - getTokenPairBySAMLGrantType(x, y, z)");
return null; return null;
} }
} }
} }
}; };
publicMethods.getNewAccessTokenByRefreshToken = function (refreshToken, encodedClientAppCredentials, scopes) { publicMethods.getNewTokenPairByRefreshToken = function (refreshToken, encodedClientAppCredentials, scopes) {
if (!refreshToken || !encodedClientAppCredentials) { if (!refreshToken || !encodedClientAppCredentials) {
log.error("{/app/modules/oauth/util.js} Error in retrieving new access token by current " + log.error("{/app/modules/oauth/token-handler-utils.js} Error in retrieving new access token " +
"refresh token. No refresh token or encoded client app credentials are " + "by current refresh token. No refresh token or encoded client app credentials are " +
"found - getNewAccessTokenByRefreshToken(x, y, z)"); "found - getNewTokenPairByRefreshToken(x, y, z)");
return null; return null;
} else { } else {
var requestURL = deviceMgtProps["oauthProvider"]["tokenServiceURL"]; var requestURL = deviceMgtProps["oauthProvider"]["tokenServiceURL"];
@ -187,8 +187,8 @@ var util = function () {
tokenPair["refreshToken"] = responsePayload["refresh_token"]; tokenPair["refreshToken"] = responsePayload["refresh_token"];
return tokenPair; return tokenPair;
} else { } else {
log.error("{/app/modules/oauth/util.js} Error in retrieving new access token by " + log.error("{/app/modules/oauth/token-handler-utils.js} Error in retrieving new access token by " +
"current refresh token - getNewAccessTokenByRefreshToken(x, y, z)"); "current refresh token - getNewTokenPairByRefreshToken(x, y, z)");
return null; return null;
} }
} }
@ -196,8 +196,9 @@ var util = function () {
publicMethods.getAccessTokenByJWTGrantType = function (clientAppCredentials) { publicMethods.getAccessTokenByJWTGrantType = function (clientAppCredentials) {
if (!clientAppCredentials) { if (!clientAppCredentials) {
log.error("{/app/modules/oauth/util.js} Error in retrieving new access token by current refresh token. " + log.error("{/app/modules/oauth/token-handler-utils.js} Error in retrieving new access token " +
"No client app credentials are found as input - getAccessTokenByJWTGrantType(x)"); "by current refresh token. No client app credentials are found " +
"as input - getAccessTokenByJWTGrantType(x)");
return null; return null;
} else { } else {
var JWTClientManagerServicePackagePath = var JWTClientManagerServicePackagePath =
@ -212,15 +213,16 @@ var util = function () {
publicMethods.getTenantBasedClientAppCredentials = function (username, jwtToken) { publicMethods.getTenantBasedClientAppCredentials = function (username, jwtToken) {
if (!username || !jwtToken) { if (!username || !jwtToken) {
log.error("{/app/modules/oauth/util.js} Error in retrieving tenant based client app " + log.error("{/app/modules/oauth/token-handler-utils.js} Error in retrieving tenant " +
"credentials. No username or jwt token is found as input - getTenantBasedClientAppCredentials(x, y)"); "based client app credentials. No username or jwt token is found " +
"as input - getTenantBasedClientAppCredentials(x, y)");
return null; return null;
} else { } else {
var tenantDomain = carbon.server.tenantDomain({username: username}); var tenantDomain = carbon.server.tenantDomain({username: username});
if (!tenantDomain) { if (!tenantDomain) {
log.error("{/app/modules/oauth/util.js} Error in retrieving tenant based client application " + log.error("{/app/modules/oauth/token-handler-utils.js} Error in retrieving tenant " +
"credentials. Unable to obtain a valid tenant domain for provided " + "based client application credentials. Unable to obtain a valid tenant domain for provided " +
"username - getTenantBasedClientAppCredentials(x, y)"); "username - getTenantBasedClientAppCredentials(x, y)");
return null; return null;
} else { } else {
var cachedTenantBasedClientAppCredentials = privateMethods. var cachedTenantBasedClientAppCredentials = privateMethods.
@ -232,7 +234,7 @@ var util = function () {
var applicationName = "webapp_" + tenantDomain; var applicationName = "webapp_" + tenantDomain;
var requestURL = deviceMgtProps["oauthProvider"]["appRegistration"] var requestURL = deviceMgtProps["oauthProvider"]["appRegistration"]
["apiManagerClientAppRegistrationServiceURL"] + ["apiManagerClientAppRegistrationServiceURL"] +
"?tenantDomain=" + tenantDomain + "&applicationName=" + applicationName; "?tenantDomain=" + tenantDomain + "&applicationName=" + applicationName;
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
xhr.open("POST", requestURL, false); xhr.open("POST", requestURL, false);
@ -249,8 +251,9 @@ var util = function () {
setCachedTenantBasedClientAppCredentials(tenantDomain, tenantBasedClientAppCredentials); setCachedTenantBasedClientAppCredentials(tenantDomain, tenantBasedClientAppCredentials);
return tenantBasedClientAppCredentials; return tenantBasedClientAppCredentials;
} else { } else {
log.error("{/app/modules/oauth/util.js} Error in retrieving tenant based client " + log.error("{/app/modules/oauth/token-handler-utils.js} Error in retrieving tenant " +
"application credentials from API Manager - getTenantBasedClientAppCredentials(x, y)"); "based client application credentials from API " +
"Manager - getTenantBasedClientAppCredentials(x, y)");
return null; return null;
} }
} }

10
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/oauth/token-handlers.js
Unescape View File

@ -25,7 +25,7 @@
var handlers = function () { var handlers = function () {
var log = new Log("/app/modules/oauth/token-handlers.js"); var log = new Log("/app/modules/oauth/token-handlers.js");
var tokenUtil = require("/app/modules/oauth/util.js")["util"]; var tokenUtil = require("/app/modules/oauth/token-handler-utils.js")["utils"];
var constants = require("/app/modules/constants.js"); var constants = require("/app/modules/constants.js");
var devicemgtProps = require("/app/conf/reader/main.js")["conf"]; var devicemgtProps = require("/app/conf/reader/main.js")["conf"];
@ -53,8 +53,8 @@ var handlers = function () {
stringOfScopes += entry + " "; stringOfScopes += entry + " ";
}); });
tokenPair = tokenUtil. tokenPair = tokenUtil.
getAccessTokenByPasswordGrantType(username, getTokenPairByPasswordGrantType(username,
encodeURIComponent(password), encodedClientAppCredentials, stringOfScopes); encodeURIComponent(password), encodedClientAppCredentials, stringOfScopes);
if (!tokenPair) { if (!tokenPair) {
throw new Error("{/app/modules/oauth/token-handlers.js} Could not set up " + throw new Error("{/app/modules/oauth/token-handlers.js} Could not set up " +
"token pair by password grant type. Error in token " + "token pair by password grant type. Error in token " +
@ -83,7 +83,7 @@ var handlers = function () {
var tokenPair; var tokenPair;
// accessTokenPair will include current access token as well as current refresh token // accessTokenPair will include current access token as well as current refresh token
tokenPair = tokenUtil. tokenPair = tokenUtil.
getAccessTokenBySAMLGrantType(samlToken, encodedClientAppCredentials, "PRODUCTION"); getTokenPairBySAMLGrantType(samlToken, encodedClientAppCredentials, "PRODUCTION");
if (!tokenPair) { if (!tokenPair) {
throw new Error("{/app/modules/oauth/token-handlers.js} Could not set up token " + throw new Error("{/app/modules/oauth/token-handlers.js} Could not set up token " +
"pair by password grant type. Error in token " + "pair by password grant type. Error in token " +
@ -106,7 +106,7 @@ var handlers = function () {
"session context - refreshTokenPair()"); "session context - refreshTokenPair()");
} else { } else {
var newTokenPair = tokenUtil. var newTokenPair = tokenUtil.
getNewAccessTokenByRefreshToken(currentTokenPair["refreshToken"], encodedClientAppCredentials); getNewTokenPairByRefreshToken(currentTokenPair["refreshToken"], encodedClientAppCredentials);
if (!newTokenPair) { if (!newTokenPair) {
log.error("{/app/modules/oauth/token-handlers.js} Error in refreshing token pair. " + log.error("{/app/modules/oauth/token-handlers.js} Error in refreshing token pair. " +
"Unable to update session context with new access token pair - refreshTokenPair()"); "Unable to update session context with new access token pair - refreshTokenPair()");

Write Preview
Loading…
Cancel
Save