Skip to content

Commit 591cc4f

Browse files
authored
Add action button to enable/disable Oauth provider (#9242)
1 parent f360f70 commit 591cc4f

2 files changed

Lines changed: 25 additions & 7 deletions

File tree

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,9 @@ public String verifyCodeAndFetchEmail(String code, String provider) {
138138
public OauthProviderVO registerOauthProvider(RegisterOAuthProviderCmd cmd) {
139139
String description = cmd.getDescription();
140140
String provider = cmd.getProvider();
141-
String clientId = cmd.getClientId();
142-
String redirectUri = cmd.getRedirectUri();
143-
String secretKey = cmd.getSecretKey();
141+
String clientId = StringUtils.trim(cmd.getClientId());
142+
String redirectUri = StringUtils.trim(cmd.getRedirectUri());
143+
String secretKey = StringUtils.trim(cmd.getSecretKey());
144144

145145
if (!isOAuthPluginEnabled()) {
146146
throw new CloudRuntimeException("OAuth is not enabled, please enable to register");
@@ -170,9 +170,9 @@ public List<OauthProviderVO> listOauthProviders(String provider, String uuid) {
170170
public OauthProviderVO updateOauthProvider(UpdateOAuthProviderCmd cmd) {
171171
Long id = cmd.getId();
172172
String description = cmd.getDescription();
173-
String clientId = cmd.getClientId();
174-
String redirectUri = cmd.getRedirectUri();
175-
String secretKey = cmd.getSecretKey();
173+
String clientId = StringUtils.trim(cmd.getClientId());
174+
String redirectUri = StringUtils.trim(cmd.getRedirectUri());
175+
String secretKey = StringUtils.trim(cmd.getSecretKey());
176176
Boolean enabled = cmd.getEnabled();
177177

178178
OauthProviderVO providerVO = _oauthProviderDao.findById(id);

ui/src/config/section/config.js

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,25 @@ export default {
101101
label: 'label.edit',
102102
dataView: true,
103103
popup: true,
104-
args: ['description', 'clientid', 'redirecturi', 'secretkey', 'enabled']
104+
args: ['description', 'clientid', 'redirecturi', 'secretkey']
105+
},
106+
{
107+
api: 'updateOauthProvider',
108+
icon: 'play-circle-outlined',
109+
label: 'label.enable.provider',
110+
message: 'message.confirm.enable.provider',
111+
dataView: true,
112+
defaultArgs: { enabled: true },
113+
show: (record) => { return record.enabled === false }
114+
},
115+
{
116+
api: 'updateOauthProvider',
117+
icon: 'pause-circle-outlined',
118+
label: 'label.disable.provider',
119+
message: 'message.confirm.disable.provider',
120+
dataView: true,
121+
defaultArgs: { enabled: false },
122+
show: (record) => { return record.enabled === true }
105123
},
106124
{
107125
api: 'deleteOauthProvider',

0 commit comments

Comments
 (0)