Open platform to collect and prioritize feedback
Disable built-in providers on by-tenant basis.
Matt Roberts7d6e2d426ad3
diff --git a/app/actions/oauth.go b/app/actions/oauth.goindex 3160f164d..b6804f4ff 100644--- a/app/actions/oauth.go+++ b/app/actions/oauth.go@@ -47,6 +47,40 @@ func (action *CreateEditOAuthConfig) IsAuthorized(ctx context.Context, user *ent}// Validate if current model is valid+// SetSystemProviderStatus is used to enable/disable built-in OAuth providers+type SetSystemProviderStatus struct {+ Provider string `json:"provider"`+ IsEnabled bool `json:"isEnabled"`+}++// IsAuthorized returns true if current user is authorized to perform this action+func (action *SetSystemProviderStatus) IsAuthorized(ctx context.Context, user *entity.User) bool {+ return user != nil && user.IsAdministrator()+}++// Validate if current model is valid+func (action *SetSystemProviderStatus) Validate(ctx context.Context, user *entity.User) *validate.Result {+ result := validate.Success()++ if !action.IsEnabled {+ tenant := ctx.Value(app.TenantCtxKey).(*entity.Tenant)+ activeProviders := &query.ListActiveOAuthProviders{}+ if err := bus.Dispatch(ctx, activeProviders); err != nil {+ return validate.Failed("Cannot retrieve OAuth providers")+ }++ if !tenant.IsEmailAuthAllowed && len(activeProviders.Result) == 1 {+ result.AddFieldFailure("isEnabled", "You cannot disable this provider with neither email auth nor any other provider enabled.")+ }+ }++ if action.Provider == "" {+ result.AddFieldFailure("provider", "Provider is required.")+ }++ return result+}+func (action *CreateEditOAuthConfig) Validate(ctx context.Context, user *entity.User) *validate.Result {result := validate.Success()diff --git a/app/cmd/routes.go b/app/cmd/routes.goindex 4fdd01da5..ad25fa93c 100644--- a/app/cmd/routes.go+++ b/app/cmd/routes.go@@ -182,6 +182,7 @@ func routes(r *web.Engine) *web.Engine {ui.Post("/_api/admin/settings/privacy", handlers.UpdatePrivacySettings())ui.Post("/_api/admin/settings/emailauth", handlers.UpdateEmailAuthAllowed())ui.Post("/_api/admin/oauth", handlers.SaveOAuthConfig())+ ui.Post("/_api/admin/oauth/:provider/status", handlers.SetSystemProviderStatus())ui.Post("/_api/admin/roles/:role/users", handlers.ChangeUserRole())ui.Put("/_api/admin/users/:userID/block", handlers.BlockUser())ui.Delete("/_api/admin/users/:userID/block", handlers.UnblockUser())diff --git a/app/handlers/admin.go b/app/handlers/admin.goindex 376bebf47..17a4561b7 100644--- a/app/handlers/admin.go+++ b/app/handlers/admin.go@@ -228,3 +228,22 @@ func SaveOAuthConfig() web.HandlerFunc {return c.Ok(web.Map{})}}++// SetSystemProviderStatus is used to enable/disable built-in OAuth providers for a tenant+func SetSystemProviderStatus() web.HandlerFunc {+ return func(c *web.Context) error {+ action := new(actions.SetSystemProviderStatus)+ if result := c.BindTo(action); !result.Ok {+ return c.HandleValidation(result)+ }++ if err := bus.Dispatch(c, &cmd.SetTenantProviderStatus{+ Provider: action.Provider,+ IsEnabled: action.IsEnabled,+ }); err != nil {+ return c.Failure(err)+ }++ return c.Ok(web.Map{})+ }+}diff --git a/app/models/cmd/oauth.go b/app/models/cmd/oauth.goindex d8e8c27f1..2a05f9d47 100644--- a/app/models/cmd/oauth.go+++ b/app/models/cmd/oauth.go@@ -28,3 +28,8 @@ type ParseOAuthRawProfile struct {Result *dto.OAuthUserProfile}++type SetTenantProviderStatus struct {+ Provider string+ IsEnabled bool+}diff --git a/app/models/entity/oauth.go b/app/models/entity/oauth.goindex 3d8d695f8..d0a49fd41 100644--- a/app/models/entity/oauth.go+++ b/app/models/entity/oauth.go@@ -2,6 +2,14 @@ package entityimport "encoding/json"+// TenantProvider represents tenant-level OAuth provider settings+type TenantProvider struct {+ ID int+ TenantID int+ Provider string+ IsEnabled bool+}+// OAuthConfig is the configuration of a custom OAuth providertype OAuthConfig struct {ID intdiff --git a/app/models/query/oauth.go b/app/models/query/oauth.goindex 993486fde..70e8f343a 100644--- a/app/models/query/oauth.go+++ b/app/models/query/oauth.go@@ -46,3 +46,9 @@ type ListActiveOAuthProviders struct {type ListAllOAuthProviders struct {Result []*dto.OAuthProviderOption}++type GetTenantProviderStatus struct {+ Provider string++ Result *entity.TenantProvider+}diff --git a/app/services/oauth/oauth.go b/app/services/oauth/oauth.goindex 80fcc8624..f2bbda77c 100644--- a/app/services/oauth/oauth.go+++ b/app/services/oauth/oauth.go@@ -333,15 +333,26 @@ func listAllOAuthProviders(ctx context.Context, q *query.ListAllOAuthProviders)oauthBaseURL := web.OAuthBaseURL(ctx)for _, p := range oauthProviders.Result {+ isCustomProvider := string(p.Provider[0]) == "_"+ isEnabled := p.Status == enum.OAuthConfigEnabled++ // For built-in (non-custom) providers, check tenant-level override+ if !isCustomProvider && isEnabled {+ tenantStatus := &query.GetTenantProviderStatus{Provider: p.Provider}+ if err := bus.Dispatch(ctx, tenantStatus); err == nil && tenantStatus.Result != nil {+ isEnabled = tenantStatus.Result.IsEnabled+ }+ }+list = append(list, &dto.OAuthProviderOption{Provider: p.Provider,DisplayName: p.DisplayName,ClientID: p.ClientID,URL: fmt.Sprintf("/oauth/%s", p.Provider),CallbackURL: fmt.Sprintf("%s/oauth/%s/callback", oauthBaseURL, p.Provider),- IsCustomProvider: string(p.Provider[0]) == "_",+ IsCustomProvider: isCustomProvider,LogoBlobKey: p.LogoBlobKey,- IsEnabled: p.Status == enum.OAuthConfigEnabled,+ IsEnabled: isEnabled,})}diff --git a/app/services/sqlstore/postgres/postgres.go b/app/services/sqlstore/postgres/postgres.goindex b8bbf9847..948326c0d 100644--- a/app/services/sqlstore/postgres/postgres.go+++ b/app/services/sqlstore/postgres/postgres.go@@ -120,6 +120,8 @@ func (s Service) Init() {bus.AddHandler(listCustomOAuthConfig)bus.AddHandler(getCustomOAuthConfigByProvider)bus.AddHandler(saveCustomOAuthConfig)+ bus.AddHandler(getTenantProviderStatus)+ bus.AddHandler(setTenantProviderStatus)bus.AddHandler(getWebhook)bus.AddHandler(listAllWebhooks)diff --git a/app/services/sqlstore/postgres/tenant_provider.go b/app/services/sqlstore/postgres/tenant_provider.gonew file mode 100644index 000000000..b759e2359--- /dev/null+++ b/app/services/sqlstore/postgres/tenant_provider.go@@ -0,0 +1,82 @@+package postgres++import (+ "context"++ "github.com/getfider/fider/app"+ "github.com/getfider/fider/app/models/cmd"+ "github.com/getfider/fider/app/models/entity"+ "github.com/getfider/fider/app/models/query"+ "github.com/getfider/fider/app/pkg/dbx"+ "github.com/getfider/fider/app/pkg/errors"+)++type dbTenantProvider struct {+ ID int `db:"id"`+ TenantID int `db:"tenant_id"`+ Provider string `db:"provider"`+ IsEnabled bool `db:"is_enabled"`+}++func (m *dbTenantProvider) toModel() *entity.TenantProvider {+ return &entity.TenantProvider{+ ID: m.ID,+ TenantID: m.TenantID,+ Provider: m.Provider,+ IsEnabled: m.IsEnabled,+ }+}++func getTenantProviderStatus(ctx context.Context, q *query.GetTenantProviderStatus) error {+ return using(ctx, func(trx *dbx.Trx, tenant *entity.Tenant, user *entity.User) error {+ if tenant == nil {+ return app.ErrNotFound+ }++ tp := &dbTenantProvider{}+ err := trx.Get(tp, `+ SELECT id, tenant_id, provider, is_enabled+ FROM tenant_providers+ WHERE tenant_id = $1 AND provider = $2+ `, tenant.ID, q.Provider)++ if err != nil {+ if errors.Cause(err) == app.ErrNotFound {+ // If no record exists, assume it's enabled (default behavior)+ q.Result = &entity.TenantProvider{+ TenantID: tenant.ID,+ Provider: q.Provider,+ IsEnabled: true,+ }+ return nil+ }+ return errors.Wrap(err, "failed to get tenant provider status")+ }++ q.Result = tp.toModel()+ return nil+ })+}++func setTenantProviderStatus(ctx context.Context, c *cmd.SetTenantProviderStatus) error {+ return using(ctx, func(trx *dbx.Trx, tenant *entity.Tenant, user *entity.User) error {+ if tenant == nil {+ return app.ErrNotFound+ }++ // Insert or update the tenant provider status+ query := `+ INSERT INTO tenant_providers (tenant_id, provider, is_enabled, created_at)+ VALUES ($1, $2, $3, NOW())+ ON CONFLICT (tenant_id, provider)+ DO UPDATE SET is_enabled = $3+ `++ _, err := trx.Execute(query, tenant.ID, c.Provider, c.IsEnabled)+ if err != nil {+ return errors.Wrap(err, "failed to set tenant provider status")+ }++ return nil+ })+}diff --git a/migrations/202510241300_add_tenant_providers.sql b/migrations/202510241300_add_tenant_providers.sqlnew file mode 100644index 000000000..096712382--- /dev/null+++ b/migrations/202510241300_add_tenant_providers.sql@@ -0,0 +1,11 @@+CREATE TABLE tenant_providers (+ id SERIAL PRIMARY KEY,+ tenant_id INT NOT NULL,+ provider VARCHAR(40) NOT NULL,+ is_enabled BOOLEAN NOT NULL DEFAULT true,+ created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),+ UNIQUE (tenant_id, provider),+ FOREIGN KEY (tenant_id) REFERENCES tenants(id) ON DELETE CASCADE+);++CREATE INDEX idx_tenant_providers_tenant_id ON tenant_providers(tenant_id);diff --git a/public/pages/Administration/pages/ManageAuthentication.page.tsx b/public/pages/Administration/pages/ManageAuthentication.page.tsxindex 7094021d7..09b88b3fc 100644--- a/public/pages/Administration/pages/ManageAuthentication.page.tsx+++ b/public/pages/Administration/pages/ManageAuthentication.page.tsx@@ -82,6 +82,17 @@ export default class ManageAuthenticationPage extends AdminBasePage<ManageAuthen)}+ private toggleSystemProvider = async (provider: OAuthProviderOption, active: boolean) => {+ const response = await actions.setSystemProviderStatus(provider.provider, active)+ if (response.ok) {+ provider.isEnabled = active+ this.forceUpdate()+ notify.success(`Successfully ${active ? "enabled" : "disabled"} ${provider.displayName}.`)+ } else {+ notify.error(`Unable to ${active ? "enable" : "disable"} ${provider.displayName}.`)+ }+ }+public content() {let enabledProvidersCount = 0for (const o of this.props.providers) {@@ -143,25 +154,43 @@ export default class ManageAuthenticationPage extends AdminBasePage<ManageAuthen<OAuthProviderLogo option={o} /><strong>{o.displayName}</strong></HStack>- {o.isCustomProvider && (- <HStack>- {Fider.session.user.isAdministrator && (- <Button onClick={this.edit.bind(this, o.provider)} size="small">- <Icon sprite={IconPencilAlt} />- <span>Edit</span>- </Button>- )}+ <HStack>+ {o.isCustomProvider && Fider.session.user.isAdministrator && (+ <Button onClick={this.edit.bind(this, o.provider)} size="small">+ <Icon sprite={IconPencilAlt} />+ <span>Edit</span>+ </Button>+ )}+ {o.isEnabled && (<Button onClick={this.startTest.bind(this, o.provider)} size="small"><Icon sprite={IconPlay} /><span>Test</span></Button>- </HStack>- )}+ )}+ </HStack></HStack>- <div className="text-xs block my-1">{o.isEnabled ? enabled : disabled}</div>+ {!o.isCustomProvider && o.clientID && Fider.session.user.isAdministrator && (+ <div className="mt-2">+ <Toggle+ field={`provider-${o.provider}`}+ label={o.isEnabled ? "Enabled" : "Disabled"}+ disabled={cantDisable && o.isEnabled}+ active={o.isEnabled}+ onToggle={this.toggleSystemProvider.bind(this, o)}+ />+ </div>+ )}{o.isCustomProvider && (- <span className="text-muted">- <strong>Client ID:</strong> {o.clientID} <br />+ <>+ <div className="text-xs block my-1">{o.isEnabled ? enabled : disabled}</div>+ <span className="text-muted">+ <strong>Client ID:</strong> {o.clientID} <br />+ <strong>Callback URL:</strong> {o.callbackURL}+ </span>+ </>+ )}+ {!o.isCustomProvider && o.clientID && (+ <span className="text-muted block mt-1"><strong>Callback URL:</strong> {o.callbackURL}</span>)}diff --git a/public/services/actions/tenant.ts b/public/services/actions/tenant.tsindex 7fb4979fc..12c6d9eec 100644--- a/public/services/actions/tenant.ts+++ b/public/services/actions/tenant.ts@@ -107,3 +107,7 @@ export interface CreateEditOAuthConfigRequest {export const saveOAuthConfig = async (request: CreateEditOAuthConfigRequest): Promise<Result> => {return await http.post("/_api/admin/oauth", request)}++export const setSystemProviderStatus = async (provider: string, isEnabled: boolean): Promise<Result> => {+ return await http.post(`/_api/admin/oauth/${provider}/status`, { provider, isEnabled })+}