Skip to content

Add action button to enable/disable Oauth provider #9242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DaanHoogland merged 3 commits into from
Jun 18, 2024
Merged

Add action button to enable/disable Oauth provider #9242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a779fd
Add action button to enable/disable Oauth provider
abh1sar Jun 13, 2024
42ae18c
trim down extra spaces in Oauth2 clientId, uri and secret
abh1sar Jun 13, 2024
b24e990
Null check and leading and trailing whitespace trimming only
abh1sar Jun 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ...thenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/OAuth2AuthManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,9 @@ public String verifyCodeAndFetchEmail(String code, String provider) {
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");
Expand Down Expand Up @@ -170,9 +170,9 @@ public List<OauthProviderVO> listOauthProviders(String provider, String uuid) {
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);
Expand Down
20 changes: 19 additions & 1 deletion ui/src/config/section/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down