Skip to content
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

CLI support for OAuth sources custom icons #14166

Merged
merged 11 commits into from
Dec 28, 2020
Merged

CLI support for OAuth sources custom icons #14166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0109a9b
Fix creating OAuth2 auth source from CLI
Dec 22, 2020
0497101
Fix MR discussions
Dec 23, 2020
6cc8df8
Fix typo
daniil-pankratov Dec 24, 2020
f5d57a9
Fix typo in comment
daniil-pankratov Dec 24, 2020
c9187e2
Merge branch 'master' into master
lunny Dec 24, 2020
5d75e72
Merge branch 'master' into master
zeripath Dec 24, 2020
c8819d2
Change comment
daniil-pankratov Dec 24, 2020
4439e52
Fix heatmap total contributions (#14141)
lunny Dec 24, 2020
529a326
Disable Fomantic's custom scrollbars (#14109)
silverwind Dec 24, 2020
c0db5f3
Merge branch 'gitea-master'
daniil-pankratov Dec 28, 2020
8cb9220
CLI support for OAuth sources custom icons
daniil-pankratov Dec 28, 2020
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
10 changes: 10 additions & 0 deletions cmd/admin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,11 @@ var (
Value: "",
Usage: "Use a custom Email URL (option for GitHub)",
},
cli.StringFlag{
Name: "icon-url",
Value: "",
Usage: "Custom icon URL for OAuth2 login source",
},
}

microcmdAuthUpdateOauth = cli.Command{
Expand Down Expand Up @@ -606,6 +611,7 @@ func parseOAuth2Config(c *cli.Context) *models.OAuth2Config {
ClientSecret: c.String("secret"),
OpenIDConnectAutoDiscoveryURL: c.String("auto-discover-url"),
CustomURLMapping: customURLMapping,
IconURL: c.String("icon-url"),
}
}

Expand Down Expand Up @@ -658,6 +664,10 @@ func runUpdateOauth(c *cli.Context) error {
oAuth2Config.OpenIDConnectAutoDiscoveryURL = c.String("auto-discover-url")
}

if c.IsSet("icon-url") {
oAuth2Config.IconURL = c.String("icon-url")
}

// update custom URL mapping
var customURLMapping = &oauth2.CustomURLMapping{}

Expand Down
4 changes: 3 additions & 1 deletion docs/content/doc/usage/command-line.en-us.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ Admin operations:
- `--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-email-url`: Use a custom Email URL (option for GitHub).
- `--icon-url`: Custom icon URL for OAuth2 login source.
- Examples:
- `gitea admin auth add-oauth --name external-github --provider github --key OBTAIN_FROM_SOURCE --secret OBTAIN_FROM_SOURCE`
- `update-oauth`:
Expand All @@ -129,6 +130,7 @@ Admin operations:
- `--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-email-url`: Use a custom Email URL (option for GitHub).
- `--icon-url`: Custom icon URL for OAuth2 login source.
- Examples:
- `gitea admin auth update-oauth --id 1 --name external-github-updated`
- `add-ldap`: Add new LDAP (via Bind DN) authentication source
Expand Down Expand Up @@ -465,4 +467,4 @@ Restore-repo restore repository data from disk dir:
- `--repo_dir dir`, `-r dir`: Repository dir path to restore from
- `--owner_name lunny`: Restore destination owner name
- `--repo_name tango`: Restore destination repository name
- `--units <units>`: Which items will be restored, one or more units should be separated as comma. wiki, issues, labels, releases, release_assets, milestones, pull_requests, comments are allowed. Empty means all units.
- `--units <units>`: Which items will be restored, one or more units should be separated as comma. wiki, issues, labels, releases, release_assets, milestones, pull_requests, comments are allowed. Empty means all units.