Skip to content

feat: Add GitHub OAuth #1050

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 14 commits into from
Apr 23, 2022
Merged

feat: Add GitHub OAuth #1050

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a63d27b
Initial oauth
kylecarbs Apr 15, 2022
b1a6d9c
Merge branch 'main' into oauth
kylecarbs Apr 17, 2022
05b6a37
Add Github authentication
kylecarbs Apr 17, 2022
53c2bf4
Add AuthMethods endpoint
kylecarbs Apr 17, 2022
2595156
Add frontend
kylecarbs Apr 17, 2022
02ff066
Rename basic authentication to password
kylecarbs Apr 17, 2022
834a148
Add flags for configuring GitHub auth
kylecarbs Apr 17, 2022
4f1e907
Remove name from API keys
kylecarbs Apr 17, 2022
db07849
Fix authmethods in test
kylecarbs Apr 17, 2022
f7b8238
Add stories and display auth methods error
kylecarbs Apr 19, 2022
917dfef
Merge branch 'main' into oauth
kylecarbs Apr 19, 2022
86f2f4a
Merge branch 'main' into oauth
kylecarbs Apr 19, 2022
9c3d81e
Merge branch 'main' into oauth
kylecarbs Apr 20, 2022
aa9e5b7
Merge branch 'main' into oauth
kylecarbs Apr 23, 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 authmethods in test
  • Loading branch information
@kylecarbs
kylecarbs committed Apr 17, 2022
commit db07849bec88b632a422d38e347989405852925c
4 changes: 2 additions & 2 deletions coderd/userauth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ func (api *api) userOAuth2Github(rw http.ResponseWriter, r *http.Request) {
}

var organizationID uuid.UUID
organizations, err := api.Database.GetOrganizations(r.Context())
if err == nil {
organizations, _ := api.Database.GetOrganizations(r.Context())
if len(organizations) > 0 {
// Add the user to the first organization. Once multi-organization
// support is added, we should enable a configuration map of user
// email to organization.
Expand Down
4 changes: 2 additions & 2 deletions site/src/pages/login.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ describe("SignInPage", () => {
)
// only leave password auth enabled by default
server.use(
rest.get("/api/v2/users/auth", (req, res, ctx) => {
rest.get("/api/v2/users/authmethods", (req, res, ctx) => {
return res(
ctx.status(200),
ctx.json({
Expand Down Expand Up @@ -66,7 +66,7 @@ describe("SignInPage", () => {
it("shows github authentication when enabled", async () => {
// Given
server.use(
rest.get("/api/v2/users/auth", async (req, res, ctx) => {
rest.get("/api/v2/users/authmethods", async (req, res, ctx) => {
return res(
ctx.status(200),
ctx.json({
Expand Down