Add action button to enable/disable Oauth provider (#9242)

This commit is contained in:
Abhisar Sinha 2024-06-18 12:02:13 +05:30 committed by GitHub
parent f360f7048d
commit 591cc4f002
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 25 additions and 7 deletions

View File

@ -138,9 +138,9 @@ public class OAuth2AuthManagerImpl extends ManagerBase implements OAuth2AuthMana
public OauthProviderVO registerOauthProvider(RegisterOAuthProviderCmd cmd) { public OauthProviderVO registerOauthProvider(RegisterOAuthProviderCmd cmd) {
String description = cmd.getDescription(); String description = cmd.getDescription();
String provider = cmd.getProvider(); String provider = cmd.getProvider();
String clientId = cmd.getClientId(); String clientId = StringUtils.trim(cmd.getClientId());
String redirectUri = cmd.getRedirectUri(); String redirectUri = StringUtils.trim(cmd.getRedirectUri());
String secretKey = cmd.getSecretKey(); String secretKey = StringUtils.trim(cmd.getSecretKey());
if (!isOAuthPluginEnabled()) { if (!isOAuthPluginEnabled()) {
throw new CloudRuntimeException("OAuth is not enabled, please enable to register"); 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) { public OauthProviderVO updateOauthProvider(UpdateOAuthProviderCmd cmd) {
Long id = cmd.getId(); Long id = cmd.getId();
String description = cmd.getDescription(); String description = cmd.getDescription();
String clientId = cmd.getClientId(); String clientId = StringUtils.trim(cmd.getClientId());
String redirectUri = cmd.getRedirectUri(); String redirectUri = StringUtils.trim(cmd.getRedirectUri());
String secretKey = cmd.getSecretKey(); String secretKey = StringUtils.trim(cmd.getSecretKey());
Boolean enabled = cmd.getEnabled(); Boolean enabled = cmd.getEnabled();
OauthProviderVO providerVO = _oauthProviderDao.findById(id); OauthProviderVO providerVO = _oauthProviderDao.findById(id);

View File

@ -101,7 +101,25 @@ export default {
label: 'label.edit', label: 'label.edit',
dataView: true, dataView: true,
popup: 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', api: 'deleteOauthProvider',