mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-11 20:27:32 +00:00
1b2fd23e0b
# Which Problems Are Solved When retrieving the information of an IdP intent, depending on the IdP type (e.g. Apple), there was issue when mapping the stored (event) information back to the specific IdP type, potentially leading to a panic. # How the Problems Are Solved - Correctly initialize the user struct to map the information to. # Additional Changes none # Additional Context - reported by a support request - needs backport to 3.x and 2.x
52 lines
1.4 KiB
Go
52 lines
1.4 KiB
Go
package google
|
|
|
|
import (
|
|
openid "github.com/zitadel/oidc/v3/pkg/oidc"
|
|
|
|
"github.com/zitadel/zitadel/internal/idp"
|
|
"github.com/zitadel/zitadel/internal/idp/providers/oidc"
|
|
)
|
|
|
|
const (
|
|
issuer = "https://accounts.google.com"
|
|
name = "Google"
|
|
)
|
|
|
|
var _ idp.Provider = (*Provider)(nil)
|
|
|
|
// Provider is the [idp.Provider] implementation for Google
|
|
type Provider struct {
|
|
*oidc.Provider
|
|
}
|
|
|
|
// New creates a Google provider using the [oidc.Provider] (OIDC generic provider)
|
|
func New(clientID, clientSecret, redirectURI string, scopes []string, opts ...oidc.ProviderOpts) (*Provider, error) {
|
|
rp, err := oidc.New(name, issuer, clientID, clientSecret, redirectURI, scopes, userMapper, append(opts, oidc.WithSelectAccount())...)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &Provider{
|
|
Provider: rp,
|
|
}, nil
|
|
}
|
|
|
|
var userMapper = func(info *openid.UserInfo) idp.User {
|
|
return &User{oidc.DefaultMapper(info)}
|
|
}
|
|
|
|
func InitUser() idp.User {
|
|
return &User{oidc.InitUser()}
|
|
}
|
|
|
|
// User is a representation of the authenticated Google and implements the [idp.User] interface
|
|
// by wrapping an [idp.User] (implemented by [oidc.User]). It overwrites the [GetPreferredUsername] to use the `email` claim.
|
|
type User struct {
|
|
idp.User
|
|
}
|
|
|
|
// GetPreferredUsername implements the [idp.User] interface.
|
|
// It returns the email, because Google does not return a username.
|
|
func (u *User) GetPreferredUsername() string {
|
|
return string(u.GetEmail())
|
|
}
|