mirror of
https://git.uploadfilter24.eu/lerentis/terraform-provider-gitea.git
synced 2024-12-04 13:08:11 +00:00
Merge pull request #46 from deblasis/fix/gitea_oauth2_app_confidential_client
Support `gitea_oauth2_app` `confidential_client` flag
This commit is contained in:
commit
340bcd48fe
3 changed files with 39 additions and 18 deletions
|
@ -20,6 +20,10 @@ Handling [gitea oauth application](https://docs.gitea.io/en-us/oauth2-provider/)
|
||||||
- `name` (String) OAuth Application name
|
- `name` (String) OAuth Application name
|
||||||
- `redirect_uris` (Set of String) Accepted redirect URIs
|
- `redirect_uris` (Set of String) Accepted redirect URIs
|
||||||
|
|
||||||
|
### Optional
|
||||||
|
|
||||||
|
- `confidential_client` (Boolean) If set to false, it will be a public client (PKCE will be required)
|
||||||
|
|
||||||
### Read-Only
|
### Read-Only
|
||||||
|
|
||||||
- `client_id` (String) OAuth2 Application client id
|
- `client_id` (String) OAuth2 Application client id
|
||||||
|
|
|
@ -8,10 +8,11 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
oauth2KeyName string = "name"
|
oauth2KeyName string = "name"
|
||||||
oauth2KeyRedirectURIs string = "redirect_uris"
|
oauth2KeyConfidentialClient string = "confidential_client"
|
||||||
oauth2KeyClientId string = "client_id"
|
oauth2KeyRedirectURIs string = "redirect_uris"
|
||||||
oauth2KeyClientSecret string = "client_secret"
|
oauth2KeyClientId string = "client_id"
|
||||||
|
oauth2KeyClientSecret string = "client_secret"
|
||||||
)
|
)
|
||||||
|
|
||||||
func resourceGiteaOauthApp() *schema.Resource {
|
func resourceGiteaOauthApp() *schema.Resource {
|
||||||
|
@ -37,6 +38,12 @@ func resourceGiteaOauthApp() *schema.Resource {
|
||||||
},
|
},
|
||||||
Description: "Accepted redirect URIs",
|
Description: "Accepted redirect URIs",
|
||||||
},
|
},
|
||||||
|
oauth2KeyConfidentialClient: {
|
||||||
|
Type: schema.TypeBool,
|
||||||
|
Optional: true,
|
||||||
|
Default: false,
|
||||||
|
Description: "If set to false, it will be a public client (PKCE will be required)",
|
||||||
|
},
|
||||||
oauth2KeyClientId: {
|
oauth2KeyClientId: {
|
||||||
Type: schema.TypeString,
|
Type: schema.TypeString,
|
||||||
Computed: true,
|
Computed: true,
|
||||||
|
@ -89,9 +96,16 @@ func resourceOauth2AppUpcreate(d *schema.ResourceData, meta interface{}) (err er
|
||||||
return fmt.Errorf("attribute %s must be set and must be a string", oauth2KeyName)
|
return fmt.Errorf("attribute %s must be set and must be a string", oauth2KeyName)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
confidentialClient, confidentialClientOk := d.Get(oauth2KeyConfidentialClient).(bool)
|
||||||
|
|
||||||
|
if !confidentialClientOk {
|
||||||
|
return fmt.Errorf("attribute %s must be set and must be a bool", oauth2KeyConfidentialClient)
|
||||||
|
}
|
||||||
|
|
||||||
opts := gitea.CreateOauth2Option{
|
opts := gitea.CreateOauth2Option{
|
||||||
Name: name,
|
Name: name,
|
||||||
RedirectURIs: redirectURIs,
|
ConfidentialClient: confidentialClient,
|
||||||
|
RedirectURIs: redirectURIs,
|
||||||
}
|
}
|
||||||
|
|
||||||
var oauth2 *gitea.Oauth2
|
var oauth2 *gitea.Oauth2
|
||||||
|
@ -99,7 +113,7 @@ func resourceOauth2AppUpcreate(d *schema.ResourceData, meta interface{}) (err er
|
||||||
if d.IsNewResource() {
|
if d.IsNewResource() {
|
||||||
oauth2, _, err = client.CreateOauth2(opts)
|
oauth2, _, err = client.CreateOauth2(opts)
|
||||||
} else {
|
} else {
|
||||||
oauth2, err := searchOauth2AppByClientId(client, d.Id())
|
oauth2, err = searchOauth2AppByClientId(client, d.Id())
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
@ -176,9 +190,10 @@ func setOAuth2ResourceData(app *gitea.Oauth2, d *schema.ResourceData) (err error
|
||||||
d.SetId(app.ClientID)
|
d.SetId(app.ClientID)
|
||||||
|
|
||||||
for k, v := range map[string]interface{}{
|
for k, v := range map[string]interface{}{
|
||||||
oauth2KeyName: app.Name,
|
oauth2KeyName: app.Name,
|
||||||
oauth2KeyRedirectURIs: schema.NewSet(schema.HashString, CollapseStringList(app.RedirectURIs)),
|
oauth2KeyConfidentialClient: app.ConfidentialClient,
|
||||||
oauth2KeyClientId: app.ClientID,
|
oauth2KeyRedirectURIs: schema.NewSet(schema.HashString, CollapseStringList(app.RedirectURIs)),
|
||||||
|
oauth2KeyClientId: app.ClientID,
|
||||||
} {
|
} {
|
||||||
err = d.Set(k, v)
|
err = d.Set(k, v)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
18
vendor/code.gitea.io/sdk/gitea/oauth2.go
generated
vendored
18
vendor/code.gitea.io/sdk/gitea/oauth2.go
generated
vendored
|
@ -13,12 +13,13 @@ import (
|
||||||
|
|
||||||
// Oauth2 represents an Oauth2 Application
|
// Oauth2 represents an Oauth2 Application
|
||||||
type Oauth2 struct {
|
type Oauth2 struct {
|
||||||
ID int64 `json:"id"`
|
ID int64 `json:"id"`
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
ClientID string `json:"client_id"`
|
ClientID string `json:"client_id"`
|
||||||
ClientSecret string `json:"client_secret"`
|
ClientSecret string `json:"client_secret"`
|
||||||
RedirectURIs []string `json:"redirect_uris"`
|
RedirectURIs []string `json:"redirect_uris"`
|
||||||
Created time.Time `json:"created"`
|
ConfidentialClient bool `json:"confidential_client"`
|
||||||
|
Created time.Time `json:"created"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// ListOauth2Option for listing Oauth2 Applications
|
// ListOauth2Option for listing Oauth2 Applications
|
||||||
|
@ -28,8 +29,9 @@ type ListOauth2Option struct {
|
||||||
|
|
||||||
// CreateOauth2Option required options for creating an Application
|
// CreateOauth2Option required options for creating an Application
|
||||||
type CreateOauth2Option struct {
|
type CreateOauth2Option struct {
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
RedirectURIs []string `json:"redirect_uris"`
|
ConfidentialClient bool `json:"confidential_client"`
|
||||||
|
RedirectURIs []string `json:"redirect_uris"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// CreateOauth2 create an Oauth2 Application and returns a completed Oauth2 object.
|
// CreateOauth2 create an Oauth2 Application and returns a completed Oauth2 object.
|
||||||
|
|
Loading…
Reference in a new issue