Added edit option

Author: harikrishna-patnala

engine/schema/src/main/resources/META-INF/db/schema-41810to41900.sql

@@ -580,6 +580,7 @@ CREATE TABLE `cloud`.`oauth_provider` (
   `client_id` varchar(255) NOT NULL COMMENT 'client id which is configured in the provider',
   `secret_key` varchar(255) NOT NULL COMMENT 'secret key which is configured in the provider',
   `redirect_uri` varchar(255) NOT NULL COMMENT 'redirect uri which is configured in the provider',
+  `enabled` int(1) NOT NULL DEFAULT 1 COMMENT 'Enabled or disabled',
   `created` datetime NOT NULL COMMENT 'date created',
   `removed` datetime COMMENT 'date removed if not null',
   PRIMARY KEY (`id`)

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

@@ -173,6 +173,7 @@ public OauthProviderVO updateOauthProvider(UpdateOAuthProviderCmd cmd) {
         String clientId = cmd.getClientId();
         String redirectUri = cmd.getRedirectUri();
         String secretKey = cmd.getSecretKey();
+        Boolean enabled = cmd.getEnabled();
 
         OauthProviderVO providerVO = _oauthProviderDao.findById(id);
         if (providerVO == null) {
@@ -191,6 +192,9 @@ public OauthProviderVO updateOauthProvider(UpdateOAuthProviderCmd cmd) {
         if (StringUtils.isNotEmpty(secretKey)) {
             providerVO.setSecretKey(secretKey);
         }
+        if (enabled != null) {
+            providerVO.setEnabled(enabled);
+        }
 
         _oauthProviderDao.update(id, providerVO);
 
@@ -205,6 +209,7 @@ private OauthProviderVO saveOauthProvider(String provider, String description, S
         oauthProviderVO.setClientId(clientId);
         oauthProviderVO.setSecretKey(secretKey);
         oauthProviderVO.setRedirectUri(redirectUri);
+        oauthProviderVO.setEnabled(true);
 
         _oauthProviderDao.persist(oauthProviderVO);
 

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

@@ -111,7 +111,7 @@ public String authenticate(String command, Map<String, Object[]> params, HttpSes
         for (OauthProviderVO result : resultList) {
             OauthProviderResponse r = new OauthProviderResponse(result.getUuid(), result.getProvider(),
                     result.getDescription(), result.getClientId(), result.getSecretKey(), result.getRedirectUri());
-            if (OAuth2AuthManager.OAuth2IsPluginEnabled.value() && authenticatorPluginNames.contains(result.getProvider())) {
+            if (OAuth2AuthManager.OAuth2IsPluginEnabled.value() && authenticatorPluginNames.contains(result.getProvider()) && result.isEnabled()) {
                 r.setEnabled(true);
             } else {
                 r.setEnabled(false);

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

@@ -17,6 +17,7 @@
 package org.apache.cloudstack.oauth2.api.command;
 
 import org.apache.cloudstack.api.ApiCommandResourceType;
+import org.apache.cloudstack.auth.UserOAuth2Authenticator;
 import org.apache.cloudstack.oauth2.OAuth2AuthManager;
 import org.apache.cloudstack.oauth2.api.response.OauthProviderResponse;
 import org.apache.cloudstack.oauth2.vo.OauthProviderVO;
@@ -31,6 +32,8 @@
 import org.apache.cloudstack.context.CallContext;
 
 import javax.inject.Inject;
+import java.util.ArrayList;
+import java.util.List;
 
 @APICommand(name = "updateOauthProvider", description = "Updates the registered OAuth provider details", responseObject = OauthProviderResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.19.0")
@@ -56,6 +59,9 @@ public final class UpdateOAuthProviderCmd extends BaseCmd {
     @Parameter(name = ApiConstants.REDIRECT_URI, type = CommandType.STRING, description = "Redirect URI pre-registered in the specific OAuth provider")
     private String redirectUri;
 
+    @Parameter(name = ApiConstants.ENABLED, type = CommandType.BOOLEAN, description = "OAuth provider will be enabled or disabled based on this value")
+    private Boolean enabled;
+
     @Inject
     OAuth2AuthManager _oauthMgr;
 
@@ -83,6 +89,9 @@ public String getRedirectUri() {
         return redirectUri;
     }
 
+    public Boolean getEnabled() {
+        return enabled;
+    }
 
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
@@ -109,6 +118,19 @@ public void execute() {
         if (result != null) {
             OauthProviderResponse r = new OauthProviderResponse(result.getUuid(), result.getProvider(),
                     result.getDescription(), result.getClientId(), result.getSecretKey(), result.getRedirectUri());
+
+            List<UserOAuth2Authenticator> userOAuth2AuthenticatorPlugins = _oauthMgr.listUserOAuth2AuthenticationProviders();
+            List<String> authenticatorPluginNames = new ArrayList<>();
+            for (UserOAuth2Authenticator authenticator : userOAuth2AuthenticatorPlugins) {
+                String name = authenticator.getName();
+                authenticatorPluginNames.add(name);
+            }
+            if (OAuth2AuthManager.OAuth2IsPluginEnabled.value() && authenticatorPluginNames.contains(result.getProvider()) && result.isEnabled()) {
+                r.setEnabled(true);
+            } else {
+                r.setEnabled(false);
+            }
+
             r.setObjectName(ApiConstants.OAUTH_PROVIDER);
             r.setResponseName(getCommandName());
             this.setResponseObject(r);

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

@@ -61,6 +61,9 @@ public class OauthProviderVO implements Identity, InternalIdentity {
     @Column(name = GenericDao.REMOVED_COLUMN)
     private Date removed;
 
+    @Column(name = "enabled")
+    private boolean enabled = true;
+
     public OauthProviderVO () {
         uuid = UUID.randomUUID().toString();
     }
@@ -114,4 +117,12 @@ public String getSecretKey() {
     public void setSecretKey(String secretKey) {
         this.secretKey = secretKey;
     }
+
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
 }

ui/src/config/section/config.js

@@ -100,7 +100,7 @@ export default {
           label: 'label.edit',
           dataView: true,
           popup: true,
-          args: ['description', 'clientid', 'redirecturi', 'secretkey']
+          args: ['description', 'clientid', 'redirecturi', 'secretkey', 'enabled']
         },
         {
           api: 'deleteOauthProvider',