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

Merge pull request #22 from milanperera/master

Browse Source 
Refactored DCA
This commit is contained in:
Dilshan Edirisuriya 2015-07-30 17:12:07 +05:30
commit 990bf4da82
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/license/mgt/License.java
View File

@ -36,7 +36,7 @@ public class License {
private String text; private String text;
public License() { public License() {
this.validFrom = new Date(); this.validTo = new Date();
this.validFrom = new Date(); this.validFrom = new Date();
} }

19
components/oauth-extensions/dynamic-client-manager/src/main/java/org/wso2/carbon/identity/oauth/extension/DynamicClientRegistrationUtil.java
View File

@ -43,30 +43,26 @@ import java.util.Arrays;
public class DynamicClientRegistrationUtil { public class DynamicClientRegistrationUtil {
private static final String TOKEN_SCOPE = "tokenScope";
private static final Log log = LogFactory.getLog(DynamicClientRegistrationUtil.class); private static final Log log = LogFactory.getLog(DynamicClientRegistrationUtil.class);
public static OAuthApplicationInfo registerApplication(RegistrationProfile profile) throws APIManagementException { public static OAuthApplicationInfo registerApplication(RegistrationProfile profile) throws APIManagementException {
OAuthApplicationInfo oAuthApplicationInfo = new OAuthApplicationInfo(); OAuthApplicationInfo oAuthApplicationInfo = new OAuthApplicationInfo();
//Subscriber's name should be passed as a parameter, since it's under the subscriber the OAuth App is created.
String userId = profile.getOwner();
String applicationName = profile.getClientName(); String applicationName = profile.getClientName();
String grantType = profile.getGrantType();
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("Trying to create OAuth application: '" + applicationName + "'"); log.debug("Trying to create OAuth application: '" + applicationName + "'");
} }
String callBackURL = profile.getCallbackUrl();
String tokenScope = profile.getTokenScope(); String tokenScope = profile.getTokenScope();
String tokenScopes[] = new String[1]; String tokenScopes[] = new String[1];
tokenScopes[0] = tokenScope; tokenScopes[0] = tokenScope;
oAuthApplicationInfo.addParameter("tokenScope", Arrays.toString(tokenScopes)); oAuthApplicationInfo.addParameter(TOKEN_SCOPE, Arrays.toString(tokenScopes));
OAuthApplicationInfo info; OAuthApplicationInfo info;
try { try {
info = createOAuthApplication(userId, applicationName, callBackURL, grantType); info = createOAuthApplication(profile);
} catch (Exception e) { } catch (Exception e) {
throw new APIManagementException("Can not create OAuth application : " + applicationName, e); throw new APIManagementException("Can not create OAuth application : " + applicationName, e);
} }
@ -98,8 +94,15 @@ public class DynamicClientRegistrationUtil {
} }
public static OAuthApplicationInfo createOAuthApplication( public static OAuthApplicationInfo createOAuthApplication(
String userId, String applicationName, String callbackUrl, String grantType) RegistrationProfile profile)
throws APIManagementException, IdentityException { throws APIManagementException, IdentityException {
//Subscriber's name should be passed as a parameter, since it's under the subscriber the OAuth App is created.
String userId = profile.getOwner();
String applicationName = profile.getClientName();
String grantType = profile.getGrantType();
String callbackUrl = profile.getCallbackUrl();
if (userId == null || userId.isEmpty()) { if (userId == null || userId.isEmpty()) {
return null; return null;
} }