mirror of
https://github.com/go-gitea/gitea
synced 2024-09-11 00:47:00 +02:00
parent
50111c71c3
commit
c13eb8e6b3
11
cmd/admin.go
11
cmd/admin.go
@ -308,6 +308,11 @@ var (
|
|||||||
Value: "false",
|
Value: "false",
|
||||||
Usage: "Use custom URLs for GitLab/GitHub OAuth endpoints",
|
Usage: "Use custom URLs for GitLab/GitHub OAuth endpoints",
|
||||||
},
|
},
|
||||||
|
cli.StringFlag{
|
||||||
|
Name: "custom-tenant-id",
|
||||||
|
Value: "",
|
||||||
|
Usage: "Use custom Tenant ID for OAuth endpoints",
|
||||||
|
},
|
||||||
cli.StringFlag{
|
cli.StringFlag{
|
||||||
Name: "custom-auth-url",
|
Name: "custom-auth-url",
|
||||||
Value: "",
|
Value: "",
|
||||||
@ -829,6 +834,7 @@ func parseOAuth2Config(c *cli.Context) *oauth2.Source {
|
|||||||
AuthURL: c.String("custom-auth-url"),
|
AuthURL: c.String("custom-auth-url"),
|
||||||
ProfileURL: c.String("custom-profile-url"),
|
ProfileURL: c.String("custom-profile-url"),
|
||||||
EmailURL: c.String("custom-email-url"),
|
EmailURL: c.String("custom-email-url"),
|
||||||
|
Tenant: c.String("custom-tenant-id"),
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
customURLMapping = nil
|
customURLMapping = nil
|
||||||
@ -938,6 +944,7 @@ func runUpdateOauth(c *cli.Context) error {
|
|||||||
customURLMapping.AuthURL = oAuth2Config.CustomURLMapping.AuthURL
|
customURLMapping.AuthURL = oAuth2Config.CustomURLMapping.AuthURL
|
||||||
customURLMapping.ProfileURL = oAuth2Config.CustomURLMapping.ProfileURL
|
customURLMapping.ProfileURL = oAuth2Config.CustomURLMapping.ProfileURL
|
||||||
customURLMapping.EmailURL = oAuth2Config.CustomURLMapping.EmailURL
|
customURLMapping.EmailURL = oAuth2Config.CustomURLMapping.EmailURL
|
||||||
|
customURLMapping.Tenant = oAuth2Config.CustomURLMapping.Tenant
|
||||||
}
|
}
|
||||||
if c.IsSet("use-custom-urls") && c.IsSet("custom-token-url") {
|
if c.IsSet("use-custom-urls") && c.IsSet("custom-token-url") {
|
||||||
customURLMapping.TokenURL = c.String("custom-token-url")
|
customURLMapping.TokenURL = c.String("custom-token-url")
|
||||||
@ -955,6 +962,10 @@ func runUpdateOauth(c *cli.Context) error {
|
|||||||
customURLMapping.EmailURL = c.String("custom-email-url")
|
customURLMapping.EmailURL = c.String("custom-email-url")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if c.IsSet("use-custom-urls") && c.IsSet("custom-tenant-id") {
|
||||||
|
customURLMapping.Tenant = c.String("custom-tenant-id")
|
||||||
|
}
|
||||||
|
|
||||||
oAuth2Config.CustomURLMapping = customURLMapping
|
oAuth2Config.CustomURLMapping = customURLMapping
|
||||||
source.Cfg = oAuth2Config
|
source.Cfg = oAuth2Config
|
||||||
|
|
||||||
|
@ -124,6 +124,7 @@ Admin operations:
|
|||||||
- `--secret`: Client Secret.
|
- `--secret`: Client Secret.
|
||||||
- `--auto-discover-url`: OpenID Connect Auto Discovery URL (only required when using OpenID Connect as provider).
|
- `--auto-discover-url`: OpenID Connect Auto Discovery URL (only required when using OpenID Connect as provider).
|
||||||
- `--use-custom-urls`: Use custom URLs for GitLab/GitHub OAuth endpoints.
|
- `--use-custom-urls`: Use custom URLs for GitLab/GitHub OAuth endpoints.
|
||||||
|
- `--custom-tenant-id`: Use custom Tenant ID for OAuth endpoints.
|
||||||
- `--custom-auth-url`: Use a custom Authorization URL (option for GitLab/GitHub).
|
- `--custom-auth-url`: Use a custom Authorization URL (option for GitLab/GitHub).
|
||||||
- `--custom-token-url`: Use a custom Token URL (option for GitLab/GitHub).
|
- `--custom-token-url`: Use a custom Token URL (option for GitLab/GitHub).
|
||||||
- `--custom-profile-url`: Use a custom Profile URL (option for GitLab/GitHub).
|
- `--custom-profile-url`: Use a custom Profile URL (option for GitLab/GitHub).
|
||||||
@ -147,6 +148,7 @@ Admin operations:
|
|||||||
- `--secret`: Client Secret.
|
- `--secret`: Client Secret.
|
||||||
- `--auto-discover-url`: OpenID Connect Auto Discovery URL (only required when using OpenID Connect as provider).
|
- `--auto-discover-url`: OpenID Connect Auto Discovery URL (only required when using OpenID Connect as provider).
|
||||||
- `--use-custom-urls`: Use custom URLs for GitLab/GitHub OAuth endpoints.
|
- `--use-custom-urls`: Use custom URLs for GitLab/GitHub OAuth endpoints.
|
||||||
|
- `--custom-tenant-id`: Use custom Tenant ID for OAuth endpoints.
|
||||||
- `--custom-auth-url`: Use a custom Authorization URL (option for GitLab/GitHub).
|
- `--custom-auth-url`: Use a custom Authorization URL (option for GitLab/GitHub).
|
||||||
- `--custom-token-url`: Use a custom Token URL (option for GitLab/GitHub).
|
- `--custom-token-url`: Use a custom Token URL (option for GitLab/GitHub).
|
||||||
- `--custom-profile-url`: Use a custom Profile URL (option for GitLab/GitHub).
|
- `--custom-profile-url`: Use a custom Profile URL (option for GitLab/GitHub).
|
||||||
|
Loading…
Reference in New Issue
Block a user