mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-22 07:47:29 +00:00
e22689c125
* cleanup todo * pass id token details to oidc * feat(oidc): id token for device authorization This changes updates to the newest oidc version, so the Device Authorization grant can return ID tokens when the scope `openid` is set. There is also some refactoring done, so that the eventstore can be queried directly when polling for state. The projection is cleaned up to a minimum with only data required for the login UI. * try to be explicit wit hthe timezone to fix github * pin oidc v3.8.0 * remove TBD entry
138 lines
4.3 KiB
Go
138 lines
4.3 KiB
Go
package query
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
"errors"
|
|
"time"
|
|
|
|
sq "github.com/Masterminds/squirrel"
|
|
|
|
"github.com/zitadel/zitadel/internal/api/authz"
|
|
"github.com/zitadel/zitadel/internal/database"
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/query/projection"
|
|
"github.com/zitadel/zitadel/internal/telemetry/tracing"
|
|
"github.com/zitadel/zitadel/internal/zerrors"
|
|
)
|
|
|
|
var (
|
|
deviceAuthRequestTable = table{
|
|
name: projection.DeviceAuthRequestProjectionTable,
|
|
instanceIDCol: projection.DeviceAuthRequestColumnInstanceID,
|
|
}
|
|
DeviceAuthRequestColumnClientID = Column{
|
|
name: projection.DeviceAuthRequestColumnClientID,
|
|
table: deviceAuthRequestTable,
|
|
}
|
|
DeviceAuthRequestColumnDeviceCode = Column{
|
|
name: projection.DeviceAuthRequestColumnDeviceCode,
|
|
table: deviceAuthRequestTable,
|
|
}
|
|
DeviceAuthRequestColumnUserCode = Column{
|
|
name: projection.DeviceAuthRequestColumnUserCode,
|
|
table: deviceAuthRequestTable,
|
|
}
|
|
DeviceAuthRequestColumnScopes = Column{
|
|
name: projection.DeviceAuthRequestColumnScopes,
|
|
table: deviceAuthRequestTable,
|
|
}
|
|
DeviceAuthRequestColumnCreationDate = Column{
|
|
name: projection.DeviceAuthRequestColumnCreationDate,
|
|
table: deviceAuthRequestTable,
|
|
}
|
|
DeviceAuthRequestColumnChangeDate = Column{
|
|
name: projection.DeviceAuthRequestColumnChangeDate,
|
|
table: deviceAuthRequestTable,
|
|
}
|
|
DeviceAuthRequestColumnSequence = Column{
|
|
name: projection.DeviceAuthRequestColumnSequence,
|
|
table: deviceAuthRequestTable,
|
|
}
|
|
DeviceAuthRequestColumnInstanceID = Column{
|
|
name: projection.DeviceAuthRequestColumnInstanceID,
|
|
table: deviceAuthRequestTable,
|
|
}
|
|
)
|
|
|
|
type DeviceAuth struct {
|
|
ClientID string
|
|
DeviceCode string
|
|
UserCode string
|
|
Expires time.Time
|
|
Scopes []string
|
|
State domain.DeviceAuthState
|
|
Subject string
|
|
UserAuthMethods []domain.UserAuthMethodType
|
|
AuthTime time.Time
|
|
}
|
|
|
|
// DeviceAuthByDeviceCode gets the current state of a Device Authorization directly from the eventstore.
|
|
func (q *Queries) DeviceAuthByDeviceCode(ctx context.Context, deviceCode string) (deviceAuth *DeviceAuth, err error) {
|
|
ctx, span := tracing.NewSpan(ctx)
|
|
defer func() { span.EndWithError(err) }()
|
|
|
|
model := NewDeviceAuthReadModel(deviceCode, authz.GetInstance(ctx).InstanceID())
|
|
if err := q.eventstore.FilterToQueryReducer(ctx, model); err != nil {
|
|
return nil, err
|
|
}
|
|
if !model.State.Exists() {
|
|
return nil, zerrors.ThrowNotFound(nil, "QUERY-eeR0e", "Errors.DeviceAuth.NotExisting")
|
|
}
|
|
return &model.DeviceAuth, nil
|
|
}
|
|
|
|
// DeviceAuthRequestByUserCode finds a Device Authorization request by User-Code from the `device_auth_requests` projection.
|
|
func (q *Queries) DeviceAuthRequestByUserCode(ctx context.Context, userCode string) (authReq *domain.AuthRequestDevice, err error) {
|
|
ctx, span := tracing.NewSpan(ctx)
|
|
defer func() { span.EndWithError(err) }()
|
|
|
|
stmt, scan := prepareDeviceAuthQuery(ctx, q.client)
|
|
eq := sq.Eq{
|
|
DeviceAuthRequestColumnInstanceID.identifier(): authz.GetInstance(ctx).InstanceID(),
|
|
DeviceAuthRequestColumnUserCode.identifier(): userCode,
|
|
}
|
|
query, args, err := stmt.Where(eq).ToSql()
|
|
if err != nil {
|
|
return nil, zerrors.ThrowInternal(err, "QUERY-Axu7l", "Errors.Query.SQLStatement")
|
|
}
|
|
|
|
err = q.client.QueryRowContext(ctx, func(row *sql.Row) error {
|
|
authReq, err = scan(row)
|
|
return err
|
|
}, query, args...)
|
|
return authReq, err
|
|
}
|
|
|
|
var deviceAuthSelectColumns = []string{
|
|
DeviceAuthRequestColumnClientID.identifier(),
|
|
DeviceAuthRequestColumnDeviceCode.identifier(),
|
|
DeviceAuthRequestColumnUserCode.identifier(),
|
|
DeviceAuthRequestColumnScopes.identifier(),
|
|
}
|
|
|
|
func prepareDeviceAuthQuery(ctx context.Context, db prepareDatabase) (sq.SelectBuilder, func(*sql.Row) (*domain.AuthRequestDevice, error)) {
|
|
return sq.Select(deviceAuthSelectColumns...).From(deviceAuthRequestTable.identifier()).PlaceholderFormat(sq.Dollar),
|
|
func(row *sql.Row) (*domain.AuthRequestDevice, error) {
|
|
dst := new(domain.AuthRequestDevice)
|
|
var (
|
|
scopes database.TextArray[string]
|
|
)
|
|
|
|
err := row.Scan(
|
|
&dst.ClientID,
|
|
&dst.DeviceCode,
|
|
&dst.UserCode,
|
|
&scopes,
|
|
)
|
|
if errors.Is(err, sql.ErrNoRows) {
|
|
return nil, zerrors.ThrowNotFound(err, "QUERY-Sah9a", "Errors.DeviceAuth.NotExisting")
|
|
}
|
|
if err != nil {
|
|
return nil, zerrors.ThrowInternal(err, "QUERY-Voo3o", "Errors.Internal")
|
|
}
|
|
dst.Scopes = scopes
|
|
return dst, nil
|
|
}
|
|
}
|