399b15abeb
* TestCreateClient was missing test coverage on error cases * Fixed bug where 500s were being reported for bad requests * changed function signature of NewAdminAPI back to old way of passing in lots of repos: passing in a DbMap made it difficult to test * added swappable ID and Secret generators when creating Clients
83 lines
1.8 KiB
Go
83 lines
1.8 KiB
Go
package adminschema
|
|
|
|
import (
|
|
"errors"
|
|
"net/url"
|
|
|
|
"github.com/coreos/dex/client"
|
|
"github.com/coreos/go-oidc/oidc"
|
|
)
|
|
|
|
var (
|
|
ErrorNoRedirectURI = errors.New("No Redirect URIs")
|
|
ErrorInvalidRedirectURI = errors.New("Invalid Redirect URI")
|
|
ErrorInvalidLogoURI = errors.New("Invalid Logo URI")
|
|
ErrorInvalidClientURI = errors.New("Invalid Client URI")
|
|
)
|
|
|
|
func MapSchemaClientToClient(sc Client) (client.Client, error) {
|
|
c := client.Client{
|
|
Credentials: oidc.ClientCredentials{
|
|
ID: sc.Id,
|
|
Secret: sc.Secret,
|
|
},
|
|
Metadata: oidc.ClientMetadata{
|
|
RedirectURIs: make([]url.URL, len(sc.RedirectURIs)),
|
|
},
|
|
}
|
|
for i, ru := range sc.RedirectURIs {
|
|
if ru == "" {
|
|
return client.Client{}, ErrorNoRedirectURI
|
|
}
|
|
|
|
u, err := url.Parse(ru)
|
|
if err != nil {
|
|
return client.Client{}, ErrorInvalidRedirectURI
|
|
}
|
|
|
|
c.Metadata.RedirectURIs[i] = *u
|
|
}
|
|
|
|
c.Metadata.ClientName = sc.ClientName
|
|
|
|
if sc.LogoURI != "" {
|
|
logoURI, err := url.Parse(sc.LogoURI)
|
|
if err != nil {
|
|
return client.Client{}, ErrorInvalidLogoURI
|
|
}
|
|
c.Metadata.LogoURI = logoURI
|
|
}
|
|
|
|
if sc.ClientURI != "" {
|
|
clientURI, err := url.Parse(sc.ClientURI)
|
|
if err != nil {
|
|
return client.Client{}, ErrorInvalidClientURI
|
|
}
|
|
c.Metadata.ClientURI = clientURI
|
|
}
|
|
|
|
c.Admin = sc.IsAdmin
|
|
return c, nil
|
|
}
|
|
|
|
func MapClientToSchemaClient(c client.Client) Client {
|
|
cl := Client{
|
|
Id: c.Credentials.ID,
|
|
Secret: c.Credentials.Secret,
|
|
RedirectURIs: make([]string, len(c.Metadata.RedirectURIs)),
|
|
}
|
|
for i, u := range c.Metadata.RedirectURIs {
|
|
cl.RedirectURIs[i] = u.String()
|
|
}
|
|
|
|
cl.ClientName = c.Metadata.ClientName
|
|
|
|
if c.Metadata.LogoURI != nil {
|
|
cl.LogoURI = c.Metadata.LogoURI.String()
|
|
}
|
|
if c.Metadata.ClientURI != nil {
|
|
cl.ClientURI = c.Metadata.ClientURI.String()
|
|
}
|
|
cl.IsAdmin = c.Admin
|
|
return cl
|
|
}
|