From 591cc4f0027eca2945cd811c17fbb1ef0eba6ad8 Mon Sep 17 00:00:00 2001
From: Abhisar Sinha <63767682+abh1sar@users.noreply.github.com>
Date: Tue, 18 Jun 2024 12:02:13 +0530
Subject: [PATCH] Add action button to enable/disable Oauth provider (#9242)

---
 .../oauth2/OAuth2AuthManagerImpl.java         | 12 +++++------
 ui/src/config/section/config.js               | 20 ++++++++++++++++++-
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/OAuth2AuthManagerImpl.java b/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/OAuth2AuthManagerImpl.java
index 85730651248..b0596f0c386 100644
--- a/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/OAuth2AuthManagerImpl.java
+++ b/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/OAuth2AuthManagerImpl.java
@@ -138,9 +138,9 @@ public class OAuth2AuthManagerImpl extends ManagerBase implements OAuth2AuthMana
     public OauthProviderVO registerOauthProvider(RegisterOAuthProviderCmd cmd) {
         String description = cmd.getDescription();
         String provider = cmd.getProvider();
-        String clientId = cmd.getClientId();
-        String redirectUri = cmd.getRedirectUri();
-        String secretKey = cmd.getSecretKey();
+        String clientId = StringUtils.trim(cmd.getClientId());
+        String redirectUri = StringUtils.trim(cmd.getRedirectUri());
+        String secretKey = StringUtils.trim(cmd.getSecretKey());
 
         if (!isOAuthPluginEnabled()) {
             throw new CloudRuntimeException("OAuth is not enabled, please enable to register");
@@ -170,9 +170,9 @@ public class OAuth2AuthManagerImpl extends ManagerBase implements OAuth2AuthMana
     public OauthProviderVO updateOauthProvider(UpdateOAuthProviderCmd cmd) {
         Long id = cmd.getId();
         String description = cmd.getDescription();
-        String clientId = cmd.getClientId();
-        String redirectUri = cmd.getRedirectUri();
-        String secretKey = cmd.getSecretKey();
+        String clientId = StringUtils.trim(cmd.getClientId());
+        String redirectUri = StringUtils.trim(cmd.getRedirectUri());
+        String secretKey = StringUtils.trim(cmd.getSecretKey());
         Boolean enabled = cmd.getEnabled();
 
         OauthProviderVO providerVO = _oauthProviderDao.findById(id);
diff --git a/ui/src/config/section/config.js b/ui/src/config/section/config.js
index aa108b5b1fa..8f792e51ac9 100644
--- a/ui/src/config/section/config.js
+++ b/ui/src/config/section/config.js
@@ -101,7 +101,25 @@ export default {
           label: 'label.edit',
           dataView: true,
           popup: true,
-          args: ['description', 'clientid', 'redirecturi', 'secretkey', 'enabled']
+          args: ['description', 'clientid', 'redirecturi', 'secretkey']
+        },
+        {
+          api: 'updateOauthProvider',
+          icon: 'play-circle-outlined',
+          label: 'label.enable.provider',
+          message: 'message.confirm.enable.provider',
+          dataView: true,
+          defaultArgs: { enabled: true },
+          show: (record) => { return record.enabled === false }
+        },
+        {
+          api: 'updateOauthProvider',
+          icon: 'pause-circle-outlined',
+          label: 'label.disable.provider',
+          message: 'message.confirm.disable.provider',
+          dataView: true,
+          defaultArgs: { enabled: false },
+          show: (record) => { return record.enabled === true }
         },
         {
           api: 'deleteOauthProvider',