mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-13 19:44:21 +00:00
9ec9ad4314
# Which Problems Are Solved id_tokens issued for auth requests created through the login UI currently do not provide a sid claim. This is due to the fact that (SSO) sessions for the login UI do not have one and are only computed by the userAgent(ID), the user(ID) and the authentication checks of the latter. This prevents client to track sessions and terminate specific session on the end_session_endpoint. # How the Problems Are Solved - An `id` column is added to the `auth.user_sessions` table. - The `id` (prefixed with `V1_`) is set whenever a session is added or updated to active (from terminated) - The id is passed to the `oidc session` (as v2 sessionIDs), to expose it as `sid` claim # Additional Changes - refactored `getUpdateCols` to handle different column value types and add arguments for query # Additional Context - closes #8499 - relates to #8501
88 lines
2.2 KiB
Go
88 lines
2.2 KiB
Go
package command
|
|
|
|
import (
|
|
"time"
|
|
|
|
"golang.org/x/text/language"
|
|
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
"github.com/zitadel/zitadel/internal/repository/deviceauth"
|
|
)
|
|
|
|
type DeviceAuthWriteModel struct {
|
|
eventstore.WriteModel
|
|
aggregate *eventstore.Aggregate
|
|
|
|
ClientID string
|
|
DeviceCode string
|
|
UserCode string
|
|
Expires time.Time
|
|
Scopes []string
|
|
Audience []string
|
|
State domain.DeviceAuthState
|
|
UserID string
|
|
UserOrgID string
|
|
UserAuthMethods []domain.UserAuthMethodType
|
|
AuthTime time.Time
|
|
PreferredLanguage *language.Tag
|
|
UserAgent *domain.UserAgent
|
|
NeedRefreshToken bool
|
|
SessionID string
|
|
}
|
|
|
|
func NewDeviceAuthWriteModel(deviceCode, resourceOwner string) *DeviceAuthWriteModel {
|
|
return &DeviceAuthWriteModel{
|
|
WriteModel: eventstore.WriteModel{
|
|
AggregateID: deviceCode,
|
|
ResourceOwner: resourceOwner,
|
|
},
|
|
aggregate: deviceauth.NewAggregate(deviceCode, resourceOwner),
|
|
}
|
|
}
|
|
|
|
func (m *DeviceAuthWriteModel) Reduce() error {
|
|
for _, event := range m.Events {
|
|
switch e := event.(type) {
|
|
case *deviceauth.AddedEvent:
|
|
m.ClientID = e.ClientID
|
|
m.DeviceCode = e.DeviceCode
|
|
m.UserCode = e.UserCode
|
|
m.Expires = e.Expires
|
|
m.Scopes = e.Scopes
|
|
m.Audience = e.Audience
|
|
m.State = e.State
|
|
m.NeedRefreshToken = e.NeedRefreshToken
|
|
case *deviceauth.ApprovedEvent:
|
|
m.State = domain.DeviceAuthStateApproved
|
|
m.UserID = e.UserID
|
|
m.UserOrgID = e.UserOrgID
|
|
m.UserAuthMethods = e.UserAuthMethods
|
|
m.AuthTime = e.AuthTime
|
|
m.PreferredLanguage = e.PreferredLanguage
|
|
m.UserAgent = e.UserAgent
|
|
m.SessionID = e.SessionID
|
|
case *deviceauth.CanceledEvent:
|
|
m.State = e.Reason.State()
|
|
case *deviceauth.DoneEvent:
|
|
m.State = domain.DeviceAuthStateDone
|
|
}
|
|
}
|
|
|
|
return m.WriteModel.Reduce()
|
|
}
|
|
|
|
func (m *DeviceAuthWriteModel) Query() *eventstore.SearchQueryBuilder {
|
|
return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
|
|
ResourceOwner(m.ResourceOwner).
|
|
AddQuery().
|
|
AggregateTypes(deviceauth.AggregateType).
|
|
AggregateIDs(m.AggregateID).
|
|
EventTypes(
|
|
deviceauth.AddedEventType,
|
|
deviceauth.ApprovedEventType,
|
|
deviceauth.CanceledEventType,
|
|
).
|
|
Builder()
|
|
}
|