Dec 5, 2023 · Nov 29, 2023 · Nov 30, 2023
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/coderd.go b/coderd/coderd.go
 r.Get("/{fileID}", api.fileByID)
 r.Post("/", api.postFile)
 })
 r.Route("/external-auth/{externalauth}", func(r chi.Router) {
 r.Route("/external-auth", func(r chi.Router) {
 r.Use(
 apiKeyMiddleware,
 httpmw.ExtractExternalAuthParam(options.ExternalAuthConfigs),
 )
 r.Get("/", api.externalAuthByID)
 r.Post("/device", api.postExternalAuthDeviceByID)
 r.Get("/device", api.externalAuthDeviceByID)
 // Get without a specific external auth ID will return all external auths.
 r.Get("/", api.listUserExternalAuths)
 r.Route("/{externalauth}", func(r chi.Router) {
 r.Use(
 httpmw.ExtractExternalAuthParam(options.ExternalAuthConfigs),
 )
 r.Delete("/", api.deleteExternalAuthByID)
 r.Get("/", api.externalAuthByID)
 r.Post("/device", api.postExternalAuthDeviceByID)
 r.Get("/device", api.externalAuthDeviceByID)
 })
 })
 r.Route("/organizations", func(r chi.Router) {
 r.Use(
diff --git a/coderd/database/db2sdk/db2sdk.go b/coderd/database/db2sdk/db2sdk.go
 "github.com/coder/coder/v2/provisionersdk/proto"
 )

 func ExternalAuths(auths []database.ExternalAuthLink) []codersdk.ExternalAuthLink {
 out := make([]codersdk.ExternalAuthLink, 0, len(auths))
 for _, auth := range auths {
 out = append(out, ExternalAuth(auth))
 }
 return out
 }

 func ExternalAuth(auth database.ExternalAuthLink) codersdk.ExternalAuthLink {
 return codersdk.ExternalAuthLink{
 ProviderID:      auth.ProviderID,
 CreatedAt:       auth.CreatedAt,
 UpdatedAt:       auth.UpdatedAt,
 HasRefreshToken: auth.OAuthRefreshToken != "",
 Expires:         auth.OAuthExpiry,
 }
 }

 func WorkspaceBuildParameters(params []database.WorkspaceBuildParameter) []codersdk.WorkspaceBuildParameter {
 out := make([]codersdk.WorkspaceBuildParameter, len(params))
 for i, p := range params {
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
 return q.db.DeleteCoordinator(ctx, id)
 }

 func (q *querier) DeleteExternalAuthLink(ctx context.Context, arg database.DeleteExternalAuthLinkParams) error {
 return deleteQ(q.log, q.auth, func(ctx context.Context, arg database.DeleteExternalAuthLinkParams) (database.ExternalAuthLink, error) {
 //nolint:gosimple
 return q.db.GetExternalAuthLink(ctx, database.GetExternalAuthLinkParams{UserID: arg.UserID, ProviderID: arg.ProviderID})
 }, q.db.DeleteExternalAuthLink)(ctx, arg)
 }

 func (q *querier) DeleteGitSSHKey(ctx context.Context, userID uuid.UUID) error {
 return deleteQ(q.log, q.auth, q.db.GetGitSSHKey, q.db.DeleteGitSSHKey)(ctx, userID)
 }
 }

 func (q *querier) GetExternalAuthLinksByUserID(ctx context.Context, userID uuid.UUID) ([]database.ExternalAuthLink, error) {
 if err := q.authorizeContext(ctx, rbac.ActionRead, rbac.ResourceSystem); err != nil {
 return nil, err
 }
 return q.db.GetExternalAuthLinksByUserID(ctx, userID)
 return fetchWithPostFilter(q.auth, q.db.GetExternalAuthLinksByUserID)(ctx, userID)
 }

 func (q *querier) GetFileByHashAndCreator(ctx context.Context, arg database.GetFileByHashAndCreatorParams) (database.File, error) {
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
 return ErrUnimplemented
 }

 func (q *FakeQuerier) DeleteExternalAuthLink(_ context.Context, arg database.DeleteExternalAuthLinkParams) error {
 err := validateDatabaseType(arg)
 if err != nil {
 return err
 }

 q.mutex.Lock()
 defer q.mutex.Unlock()

 for index, key := range q.externalAuthLinks {
 if key.UserID != arg.UserID {
 continue
 }
 if key.ProviderID != arg.ProviderID {
 continue
 }
 q.externalAuthLinks[index] = q.externalAuthLinks[len(q.externalAuthLinks)-1]
 q.externalAuthLinks = q.externalAuthLinks[:len(q.externalAuthLinks)-1]
 return nil
 }
 return sql.ErrNoRows
 }

 func (q *FakeQuerier) DeleteGitSSHKey(_ context.Context, userID uuid.UUID) error {
 q.mutex.Lock()
 defer q.mutex.Unlock()
diff --git a/coderd/database/dbmetrics/dbmetrics.go b/coderd/database/dbmetrics/dbmetrics.go
diff --git a/coderd/database/dbmock/dbmock.go b/coderd/database/dbmock/dbmock.go
diff --git a/coderd/database/querier.go b/coderd/database/querier.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/externalauth.sql b/coderd/database/queries/externalauth.sql
 -- name: GetExternalAuthLink :one
 SELECT * FROM external_auth_links WHERE provider_id = $1 AND user_id = $2;

 -- name: DeleteExternalAuthLink :exec
 DELETE FROM external_auth_links WHERE provider_id = $1 AND user_id = $2;

 -- name: GetExternalAuthLinksByUserID :many
 SELECT * FROM external_auth_links WHERE user_id = $1;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -660,14 +660,21 @@ func New(options Options) API {
		r.Get("/{fileID}", api.fileByID)
		r.Post("/", api.postFile)
		})
		r.Route("/external-auth/{externalauth}", func(r chi.Router) {
		r.Route("/external-auth", func(r chi.Router) {
		r.Use(
		apiKeyMiddleware,
		httpmw.ExtractExternalAuthParam(options.ExternalAuthConfigs),
		)
		r.Get("/", api.externalAuthByID)
		r.Post("/device", api.postExternalAuthDeviceByID)
		r.Get("/device", api.externalAuthDeviceByID)
		// Get without a specific external auth ID will return all external auths.
		r.Get("/", api.listUserExternalAuths)
		r.Route("/{externalauth}", func(r chi.Router) {
		r.Use(
		httpmw.ExtractExternalAuthParam(options.ExternalAuthConfigs),
		)
		r.Delete("/", api.deleteExternalAuthByID)
		r.Get("/", api.externalAuthByID)
		r.Post("/device", api.postExternalAuthDeviceByID)
		r.Get("/device", api.externalAuthDeviceByID)
		})
		})
		r.Route("/organizations", func(r chi.Router) {
		r.Use(
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,6 +16,24 @@ import (
		"github.com/coder/coder/v2/provisionersdk/proto"
		)

		func ExternalAuths(auths []database.ExternalAuthLink) []codersdk.ExternalAuthLink {
		out := make([]codersdk.ExternalAuthLink, 0, len(auths))
		for _, auth := range auths {
		out = append(out, ExternalAuth(auth))
		}
		return out
		}

		func ExternalAuth(auth database.ExternalAuthLink) codersdk.ExternalAuthLink {
		return codersdk.ExternalAuthLink{
		ProviderID: auth.ProviderID,
		CreatedAt: auth.CreatedAt,
		UpdatedAt: auth.UpdatedAt,
		HasRefreshToken: auth.OAuthRefreshToken != "",
		Expires: auth.OAuthExpiry,
		}
		}

		func WorkspaceBuildParameters(params []database.WorkspaceBuildParameter) []codersdk.WorkspaceBuildParameter {
		out := make([]codersdk.WorkspaceBuildParameter, len(params))
		for i, p := range params {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -740,6 +740,13 @@ func (q *querier) DeleteCoordinator(ctx context.Context, id uuid.UUID) error {
		return q.db.DeleteCoordinator(ctx, id)
		}

		func (q *querier) DeleteExternalAuthLink(ctx context.Context, arg database.DeleteExternalAuthLinkParams) error {
		return deleteQ(q.log, q.auth, func(ctx context.Context, arg database.DeleteExternalAuthLinkParams) (database.ExternalAuthLink, error) {
		//nolint:gosimple
		return q.db.GetExternalAuthLink(ctx, database.GetExternalAuthLinkParams{UserID: arg.UserID, ProviderID: arg.ProviderID})
		}, q.db.DeleteExternalAuthLink)(ctx, arg)
		}

		func (q *querier) DeleteGitSSHKey(ctx context.Context, userID uuid.UUID) error {
		return deleteQ(q.log, q.auth, q.db.GetGitSSHKey, q.db.DeleteGitSSHKey)(ctx, userID)
		}
Expand DownExpand Up		@@ -975,10 +982,7 @@ func (q *querier) GetExternalAuthLink(ctx context.Context, arg database.GetExter
		}

		func (q *querier) GetExternalAuthLinksByUserID(ctx context.Context, userID uuid.UUID) ([]database.ExternalAuthLink, error) {
		if err := q.authorizeContext(ctx, rbac.ActionRead, rbac.ResourceSystem); err != nil {
		return nil, err
		}
		return q.db.GetExternalAuthLinksByUserID(ctx, userID)
		return fetchWithPostFilter(q.auth, q.db.GetExternalAuthLinksByUserID)(ctx, userID)
		}

		func (q *querier) GetFileByHashAndCreator(ctx context.Context, arg database.GetFileByHashAndCreatorParams) (database.File, error) {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1019,6 +1019,29 @@ func (*FakeQuerier) DeleteCoordinator(context.Context, uuid.UUID) error {
		return ErrUnimplemented
		}

		func (q *FakeQuerier) DeleteExternalAuthLink(_ context.Context, arg database.DeleteExternalAuthLinkParams) error {
		err := validateDatabaseType(arg)
		if err != nil {
		return err
		}

		q.mutex.Lock()
		defer q.mutex.Unlock()

		for index, key := range q.externalAuthLinks {
		if key.UserID != arg.UserID {
		continue
		}
		if key.ProviderID != arg.ProviderID {
		continue
		}
		q.externalAuthLinks[index] = q.externalAuthLinks[len(q.externalAuthLinks)-1]
		q.externalAuthLinks = q.externalAuthLinks[:len(q.externalAuthLinks)-1]
		return nil
		}
		return sql.ErrNoRows
		}

		func (q *FakeQuerier) DeleteGitSSHKey(_ context.Context, userID uuid.UUID) error {
		q.mutex.Lock()
		defer q.mutex.Unlock()
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,9 @@
		-- name: GetExternalAuthLink :one
		SELECT * FROM external_auth_links WHERE provider_id = $1 AND user_id = $2;

		-- name: DeleteExternalAuthLink :exec
		DELETE FROM external_auth_links WHERE provider_id = $1 AND user_id = $2;

		-- name: GetExternalAuthLinksByUserID :many
		SELECT * FROM external_auth_links WHERE user_id = $1;

Expand Down