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

Jump to bottom

[Backport] Fixup for oauth2 usernames #188

Merged
merged 3 commits into from
Dec 2, 2021
Merged

[Backport] Fixup for oauth2 usernames #188

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e7e1e55
Fixup for oauth2 usernames
mshaposhnik Nov 24, 2021
5bcc309
Added test
mshaposhnik Dec 1, 2021
263ecd7
fix: fix fmt
mshaposhnik Dec 1, 2021
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
4 changes: 3 additions & 1 deletion ...ava/org/eclipse/che/api/factory/server/scm/kubernetes/KubernetesGitCredentialManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

import static java.lang.String.format;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.eclipse.che.api.factory.server.scm.PersonalAccessTokenFetcher.OAUTH_2_PREFIX;
import static org.eclipse.che.workspace.infrastructure.kubernetes.provision.secret.KubernetesSecretAnnotationNames.ANNOTATION_AUTOMOUNT;
import static org.eclipse.che.workspace.infrastructure.kubernetes.provision.secret.KubernetesSecretAnnotationNames.ANNOTATION_DEV_WORKSPACE_MOUNT_PATH;
import static org.eclipse.che.workspace.infrastructure.kubernetes.provision.secret.KubernetesSecretAnnotationNames.ANNOTATION_GIT_CREDENTIALS;
Expand Down Expand Up @@ -150,7 +151,8 @@ public void createOrReplace(PersonalAccessToken personalAccessToken)
format(
"%s://%s:%s@%s%s",
scmUrl.getProtocol(),
personalAccessToken.getScmUserName(),
personalAccessToken.getScmTokenName().startsWith(OAUTH_2_PREFIX) ?
"oauth2" : personalAccessToken.getScmUserName(),
URLEncoder.encode(personalAccessToken.getToken(), UTF_8),
scmUrl.getHost(),
scmUrl.getPort() != 80 && scmUrl.getPort() != -1
Expand Down