fix: handle missing primaryEmail for enterprise users #2665
Conversation
This file contains 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
abeatrix
changed the title
arafatkatze
added a commit
that referenced
this pull request
Jan 11, 2024
Issue: #2669 The current build of Cody has an issue where the cursor is stolen many times because of a rerendering of some sort for auth, this makes cody very hard to use for anything as you can barely type. Original PR that introduced this #2665 I actually do not know how the PR works so I added a throttle mechanism to stop the rerendering for 5 minutes(300 seconds) so that it doesn't make a super terrible UX. My aim is to merge this HACK for now and then do a proper fix later with @abeatrix ## Test plan <!-- Required. See https://sourcegraph.com/docs/dev/background-information/testing_principles. -->
sqs
added a commit
that referenced
this pull request
Jan 12, 2024
In #2665 we migrated the chat history key to use the user's username instead of their email address. This means that the storage would retain the chat history under the old key indefinitely. Large storage data slows down extension host activation and every `set` operation. My storage was 1.8MB, which was causing warnings from VS Code like this: ``` [mainThreadStorage] large extension state detected (extensionId: sourcegraph.cody-ai, global: true): 916.8603515625kb. Consider to use 'storageUri' or 'globalStorageUri' to store this data on disk instead. ``` Each `Memento#set` call was taking ~37ms (with 1.8MB of data). With ~1kb of data, each set call takes ~1-3ms. Of course, the data will accumulate as the user uses Cody more, but at least we can manage the data now without some of it being "orphaned". Test plan: Confirmed that this removes the old data: 1. Added a console.log to ensure that the code had the right before/after values. 2. Confirmed the storage DB on disk had the keys before and after the migration did not have them, with `sqlite3 ~/.config/Code/User/globalStorage/state.vscdb "select value from itemtable where key='sourcegraph.cody-ai';" | jq '."cody-local-chatHistory-v2" | keys'`. 3. Confirmed the length of the key's value went down (from 1.8MB to 672 bytes, as expected).
sqs
added a commit
that referenced
this pull request
Jan 12, 2024
In #2665 we migrated the chat history key to use the user's username instead of their email address. This means that the storage would retain the chat history under the old key indefinitely. Large storage data slows down extension host activation and every `set` operation. My storage was 1.8MB, which was causing warnings from VS Code like this: ``` [mainThreadStorage] large extension state detected (extensionId: sourcegraph.cody-ai, global: true): 916.8603515625kb. Consider to use 'storageUri' or 'globalStorageUri' to store this data on disk instead. ``` Each `Memento#set` call was taking ~37ms (with 1.8MB of data). With ~1kb of data, each set call takes ~1-3ms. Of course, the data will accumulate as the user uses Cody more, but at least we can manage the data now without some of it being "orphaned". ## Test plan: Confirmed that this removes the old data: 1. Added a console.log to ensure that the code had the right before/after values. 2. Confirmed the storage DB on disk had the keys before and after the migration did not have them, with `sqlite3 ~/.config/Code/User/globalStorage/state.vscdb "select value from itemtable where key='sourcegraph.cody-ai';" | jq '."cody-local-chatHistory-v2" | keys'`. 3. Confirmed the length of the key's value went down (from 1.8MB to 672 bytes, as expected).
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.
CLOSE #2663 & #2664
A bug was introduced in #2233 where we added a requirement for
primaryEmailduring auth, resulting in uncaught error that stopped the extension from starting.For Enterprise instances, emails are not always required to set up an account.
This PR includes the following changes to fix the issue above:
primaryEmailanddisplayNamefields are optionalTest plan
Before
Unable to start Cody on reload
Screen.Recording.2024-01-10.at.7.48.40.AM.mov
After
https://www.loom.com/share/b9049f54cb0f48da87fc630c84cc736e?sid=0e1b3677-9c3e-4c28-84b5-846f95ad4a16
fix.auth.error.mp4