Skip to content

feat: Add Git auth for GitHub, GitLab, Azure DevOps, and BitBucket #4670

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
merged 22 commits into from
Oct 25, 2022
Merged

feat: Add Git auth for GitHub, GitLab, Azure DevOps, and BitBucket #4670

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
3dc1f00
Add scaffolding
kylecarbs Oct 17, 2022
f640283
Merge branch 'main' into gitprovider
kylecarbs Oct 18, 2022
fb5195d
Move migration
kylecarbs Oct 18, 2022
a10c4d5
Add endpoints for gitauth
kylecarbs Oct 19, 2022
4c37c34
Add configuration files and tests!
kylecarbs Oct 20, 2022
f86e26a
Update typesgen
kylecarbs Oct 20, 2022
ab9aa48
Merge branch 'main' into gitprovider
kylecarbs Oct 22, 2022
0a2e222
Convert configuration format for git auth
kylecarbs Oct 23, 2022
7237d9b
Fix unclosed database conn
kylecarbs Oct 23, 2022
439d3bc
Add overriding VS Code configuration
kylecarbs Oct 23, 2022
a296e31
Fix Git screen
kylecarbs Oct 23, 2022
40b874d
Merge branch 'main' into gitprovider
kylecarbs Oct 24, 2022
03e6e62
Write VS Code special configuration if providers exist
kylecarbs Oct 24, 2022
6bd9733
Enable automatic cloning from VS Code
kylecarbs Oct 24, 2022
1e5c2f7
Add tests for gitaskpass
kylecarbs Oct 24, 2022
4e4f0ba
Fix feature visibiliy
kylecarbs Oct 24, 2022
f2c0983
Add banner for too many configurations
kylecarbs Oct 24, 2022
b6bfdf1
Fix update loop for oauth token
kylecarbs Oct 24, 2022
8e17cb9
Merge branch 'main' into gitprovider
kylecarbs Oct 24, 2022
b12765c
Jon comments
kylecarbs Oct 24, 2022
29c9e47
Add deployment config page
kylecarbs Oct 24, 2022
fad5bae
Merge branch 'main' into gitprovider
kylecarbs Oct 25, 2022
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
Prev Previous commit
Next Next commit
Fix update loop for oauth token
  • Loading branch information
@kylecarbs
kylecarbs committed Oct 24, 2022
commit b6bfdf164a6f6ac5a666c91040fbb3341d5e11bb
45 changes: 25 additions & 20 deletions coderd/workspaceagents.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1012,30 +1012,35 @@ func (api *API) workspaceAgentsGitAuth(rw http.ResponseWriter, r *http.Request)
return
}
defer cancelFunc()
select {
case <-r.Context().Done():
return
case <-authChan:
}

gitAuthLink, err := api.Database.GetGitAuthLink(ctx, database.GetGitAuthLinkParams{
ProviderID: gitAuthConfig.ID,
UserID: workspace.OwnerID,
})
if err != nil {
httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
Message: "Failed to get git auth link.",
Detail: err.Error(),
ticker := time.NewTicker(time.Second)
for {
select {
case <-r.Context().Done():
return
case <-ticker.C:
case <-authChan:
}
gitAuthLink, err := api.Database.GetGitAuthLink(ctx, database.GetGitAuthLinkParams{
ProviderID: gitAuthConfig.ID,
UserID: workspace.OwnerID,
})
if err != nil {
httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
Message: "Failed to get git auth link.",
Detail: err.Error(),
})
return
}
if gitAuthLink.OAuthExpiry.Before(database.Now()) {
continue
}
httpapi.Write(ctx, rw, http.StatusOK, formatGitAuthAccessToken(gitAuthConfig.Type, gitAuthLink.OAuthAccessToken))
return
}

httpapi.Write(ctx, rw, http.StatusOK, formatGitAuthAccessToken(gitAuthConfig.Type, gitAuthLink.OAuthAccessToken))
return
}

// This is the URL that will redirect the user with a state token.
url, err := api.AccessURL.Parse(fmt.Sprintf("/gitauth/%s", gitAuthConfig.ID))
redirectURL, err := api.AccessURL.Parse(fmt.Sprintf("/gitauth/%s", gitAuthConfig.ID))
if err != nil {
httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
Message: "Failed to parse access URL.",
Expand All @@ -1058,7 +1063,7 @@ func (api *API) workspaceAgentsGitAuth(rw http.ResponseWriter, r *http.Request)
}

httpapi.Write(ctx, rw, http.StatusOK, codersdk.WorkspaceAgentGitAuthResponse{
URL: url.String(),
URL: redirectURL.String(),
})
return
}
Expand All @@ -1070,7 +1075,7 @@ func (api *API) workspaceAgentsGitAuth(rw http.ResponseWriter, r *http.Request)
}).Token()
if err != nil {
httpapi.Write(ctx, rw, http.StatusOK, codersdk.WorkspaceAgentGitAuthResponse{
URL: url.String(),
URL: redirectURL.String(),
})
return
}
Expand Down