Skip to content

Commit 94c9e4b

Browse files
committed
code cleanup
1 parent 0bab9f6 commit 94c9e4b

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/api/command/ListOAuthProvidersCmd.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public String authenticate(String command, Map<String, Object[]> params, HttpSes
116116

117117
boolean domainRequested = ArrayUtils.isNotEmpty((String[])params.get(ApiConstants.DOMAIN_ID))
118118
|| ArrayUtils.isNotEmpty((String[])params.get(ApiConstants.DOMAIN));
119-
domainId = resolveDomainId(params);
119+
domainId = _oauth2mgr.resolveDomainId(params);
120120

121121
if (domainRequested && domainId == null) {
122122
ListResponse<OauthProviderResponse> response = new ListResponse<>();
@@ -161,10 +161,6 @@ public String authenticate(String command, Map<String, Object[]> params, HttpSes
161161
return ApiResponseSerializer.toSerializedString(response, responseType);
162162
}
163163

164-
private Long resolveDomainId(Map<String, Object[]> params) {
165-
return _oauth2mgr.resolveDomainId(params);
166-
}
167-
168164
@Override
169165
public APIAuthenticationType getAPIType() {
170166
return null;

plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/api/command/VerifyOAuthCodeAndGetUserCmd.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public String authenticate(String command, Map<String, Object[]> params, HttpSes
110110
if (ArrayUtils.isNotEmpty(providerArray)) {
111111
provider = providerArray[0];
112112
}
113-
domainId = resolveDomainId(params);
113+
domainId = _oauth2mgr.resolveDomainId(params);
114114

115115
String email = _oauth2mgr.verifyCodeAndFetchEmail(secretCode, provider, domainId);
116116
if (email != null) {
@@ -125,10 +125,6 @@ public String authenticate(String command, Map<String, Object[]> params, HttpSes
125125
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Unable to verify the code provided");
126126
}
127127

128-
private Long resolveDomainId(Map<String, Object[]> params) {
129-
return _oauth2mgr.resolveDomainId(params);
130-
}
131-
132128
@Override
133129
public APIAuthenticationType getAPIType() {
134130
return null;

0 commit comments

Comments
 (0)