Skip to content

Commit 0ebad77

Browse files
committed
default early
1 parent e5d54e7 commit 0ebad77

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/OAuth2AuthManagerImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ private OauthProviderVO saveOauthProvider(String provider, String description, S
283283
oauthProviderVO.setDomainId(domainId);
284284
oauthProviderVO.setAuthorizeUrl(authorizeUrl);
285285
oauthProviderVO.setTokenUrl(tokenUrl);
286-
oauthProviderVO.setEnabled(enabled == null || enabled);
286+
oauthProviderVO.setEnabled(enabled);
287287

288288
_oauthProviderDao.persist(oauthProviderVO);
289289

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public class RegisterOAuthProviderCmd extends BaseCmd {
7979
@Parameter(name = ApiConstants.TOKEN_URL, type = CommandType.STRING, description = "Token URL for OAuth finalization (only required for keycloak provider)")
8080
private String tokenUrl;
8181

82-
@Parameter(name = ApiConstants.ENABLED, type = CommandType.BOOLEAN, description = "OAuth provider will be enabled or disabled based on this value", since = "24.0.0")
82+
@Parameter(name = ApiConstants.ENABLED, type = CommandType.BOOLEAN, description = "OAuth provider will be enabled or disabled based on this value, defaults to true if not specified", since = "24.0.0")
8383
private Boolean enabled;
8484

8585
@Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP,
@@ -128,6 +128,9 @@ public String getTokenUrl() {
128128
}
129129

130130
public Boolean getEnabled() {
131+
if (enabled == null) {
132+
return true; // default to enabled if not specified
133+
}
131134
return enabled;
132135
}
133136

0 commit comments

Comments
 (0)