Skip to content

feat: add option to remove the link/unlink section in the user settings #464

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

Open
johannes-kirchner wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −7
Open

feat: add option to remove the link/unlink section in the user settings #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,9 @@ oidc.discovery-url:
oidc.group-claim-name:
# The name of the group that should receive admin rights
oidc.admin-group:
# If set to true, users will not be able to unlink their OIDC accounts from the settings page.
# This ensures users remain authenticated through the configured identity provider.
oidc.disable-unlink-account: false

# Instance name
# Set your own custom name to be displayed instead of 'Opengist'
Expand Down
13 changes: 7 additions & 6 deletions internal/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,13 @@ type config struct {
GiteaUrl string `yaml:"gitea.url" env:"OG_GITEA_URL"`
GiteaName string `yaml:"gitea.name" env:"OG_GITEA_NAME"`

OIDCProviderName string `yaml:"oidc.provider-name" env:"OG_OIDC_PROVIDER_NAME"`
OIDCClientKey string `yaml:"oidc.client-key" env:"OG_OIDC_CLIENT_KEY"`
OIDCSecret string `yaml:"oidc.secret" env:"OG_OIDC_SECRET"`
OIDCDiscoveryUrl string `yaml:"oidc.discovery-url" env:"OG_OIDC_DISCOVERY_URL"`
OIDCGroupClaimName string `yaml:"oidc.group-claim-name" env:"OG_OIDC_GROUP_CLAIM_NAME"`
OIDCAdminGroup string `yaml:"oidc.admin-group" env:"OG_OIDC_ADMIN_GROUP"`
OIDCProviderName string `yaml:"oidc.provider-name" env:"OG_OIDC_PROVIDER_NAME"`
OIDCClientKey string `yaml:"oidc.client-key" env:"OG_OIDC_CLIENT_KEY"`
OIDCSecret string `yaml:"oidc.secret" env:"OG_OIDC_SECRET"`
OIDCDiscoveryUrl string `yaml:"oidc.discovery-url" env:"OG_OIDC_DISCOVERY_URL"`
OIDCGroupClaimName string `yaml:"oidc.group-claim-name" env:"OG_OIDC_GROUP_CLAIM_NAME"`
OIDCAdminGroup string `yaml:"oidc.admin-group" env:"OG_OIDC_ADMIN_GROUP"`
OIDCDisableUnlinkAccount bool `yaml:"oidc.disable-unlink-account" env:"OG_OIDC_DISABLE_UNLINK_ACCOUNT"`

MetricsEnabled bool `yaml:"metrics.enabled" env:"OG_METRICS_ENABLED"`

Expand Down
2 changes: 2 additions & 0 deletions internal/web/handlers/settings/settings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package settings

import (
"github.com/thomiceli/opengist/internal/config"
"github.com/thomiceli/opengist/internal/db"
"github.com/thomiceli/opengist/internal/web/context"
)
Expand Down Expand Up @@ -29,6 +30,7 @@ func UserSettings(ctx *context.Context) error {
ctx.SetData("hasTotp", hasTotp)
ctx.SetData("hasPassword", user.Password != "")
ctx.SetData("disableForm", ctx.GetData("DisableLoginForm"))
ctx.SetData("disableUnlinkAccount", config.C.OIDCDisableUnlinkAccount)
ctx.SetData("htmlTitle", ctx.TrH("settings"))
return ctx.Html("settings.html")
}
2 changes: 1 addition & 1 deletion templates/pages/settings.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ <h3 class="text-sm text-gray-600 dark:text-gray-400 italic mb-4">
</form>
</div>
</div>
{{ if or .githubOauth .gitlabOauth .giteaOauth .oidcOauth }}
{{ if and (or .githubOauth .gitlabOauth .giteaOauth .oidcOauth) (not .disableUnlinkAccount) }}
<div class="w-full">
<div class="bg-white dark:bg-gray-900 rounded-md border border-1 border-gray-200 dark:border-gray-700 py-8 px-4 shadow sm:rounded-lg sm:px-10">
<h2 class="text-md font-bold text-slate-700 dark:text-slate-300 mb-2">
Expand Down