feat: SSO auto register (close #4692 in #4795)

Co-authored-by: Andy Hsu <i@nn.ci>
AlistGo · Jul 20, 2023 · de8f9e9 · de8f9e9
1 parent cace9db
commit de8f9e9
Show file tree

Hide file tree

Showing 4 changed files with 190 additions and 140 deletions.
diff --git a/internal/bootstrap/data/setting.go b/internal/bootstrap/data/setting.go
@@ -154,13 +154,16 @@ func InitialSettings() []model.SettingItem {
 
  // SSO settings
  {Key: conf.SSOLoginEnabled, Value: "false", Type: conf.TypeBool, Group: model.SSO, Flag: model.PUBLIC},
- {Key: conf.SSOLoginplatform, Type: conf.TypeSelect, Options: "Casdoor,Github,Microsoft,Google,Dingtalk,OIDC", Group: model.SSO, Flag: model.PUBLIC},
+ {Key: conf.SSOLoginPlatform, Type: conf.TypeSelect, Options: "Casdoor,Github,Microsoft,Google,Dingtalk,OIDC", Group: model.SSO, Flag: model.PUBLIC},
  {Key: conf.SSOClientId, Value: "", Type: conf.TypeString, Group: model.SSO, Flag: model.PRIVATE},
  {Key: conf.SSOClientSecret, Value: "", Type: conf.TypeString, Group: model.SSO, Flag: model.PRIVATE},
  {Key: conf.SSOOrganizationName, Value: "", Type: conf.TypeString, Group: model.SSO, Flag: model.PRIVATE},
  {Key: conf.SSOApplicationName, Value: "", Type: conf.TypeString, Group: model.SSO, Flag: model.PRIVATE},
  {Key: conf.SSOEndpointName, Value: "", Type: conf.TypeString, Group: model.SSO, Flag: model.PRIVATE},
  {Key: conf.SSOJwtPublicKey, Value: "", Type: conf.TypeString, Group: model.SSO, Flag: model.PRIVATE},
+ {Key: conf.SSOAutoRegister, Value: "false", Type: conf.TypeBool, Group: model.SSO, Flag: model.PRIVATE},
+ {Key: conf.SSODefaultDir, Value: "/", Type: conf.TypeString, Group: model.SSO, Flag: model.PRIVATE},
+ {Key: conf.SSODefaultPermission, Value: "0", Type: conf.TypeNumber, Group: model.SSO, Flag: model.PRIVATE},
 
  // qbittorrent settings
  {Key: conf.QbittorrentUrl, Value: "http://admin:adminadmin@localhost:8080/", Type: conf.TypeString, Group: model.SINGLE, Flag: model.PRIVATE},

diff --git a/internal/conf/const.go b/internal/conf/const.go
@@ -57,14 +57,17 @@ const (
  IndexProgress = "index_progress"
 
  //SSO
- SSOClientId = "sso_client_id"
- SSOClientSecret = "sso_client_secret"
- SSOLoginEnabled = "sso_login_enabled"
- SSOLoginplatform = "sso_login_platform"
- SSOOrganizationName = "sso_organization_name"
- SSOApplicationName = "sso_application_name"
- SSOEndpointName = "sso_endpoint_name"
- SSOJwtPublicKey = "sso_jwt_public_key"
+ SSOClientId = "sso_client_id"
+ SSOClientSecret = "sso_client_secret"
+ SSOLoginEnabled = "sso_login_enabled"
+ SSOLoginPlatform = "sso_login_platform"
+ SSOOrganizationName = "sso_organization_name"
+ SSOApplicationName = "sso_application_name"
+ SSOEndpointName = "sso_endpoint_name"
+ SSOJwtPublicKey = "sso_jwt_public_key"
+ SSOAutoRegister = "sso_auto_register"
+ SSODefaultDir = "sso_default_dir"
+ SSODefaultPermission = "sso_default_permission"
 
  // qbittorrent
  QbittorrentUrl = "qbittorrent_url"

diff --git a/internal/model/user.go b/internal/model/user.go
@@ -33,7 +33,7 @@ type User struct {
  // 10: can add qbittorrent tasks
  Permission int32 `json:"permission"`
  OtpSecret string `json:"-"`
- SsoID string `json:"sso_id"`
+ SsoID string `json:"sso_id"` // unique by sso platform
 }
 
 func (u User) IsGuest() bool {