Skip to content

fix: Fix issues when adding/displaying GitHub/GitLab accounts - #1244

Merged
austincondiff merged 2 commits into
CodeEditApp:mainfrom
Qubik65536:fix-accounts-settings
Apr 27, 2023
Merged

austincondiff merged 2 commits into
CodeEditApp:mainfrom
Qubik65536:fix-accounts-settings

Conversation

@Qubik65536

Copy link
Copy Markdown
Contributor

Description

  • When the user is adding a new account from GitHub or GitLab, the configURL parameter for initialize GitHubTokenConfiguration is nil, which will generate error. Added a ?? GitURL.githubBaseURL to fix this issue.
  • Use providerLink as a part of account ID and serverURL instead of server.
    • This fixes the problem that the same accounts from GitHub/GitLab can be added multiple times.
    • This fixes the problem that the provider icon for GitHub/GitLab accounts cannot be displayed correctly.
    • This should not influence the GitHub enterprise or GitLab self-hosted accounts because in that case, providerLink is server.

Related Issues

Checklist

  • I read and understood the contributing guide as well as the code of conduct
  • The issues this PR addresses are related to each other
  • My changes generate no new warnings
  • My code builds and runs on my machine
    • I don't have GitHub enterprise / GitLab self-hosted accounts, so these are not tested.
  • My changes are all related to the related issue above
  • I documented my code

Screenshots

image

@austincondiff austincondiff left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, thank you for fixing this!

@austincondiff
austincondiff merged commit 99d4db8 into CodeEditApp:main Apr 27, 2023
@Qubik65536
Qubik65536 deleted the fix-accounts-settings branch April 28, 2023 01:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants