perf(oidc): optimize token creation (#7822)

* implement code exchange

* port tokenexchange to v2 tokens

* implement refresh token

* implement client credentials

* implement jwt profile

* implement device token

* cleanup unused code

* fix current unit tests

* add user agent unit test

* unit test domain package

* need refresh token as argument

* test commands create oidc session

* test commands device auth

* fix device auth build error

* implicit for oidc session API

* implement authorize callback handler for legacy implicit mode

* upgrade oidc module to working draft

* add missing auth methods and time

* handle all errors in defer

* do not fail auth request on error

the oauth2 Go client automagically retries on any error. If we fail the auth request on the first error, the next attempt will always fail with the Errors.AuthRequest.NoCode, because the auth request state is already set to failed.
The original error is then already lost and the oauth2 library does not return the original error.

Therefore we should not fail the auth request.

Might be worth discussing and perhaps send a bug report to Oauth2?

* fix code flow tests by explicitly setting code exchanged

* fix unit tests in command package

* return allowed scope from client credential client

* add device auth done reducer

* carry nonce thru session into ID token

* fix token exchange integration tests

* allow project role scope prefix in client credentials client

* gci formatting

* do not return refresh token in client credentials and jwt profile

* check org scope

* solve linting issue on authorize callback error

* end session based on v2 session ID

* use preferred language and user agent ID for v2 access tokens

* pin oidc v3.23.2

* add integration test for jwt profile and client credentials with org scopes

* refresh token v1 to v2

* add user token v2 audit event

* add activity trigger

* cleanup and set panics for unused methods

* use the encrypted code for v1 auth request get by code

* add missing event translation

* fix pipeline errors (hopefully)

* fix another test

* revert pointer usage of preferred language

* solve browser info panic in device auth

* remove duplicate entries in AMRToAuthMethodTypes to prevent future `mfa` claim

* revoke v1 refresh token to prevent reuse

* fix terminate oidc session

* always return a new refresh toke in refresh token grant

---------

Co-authored-by: Livio Spring <livio.a@gmail.com>

internal/command/oidc_session.go

@@ -8,7 +8,9 @@ import (
 	"time"
 
 	"github.com/zitadel/logging"
+	"golang.org/x/text/language"
 
+	"github.com/zitadel/zitadel/internal/activity"
 	"github.com/zitadel/zitadel/internal/api/authz"
 	"github.com/zitadel/zitadel/internal/crypto"
 	"github.com/zitadel/zitadel/internal/domain"
@@ -17,6 +19,7 @@ import (
 	"github.com/zitadel/zitadel/internal/repository/authrequest"
 	"github.com/zitadel/zitadel/internal/repository/oidcsession"
 	"github.com/zitadel/zitadel/internal/repository/user"
+	"github.com/zitadel/zitadel/internal/telemetry/tracing"
 	"github.com/zitadel/zitadel/internal/zerrors"
 )
 
@@ -28,60 +31,175 @@ const (
 	oidcTokenFormat           = "%s" + oidcTokenSubjectDelimiter + "%s"
 )
 
-// AddOIDCSessionAccessToken creates a new OIDC Session, creates an access token and returns its id and expiration.
-// If the underlying [AuthRequest] is a OIDC Auth Code Flow, it will set the code as exchanged.
-func (c *Commands) AddOIDCSessionAccessToken(ctx context.Context, authRequestID string) (string, time.Time, error) {
-	cmd, err := c.newOIDCSessionAddEvents(ctx, authRequestID)
-	if err != nil {
-		return "", time.Time{}, err
-	}
-	cmd.AddSession(ctx)
-	if err = cmd.AddAccessToken(ctx, cmd.authRequestWriteModel.Scope, domain.TokenReasonAuthRequest, nil); err != nil {
-		return "", time.Time{}, err
-	}
-	cmd.SetAuthRequestSuccessful(ctx)
-	accessTokenID, _, accessTokenExpiration, err := cmd.PushEvents(ctx)
-	return accessTokenID, accessTokenExpiration, err
+type OIDCSession struct {
+	SessionID         string
+	TokenID           string
+	ClientID          string
+	UserID            string
+	Audience          []string
+	Expiration        time.Time
+	Scope             []string
+	AuthMethods       []domain.UserAuthMethodType
+	AuthTime          time.Time
+	Nonce             string
+	PreferredLanguage *language.Tag
+	UserAgent         *domain.UserAgent
+	Reason            domain.TokenReason
+	Actor             *domain.TokenActor
+	RefreshToken      string
 }
 
-// AddOIDCSessionRefreshAndAccessToken creates a new OIDC Session, creates an access token and refresh token.
+type AuthRequestComplianceChecker func(context.Context, *AuthRequestWriteModel) error
+
+// CreateOIDCSessionFromAuthRequest creates a new OIDC Session, creates an access token and refresh token.
 // It returns the access token id, expiration and the refresh token.
 // If the underlying [AuthRequest] is a OIDC Auth Code Flow, it will set the code as exchanged.
-func (c *Commands) AddOIDCSessionRefreshAndAccessToken(ctx context.Context, authRequestID string) (tokenID, refreshToken string, tokenExpiration time.Time, err error) {
-	cmd, err := c.newOIDCSessionAddEvents(ctx, authRequestID)
+func (c *Commands) CreateOIDCSessionFromAuthRequest(ctx context.Context, authReqId string, complianceCheck AuthRequestComplianceChecker, needRefreshToken bool) (session *OIDCSession, state string, err error) {
+	ctx, span := tracing.NewSpan(ctx)
+	defer func() { span.EndWithError(err) }()
+
+	if authReqId == "" {
+		return nil, "", zerrors.ThrowPreconditionFailed(nil, "COMMAND-Sf3g2", "Errors.AuthRequest.InvalidCode")
+	}
+
+	authReqModel, err := c.getAuthRequestWriteModel(ctx, authReqId)
 	if err != nil {
-		return "", "", time.Time{}, err
+		return nil, "", err
 	}
-	cmd.AddSession(ctx)
-	if err = cmd.AddAccessToken(ctx, cmd.authRequestWriteModel.Scope, domain.TokenReasonAuthRequest, nil); err != nil {
-		return "", "", time.Time{}, err
+
+	if authReqModel.ResponseType == domain.OIDCResponseTypeCode && authReqModel.AuthRequestState != domain.AuthRequestStateCodeAdded {
+		return nil, "", zerrors.ThrowPreconditionFailed(nil, "COMMAND-Iung5", "Errors.AuthRequest.NoCode")
 	}
-	if err = cmd.AddRefreshToken(ctx); err != nil {
-		return "", "", time.Time{}, err
+
+	sessionModel := NewSessionWriteModel(authReqModel.SessionID, authz.GetInstance(ctx).InstanceID())
+	err = c.eventstore.FilterToQueryReducer(ctx, sessionModel)
+	if err != nil {
+		return nil, "", err
+	}
+	if err = sessionModel.CheckIsActive(); err != nil {
+		return nil, "", err
+	}
+
+	cmd, err := c.newOIDCSessionAddEvents(ctx, sessionModel.UserResourceOwner)
+	if err != nil {
+		return nil, "", err
+	}
+	if authReqModel.ResponseType == domain.OIDCResponseTypeCode {
+		if err = cmd.SetAuthRequestCodeExchanged(ctx, authReqModel); err != nil {
+			return nil, "", err
+		}
+	}
+	if err = complianceCheck(ctx, authReqModel); err != nil {
+		return nil, "", err
+	}
+
+	cmd.AddSession(ctx,
+		sessionModel.UserID,
+		sessionModel.UserResourceOwner,
+		sessionModel.AggregateID,
+		authReqModel.ClientID,
+		authReqModel.Audience,
+		authReqModel.Scope,
+		authReqModel.AuthMethods,
+		authReqModel.AuthTime,
+		authReqModel.Nonce,
+		sessionModel.PreferredLanguage,
+		sessionModel.UserAgent,
+	)
+
+	if authReqModel.ResponseType != domain.OIDCResponseTypeIDToken {
+		if err = cmd.AddAccessToken(ctx, authReqModel.Scope, sessionModel.UserID, sessionModel.UserResourceOwner, domain.TokenReasonAuthRequest, nil); err != nil {
+			return nil, "", err
+		}
+	}
+	if authReqModel.NeedRefreshToken && needRefreshToken {
+		if err = cmd.AddRefreshToken(ctx, sessionModel.UserID); err != nil {
+			return nil, "", err
+		}
+	}
+	cmd.SetAuthRequestSuccessful(ctx, authReqModel.aggregate)
+	session, err = cmd.PushEvents(ctx)
+	return session, authReqModel.State, err
+}
+
+func (c *Commands) CreateOIDCSession(ctx context.Context,
+	userID,
+	resourceOwner,
+	clientID string,
+	scope,
+	audience []string,
+	authMethods []domain.UserAuthMethodType,
+	authTime time.Time,
+	nonce string,
+	preferredLanguage *language.Tag,
+	userAgent *domain.UserAgent,
+	reason domain.TokenReason,
+	actor *domain.TokenActor,
+	needRefreshToken bool,
+) (session *OIDCSession, err error) {
+	ctx, span := tracing.NewSpan(ctx)
+	defer func() { span.EndWithError(err) }()
+
+	cmd, err := c.newOIDCSessionAddEvents(ctx, resourceOwner)
+	if err != nil {
+		return nil, err
+	}
+	if reason == domain.TokenReasonImpersonation {
+		if err := c.checkPermission(ctx, "impersonation", resourceOwner, userID); err != nil {
+			return nil, err
+		}
+		cmd.UserImpersonated(ctx, userID, resourceOwner, clientID, actor)
+	}
+
+	cmd.AddSession(ctx, userID, resourceOwner, "", clientID, audience, scope, authMethods, authTime, nonce, preferredLanguage, userAgent)
+	if err = cmd.AddAccessToken(ctx, scope, userID, resourceOwner, reason, actor); err != nil {
+		return nil, err
+	}
+	if needRefreshToken {
+		if err = cmd.AddRefreshToken(ctx, userID); err != nil {
+			return nil, err
+		}
 	}
-	cmd.SetAuthRequestSuccessful(ctx)
 	return cmd.PushEvents(ctx)
 }
 
+type RefreshTokenComplianceChecker func(ctx context.Context, wm *OIDCSessionWriteModel, requestedScope []string) (scope []string, err error)
+
 // ExchangeOIDCSessionRefreshAndAccessToken updates an existing OIDC Session, creates a new access and refresh token.
 // It returns the access token id and expiration and the new refresh token.
-func (c *Commands) ExchangeOIDCSessionRefreshAndAccessToken(ctx context.Context, oidcSessionID, refreshToken string, scope []string) (tokenID, newRefreshToken string, tokenExpiration time.Time, err error) {
-	cmd, err := c.newOIDCSessionUpdateEvents(ctx, oidcSessionID, refreshToken)
+func (c *Commands) ExchangeOIDCSessionRefreshAndAccessToken(ctx context.Context, refreshToken string, scope []string, complianceCheck RefreshTokenComplianceChecker) (_ *OIDCSession, err error) {
+	ctx, span := tracing.NewSpan(ctx)
+	defer func() { span.EndWithError(err) }()
+
+	cmd, err := c.newOIDCSessionUpdateEvents(ctx, refreshToken)
 	if err != nil {
-		return "", "", time.Time{}, err
+		return nil, err
 	}
-	if err = cmd.AddAccessToken(ctx, scope, domain.TokenReasonRefresh, nil); err != nil {
-		return "", "", time.Time{}, err
+	scope, err = complianceCheck(ctx, cmd.oidcSessionWriteModel, scope)
+	if err != nil {
+		return nil, err
+	}
+	err = cmd.AddAccessToken(ctx, scope,
+		cmd.oidcSessionWriteModel.UserID,
+		cmd.oidcSessionWriteModel.UserResourceOwner,
+		domain.TokenReasonRefresh,
+		cmd.oidcSessionWriteModel.AccessTokenActor,
+	)
+	if err != nil {
+		return nil, err
 	}
 	if err = cmd.RenewRefreshToken(ctx); err != nil {
-		return "", "", time.Time{}, err
+		return nil, err
 	}
 	return cmd.PushEvents(ctx)
 }
 
 // OIDCSessionByRefreshToken computes the current state of an existing OIDCSession by a refresh_token (to start a Refresh Token Grant).
 // If either the session is not active, the token is invalid or expired (incl. idle expiration) an invalid refresh token error will be returned.
-func (c *Commands) OIDCSessionByRefreshToken(ctx context.Context, refreshToken string) (*OIDCSessionWriteModel, error) {
+func (c *Commands) OIDCSessionByRefreshToken(ctx context.Context, refreshToken string) (_ *OIDCSessionWriteModel, err error) {
+	ctx, span := tracing.NewSpan(ctx)
+	defer func() { span.EndWithError(err) }()
+
 	oidcSessionID, refreshTokenID, err := parseRefreshToken(refreshToken)
 	if err != nil {
 		return nil, err
@@ -146,26 +264,7 @@ func (c *Commands) RevokeOIDCSessionToken(ctx context.Context, token, clientID s
 	return c.pushAppendAndReduce(ctx, writeModel, oidcsession.NewAccessTokenRevokedEvent(ctx, writeModel.aggregate))
 }
 
-func (c *Commands) newOIDCSessionAddEvents(ctx context.Context, authRequestID string) (*OIDCSessionEvents, error) {
-	authRequestWriteModel, err := c.getAuthRequestWriteModel(ctx, authRequestID)
-	if err != nil {
-		return nil, err
-	}
-	if err = authRequestWriteModel.CheckAuthenticated(); err != nil {
-		return nil, err
-	}
-	sessionWriteModel := NewSessionWriteModel(authRequestWriteModel.SessionID, authz.GetInstance(ctx).InstanceID())
-	err = c.eventstore.FilterToQueryReducer(ctx, sessionWriteModel)
-	if err != nil {
-		return nil, err
-	}
-	if err = sessionWriteModel.CheckIsActive(); err != nil {
-		return nil, err
-	}
-	resourceOwner, err := c.getResourceOwnerOfSessionUser(ctx, sessionWriteModel.UserID, sessionWriteModel.InstanceID)
-	if err != nil {
-		return nil, err
-	}
+func (c *Commands) newOIDCSessionAddEvents(ctx context.Context, resourceOwner string, pending ...eventstore.Command) (*OIDCSessionEvents, error) {
 	accessTokenLifetime, refreshTokenLifeTime, refreshTokenIdleLifetime, err := c.tokenTokenLifetimes(ctx)
 	if err != nil {
 		return nil, err
@@ -179,42 +278,24 @@ func (c *Commands) newOIDCSessionAddEvents(ctx context.Context, authRequestID st
 		eventstore:               c.eventstore,
 		idGenerator:              c.idGenerator,
 		encryptionAlg:            c.keyAlgorithm,
+		events:                   pending,
 		oidcSessionWriteModel:    NewOIDCSessionWriteModel(sessionID, resourceOwner),
-		sessionWriteModel:        sessionWriteModel,
-		authRequestWriteModel:    authRequestWriteModel,
 		accessTokenLifetime:      accessTokenLifetime,
 		refreshTokenLifeTime:     refreshTokenLifeTime,
 		refreshTokenIdleLifetime: refreshTokenIdleLifetime,
 	}, nil
 }
 
-func (c *Commands) getResourceOwnerOfSessionUser(ctx context.Context, userID, instanceID string) (string, error) {
-	events, err := c.eventstore.Filter(ctx, eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
-		InstanceID(instanceID).
-		AllowTimeTravel().
-		OrderAsc().
-		Limit(1).
-		AddQuery().
-		AggregateTypes(user.AggregateType).
-		AggregateIDs(userID).
-		Builder())
-	if err != nil || len(events) != 1 {
-		return "", zerrors.ThrowInternal(err, "OIDCS-sferh", "Errors.Internal")
-	}
-	return events[0].Aggregate().ResourceOwner, nil
-}
-
-func (c *Commands) decryptRefreshToken(refreshToken string) (refreshTokenID string, err error) {
+func (c *Commands) decryptRefreshToken(refreshToken string) (sessionID, refreshTokenID string, err error) {
 	decoded, err := base64.RawURLEncoding.DecodeString(refreshToken)
 	if err != nil {
-		return "", zerrors.ThrowInvalidArgument(err, "OIDCS-Cux9a", "Errors.User.RefreshToken.Invalid")
+		return "", "", zerrors.ThrowInvalidArgument(err, "OIDCS-Cux9a", "Errors.User.RefreshToken.Invalid")
 	}
 	decrypted, err := c.keyAlgorithm.DecryptString(decoded, c.keyAlgorithm.EncryptionKeyID())
 	if err != nil {
-		return "", err
+		return "", "", err
 	}
-	_, refreshTokenID, err = parseRefreshToken(decrypted)
-	return refreshTokenID, err
+	return parseRefreshToken(decrypted)
 }
 
 func parseRefreshToken(refreshToken string) (oidcSessionID, refreshTokenID string, err error) {
@@ -227,8 +308,8 @@ func parseRefreshToken(refreshToken string) (oidcSessionID, refreshTokenID strin
 	return split[0], strings.Split(split[1], oidcTokenSubjectDelimiter)[0], nil
 }
 
-func (c *Commands) newOIDCSessionUpdateEvents(ctx context.Context, oidcSessionID, refreshToken string) (*OIDCSessionEvents, error) {
-	refreshTokenID, err := c.decryptRefreshToken(refreshToken)
+func (c *Commands) newOIDCSessionUpdateEvents(ctx context.Context, refreshToken string) (*OIDCSessionEvents, error) {
+	oidcSessionID, refreshTokenID, err := c.decryptRefreshToken(refreshToken)
 	if err != nil {
 		return nil, err
 	}
@@ -255,13 +336,12 @@ func (c *Commands) newOIDCSessionUpdateEvents(ctx context.Context, oidcSessionID
 }
 
 type OIDCSessionEvents struct {
-	eventstore               *eventstore.Eventstore
-	idGenerator              id.Generator
-	encryptionAlg            crypto.EncryptionAlgorithm
-	events                   []eventstore.Command
-	oidcSessionWriteModel    *OIDCSessionWriteModel
-	sessionWriteModel        *SessionWriteModel
-	authRequestWriteModel    *AuthRequestWriteModel
+	eventstore            *eventstore.Eventstore
+	idGenerator           id.Generator
+	encryptionAlg         crypto.EncryptionAlgorithm
+	events                []eventstore.Command
+	oidcSessionWriteModel *OIDCSessionWriteModel
+
 	accessTokenLifetime      time.Duration
 	refreshTokenLifeTime     time.Duration
 	refreshTokenIdleLifetime time.Duration
@@ -270,44 +350,75 @@ type OIDCSessionEvents struct {
 	accessTokenID string
 
 	// refreshToken is set by the command
-	refreshToken string
+	refreshTokenID string
+	refreshToken   string
 }
 
-func (c *OIDCSessionEvents) AddSession(ctx context.Context) {
+func (c *OIDCSessionEvents) AddSession(
+	ctx context.Context,
+	userID,
+	userResourceOwner,
+	sessionID,
+	clientID string,
+	audience,
+	scope []string,
+	authMethods []domain.UserAuthMethodType,
+	authTime time.Time,
+	nonce string,
+	preferredLanguage *language.Tag,
+	userAgent *domain.UserAgent,
+) {
 	c.events = append(c.events, oidcsession.NewAddedEvent(
 		ctx,
 		c.oidcSessionWriteModel.aggregate,
-		c.sessionWriteModel.UserID,
-		c.sessionWriteModel.AggregateID,
-		c.authRequestWriteModel.ClientID,
-		c.authRequestWriteModel.Audience,
-		c.authRequestWriteModel.Scope,
-		c.sessionWriteModel.AuthMethodTypes(),
-		c.sessionWriteModel.AuthenticationTime(),
+		userID,
+		userResourceOwner,
+		sessionID,
+		clientID,
+		audience,
+		scope,
+		authMethods,
+		authTime,
+		nonce,
+		preferredLanguage,
+		userAgent,
 	))
 }
 
-func (c *OIDCSessionEvents) SetAuthRequestSuccessful(ctx context.Context) {
-	c.events = append(c.events, authrequest.NewSucceededEvent(ctx, c.authRequestWriteModel.aggregate))
+func (c *OIDCSessionEvents) SetAuthRequestCodeExchanged(ctx context.Context, model *AuthRequestWriteModel) error {
+	event := authrequest.NewCodeExchangedEvent(ctx, model.aggregate)
+	model.AppendEvents(event)
+	c.events = append(c.events, event)
+	return model.Reduce()
 }
 
-func (c *OIDCSessionEvents) AddAccessToken(ctx context.Context, scope []string, reason domain.TokenReason, actor *domain.TokenActor) error {
+func (c *OIDCSessionEvents) SetAuthRequestSuccessful(ctx context.Context, authRequestAggregate *eventstore.Aggregate) {
+	c.events = append(c.events, authrequest.NewSucceededEvent(ctx, authRequestAggregate))
+}
+
+func (c *OIDCSessionEvents) SetAuthRequestFailed(ctx context.Context, authRequestAggregate *eventstore.Aggregate, err error) {
+	c.events = append(c.events, authrequest.NewFailedEvent(ctx, authRequestAggregate, domain.OIDCErrorReasonFromError(err)))
+}
+
+func (c *OIDCSessionEvents) AddAccessToken(ctx context.Context, scope []string, userID, resourceOwner string, reason domain.TokenReason, actor *domain.TokenActor) error {
 	accessTokenID, err := c.idGenerator.Next()
 	if err != nil {
 		return err
 	}
 	c.accessTokenID = AccessTokenPrefix + accessTokenID
-	c.events = append(c.events, oidcsession.NewAccessTokenAddedEvent(ctx, c.oidcSessionWriteModel.aggregate, c.accessTokenID, scope, c.accessTokenLifetime, reason, actor))
+	c.events = append(c.events,
+		oidcsession.NewAccessTokenAddedEvent(ctx, c.oidcSessionWriteModel.aggregate, c.accessTokenID, scope, c.accessTokenLifetime, reason, actor),
+		user.NewUserTokenV2AddedEvent(ctx, &user.NewAggregate(userID, resourceOwner).Aggregate, c.accessTokenID), // for user audit log
+	)
 	return nil
 }
 
-func (c *OIDCSessionEvents) AddRefreshToken(ctx context.Context) (err error) {
-	var refreshTokenID string
-	refreshTokenID, c.refreshToken, err = c.generateRefreshToken(c.sessionWriteModel.UserID)
+func (c *OIDCSessionEvents) AddRefreshToken(ctx context.Context, userID string) (err error) {
+	c.refreshTokenID, c.refreshToken, err = c.generateRefreshToken(userID)
 	if err != nil {
 		return err
 	}
-	c.events = append(c.events, oidcsession.NewRefreshTokenAddedEvent(ctx, c.oidcSessionWriteModel.aggregate, refreshTokenID, c.refreshTokenLifeTime, c.refreshTokenIdleLifetime))
+	c.events = append(c.events, oidcsession.NewRefreshTokenAddedEvent(ctx, c.oidcSessionWriteModel.aggregate, c.refreshTokenID, c.refreshTokenLifeTime, c.refreshTokenIdleLifetime))
 	return nil
 }
 
@@ -321,6 +432,10 @@ func (c *OIDCSessionEvents) RenewRefreshToken(ctx context.Context) (err error) {
 	return nil
 }
 
+func (c *OIDCSessionEvents) UserImpersonated(ctx context.Context, userID, resourceOwner, clientID string, actor *domain.TokenActor) {
+	c.events = append(c.events, user.NewUserImpersonatedEvent(ctx, &user.NewAggregate(userID, resourceOwner).Aggregate, clientID, actor))
+}
+
 func (c *OIDCSessionEvents) generateRefreshToken(userID string) (refreshTokenID, refreshToken string, err error) {
 	refreshTokenID, err = c.idGenerator.Next()
 	if err != nil {
@@ -334,18 +449,38 @@ func (c *OIDCSessionEvents) generateRefreshToken(userID string) (refreshTokenID,
 	return refreshTokenID, base64.RawURLEncoding.EncodeToString(token), nil
 }
 
-func (c *OIDCSessionEvents) PushEvents(ctx context.Context) (accessTokenID string, refreshToken string, accessTokenExpiration time.Time, err error) {
+func (c *OIDCSessionEvents) PushEvents(ctx context.Context) (*OIDCSession, error) {
 	pushedEvents, err := c.eventstore.Push(ctx, c.events...)
 	if err != nil {
-		return "", "", time.Time{}, err
+		return nil, err
 	}
 	err = AppendAndReduce(c.oidcSessionWriteModel, pushedEvents...)
 	if err != nil {
-		return "", "", time.Time{}, err
+		return nil, err
 	}
-	// prefix the returned id with the oidcSessionID so that we can retrieve it later on
-	// we need to use `-` as a delimiter because the OIDC library uses `:` and will check for a length of 2 parts
-	return c.oidcSessionWriteModel.AggregateID + TokenDelimiter + c.accessTokenID, c.refreshToken, c.oidcSessionWriteModel.AccessTokenExpiration, nil
+	session := &OIDCSession{
+		SessionID:         c.oidcSessionWriteModel.SessionID,
+		ClientID:          c.oidcSessionWriteModel.ClientID,
+		UserID:            c.oidcSessionWriteModel.UserID,
+		Audience:          c.oidcSessionWriteModel.Audience,
+		Expiration:        c.oidcSessionWriteModel.AccessTokenExpiration,
+		Scope:             c.oidcSessionWriteModel.Scope,
+		AuthMethods:       c.oidcSessionWriteModel.AuthMethods,
+		AuthTime:          c.oidcSessionWriteModel.AuthTime,
+		Nonce:             c.oidcSessionWriteModel.Nonce,
+		PreferredLanguage: c.oidcSessionWriteModel.PreferredLanguage,
+		UserAgent:         c.oidcSessionWriteModel.UserAgent,
+		Reason:            c.oidcSessionWriteModel.AccessTokenReason,
+		Actor:             c.oidcSessionWriteModel.AccessTokenActor,
+		RefreshToken:      c.refreshToken,
+	}
+	if c.accessTokenID != "" {
+		// prefix the returned id with the oidcSessionID so that we can retrieve it later on
+		// we need to use `-` as a delimiter because the OIDC library uses `:` and will check for a length of 2 parts
+		session.TokenID = c.oidcSessionWriteModel.AggregateID + TokenDelimiter + c.accessTokenID
+	}
+	activity.Trigger(ctx, c.oidcSessionWriteModel.UserResourceOwner, c.oidcSessionWriteModel.UserID, tokenReasonToActivityMethodType(c.oidcSessionWriteModel.AccessTokenReason), c.eventstore.FilterToQueryReducer)
+	return session, nil
 }
 
 func (c *Commands) tokenTokenLifetimes(ctx context.Context) (accessTokenLifetime time.Duration, refreshTokenLifetime time.Duration, refreshTokenIdleLifetime time.Duration, err error) {
@@ -368,3 +503,14 @@ func (c *Commands) tokenTokenLifetimes(ctx context.Context) (accessTokenLifetime
 	}
 	return accessTokenLifetime, refreshTokenLifetime, refreshTokenIdleLifetime, nil
 }
+
+func tokenReasonToActivityMethodType(r domain.TokenReason) activity.TriggerMethod {
+	if r == domain.TokenReasonUnspecified {
+		return activity.Unspecified
+	}
+	if r == domain.TokenReasonRefresh {
+		return activity.OIDCRefreshToken
+	}
+	// all other reasons result in an access token
+	return activity.OIDCAccessToken
+}