Skip to content
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

Align the oauth items filter with changes from server #1121

Merged
merged 1 commit into from
Jun 6, 2024
Merged

Align the oauth items filter with changes from server #1121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 2 additions & 8 deletions packages/dashboard-frontend/src/pages/UserPreferences/GitServices/List/StatusIcon/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,12 @@ export type Props = {
export class GitServiceStatusIcon extends React.PureComponent<Props> {
private isSkipOauth(): boolean {
const { gitProvider, skipOauthProviders } = this.props;
// Use includes filter to handle the bitbucket-server oauth 2 provider.
// The bitbucket server oauth2 provider name is 'bitbucket',
// but the corresponding 'skip oauth' item is 'bitbucket-server'.
return skipOauthProviders.some(s => s.includes(gitProvider));
return skipOauthProviders.includes(gitProvider);
}

private hasOauthToken(): boolean {
const { gitProvider, providersWithToken } = this.props;
// Use includes filter to handle the bitbucket-server oauth 2 provider.
// The bitbucket server oauth2 provider name is 'bitbucket',
// but the corresponding 'provider with token' item is 'bitbucket-server'.
return providersWithToken.some(p => p.includes(gitProvider));
return providersWithToken.includes(gitProvider);
}

public render(): React.ReactElement {
Expand Down
10 changes: 2 additions & 8 deletions packages/dashboard-frontend/src/pages/UserPreferences/GitServices/List/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,10 +191,7 @@ export class GitServicesList extends React.PureComponent<Props, State> {
}

private hasSkipOauth(providerName: api.GitOauthProvider): boolean {
// Use includes filter to handle the bitbucket-server oauth 2 provider.
// The bitbucket server oauth2 provider name is 'bitbucket',
// but the corresponding 'skip oauth' item is 'bitbucket-server'.
return this.props.skipOauthProviders.some(s => s.includes(providerName));
return this.props.skipOauthProviders.includes(providerName);
}

private hasOauthToken(providerName: api.GitOauthProvider): boolean {
Expand All @@ -207,10 +204,7 @@ export class GitServicesList extends React.PureComponent<Props, State> {
}

private handleClearService(service: IGitOauth): void {
// Use includes filter to handle the bitbucket-server oauth 2 provider.
// The bitbucket server oauth2 provider name is 'bitbucket',
// but the corresponding 'skip oauth' item is 'bitbucket-server'.
const serviceToClear = this.props.skipOauthProviders.find(s => s.includes(service.name));
const serviceToClear = this.props.skipOauthProviders.find(s => s === service.name);
if (serviceToClear != undefined) {
this.props.onClearService(serviceToClear);
this.deselectServices([service]);
Expand Down
2 changes: 1 addition & 1 deletion packages/dashboard-frontend/src/pages/UserPreferences/const.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const GIT_OAUTH_PROVIDERS: Record<api.GitOauthProvider, string> = {
'azure-devops': 'Microsoft Azure DevOps',
// Either Bitbucket Cloud or Bitbucket Server
// https://github.com/eclipse-che/che-server/blob/main/wsmaster/che-core-api-auth-bitbucket/src/main/java/org/eclipse/che/security/oauth/BitbucketOAuthAuthenticator.java
'bitbucket-server': 'Bitbucket (OAuth 1.0)',
'bitbucket-server': 'Bitbucket',
// Bitbucket Server only
// https://github.com/eclipse-che/che-server/blob/main/wsmaster/che-core-api-auth-bitbucket/src/main/java/org/eclipse/che/security/oauth1/BitbucketServerOAuthAuthenticator.java
bitbucket: 'Bitbucket',
Expand Down
Loading