synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-13 21:36:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(coderd): pass oauth configs to site (#8390)

Browse Source
This commit is contained in:
Mathias Fredriksson
2023-07-10 17:23:41 +03:00
committed by GitHub
parent 9a3d9053a0
commit 90a3debe3f
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
coderd/coderd.go
View File

@ -299,19 +299,20 @@ func New(options *Options) *API {
}, },
) )
oauthConfigs := &httpmw.OAuth2Configs{
Github: options.GithubOAuth2Config,
OIDC: options.OIDCConfig,
}
staticHandler := site.New(&site.Options{ staticHandler := site.New(&site.Options{
BinFS: binFS, BinFS: binFS,
BinHashes: binHashes, BinHashes: binHashes,
Database: options.Database, Database: options.Database,
SiteFS: site.FS(), SiteFS: site.FS(),
OAuth2Configs: oauthConfigs,
}) })
staticHandler.Experiments.Store(&experiments) staticHandler.Experiments.Store(&experiments)
oauthConfigs := &httpmw.OAuth2Configs{
Github: options.GithubOAuth2Config,
OIDC: options.OIDCConfig,
}
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())
r := chi.NewRouter() r := chi.NewRouter()

5
site/site.go
View File

@ -65,6 +65,7 @@ type Options struct {
BinHashes map[string]string BinHashes map[string]string
Database database.Store Database database.Store
SiteFS fs.FS SiteFS fs.FS
OAuth2Configs *httpmw.OAuth2Configs
} }
func New(opts *Options) *Handler { func New(opts *Options) *Handler {
@ -292,6 +293,10 @@ func (h *Handler) renderHTMLWithState(rw http.ResponseWriter, r *http.Request, f
apiKey, actor, _ := httpmw.ExtractAPIKey(rw, r, httpmw.ExtractAPIKeyConfig{ apiKey, actor, _ := httpmw.ExtractAPIKey(rw, r, httpmw.ExtractAPIKeyConfig{
Optional: true, Optional: true,
DB: h.opts.Database, DB: h.opts.Database,
OAuth2Configs: h.opts.OAuth2Configs,
// Special case for site, we can always disable refresh here because
// the frontend will perform API requests if this fails.
DisableSessionExpiryRefresh: true,
}) })
if apiKey != nil && actor != nil { if apiKey != nil && actor != nil {
ctx := dbauthz.As(r.Context(), actor.Actor) ctx := dbauthz.As(r.Context(), actor.Actor)