fix: new git credential flow #9553
Open
+38
−34
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
✅ Circular References ReportGenerated at: 2026-01-09T09:16:07.955Z Summary
Click to view all circular references in PR (167)Click to view all circular references in base branch (167)Analysis✅ No Change: This PR does not introduce or remove any circular references. This report was generated automatically by comparing against the |
Contributor
There was a problem hiding this comment.
Pull request overview
This pull request fixes the new git credentials flow by adapting the UI and data handling for a new credential model where credentials are stored as separate entities and referenced by ID, rather than being embedded in git repository objects.
- Refactors conditional logic to hide git repository selection UI when converting to git storage type if the
isGitSyncEnabledfeature flag is disabled - Simplifies credential cleanup logic on logout to use the new
credentialsIdreference model instead of checking embedded credential fields
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| packages/insomnia/src/ui/components/project/project-settings-form.tsx | Extracts conditional logic into named variables and adds feature flag check to control git repo form visibility during storage type conversion |
| packages/insomnia/src/account/session.ts | Simplifies git repository removal logic to check for credentialsId reference instead of validating embedded credential token/password fields |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| const showGitRepoForm = | ||
| storageType === 'git' && | ||
| ((isGitSyncEnabled && isSwitchingStorageType(project!, storageType)) || | ||
| (!isSwitchingStorageType(project!, storageType) && project?.gitRepositoryId === EMPTY_GIT_PROJECT_ID)); |
There was a problem hiding this comment.
The logic for showGitRepoForm doesn't handle the case where an existing git project (not switching storage type, has a non-empty gitRepositoryId) is missing credentials. In the previous implementation, this case would show the GitRepoForm to allow users to add credentials. Now, neither GitConnectionInfo nor GitRepoForm will be displayed, leaving users unable to configure credentials for the existing git repository. Consider adding a condition to show GitRepoForm when !isSwitchingStorageType && gitRepositoryId !== EMPTY_GIT_PROJECT_ID && !gitRepository?.credentialsId.
Suggested change
| (!isSwitchingStorageType(project!, storageType) && project?.gitRepositoryId === EMPTY_GIT_PROJECT_ID)); | |
| (!isSwitchingStorageType(project!, storageType) && project?.gitRepositoryId === EMPTY_GIT_PROJECT_ID) || | |
| (!isSwitchingStorageType(project!, storageType) && project?.gitRepositoryId !== EMPTY_GIT_PROJECT_ID && !gitRepository?.credentialsId)); |
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 2 out of 2 changed files in this pull request and generated no new comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix for the new git credentials flow #9513