Skip to content

fix: persist copilot token metadata #441

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

Merged
luispater merged 2 commits into from
Mar 14, 2026
Merged

fix: persist copilot token metadata #441

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
339a81b
fix: persist copilot token metadata
GrothKeiran Mar 13, 2026
3960c93
refactor: derive copilot metadata from storage
GrothKeiran Mar 13, 2026
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
9 changes: 6 additions & 3 deletions internal/api/handlers/management/auth_files.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2445,9 +2445,12 @@ func (h *Handler) RequestGitHubToken(c *gin.Context) {
FileName: fileName,
Storage: tokenStorage,
Metadata: map[string]any{
"email": userInfo.Email,
"username": username,
"name": userInfo.Name,
"email": userInfo.Email,
"username": username,
"name": userInfo.Name,
"access_token": tokenData.AccessToken,
"token_type": tokenData.TokenType,
"scope": tokenData.Scope,
},
Copy link

@gemini-code-assist gemini-code-assist bot Mar 13, 2026

Choose a reason for hiding this comment

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

medium

While this correctly adds the necessary fields to the metadata, it duplicates data already present in the tokenStorage object. This could become a maintenance issue if the CopilotTokenStorage struct is updated in the future, as those changes would need to be manually mirrored here.

To make this more robust and avoid data duplication, you could generate the metadata map directly from the tokenStorage object. This would ensure the metadata is always a complete and accurate reflection of the storage object.

For example, you could use JSON marshaling and unmarshaling to achieve this:

// A helper to convert storage to metadata
func tokenStorageToMetadata(storage any) (map[string]any, error) {
    data, err := json.Marshal(storage)
    if err != nil {
        return nil, err
    }
    var metadata map[string]any
    if err := json.Unmarshal(data, &metadata); err != nil {
        return nil, err
    }
    return metadata, nil
}

// In RequestGitHubToken:
tokenStorage := copilotAuth.CreateTokenStorage(bundle)
metadata, err := tokenStorageToMetadata(tokenStorage)
if err != nil {
    c.JSON(http.StatusInternalServerError, gin.H{"error": fmt.Sprintf("failed to create token metadata: %v", err)})
    return
}

record := &cliproxyauth.Auth{
    Provider: "github-copilot",
    FileName: fileName,
    Storage:  tokenStorage,
    Metadata: metadata,
}

This approach centralizes the definition of the persisted data in the CopilotTokenStorage struct, improving maintainability.

}

Expand Down
Loading