mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-14 20:08:02 +00:00
1080efdfaa
* fix(auth): start optimise user sessions
* reduce and query user sessions directly without gorm statements
* cleanup
* cleanup
* fix requested changes
---------
Co-authored-by: Livio Spring <livio.a@gmail.com>
(cherry picked from commit aa407c3c3e
)
155 lines
4.4 KiB
Go
155 lines
4.4 KiB
Go
package view
|
|
|
|
import (
|
|
"database/sql"
|
|
_ "embed"
|
|
"errors"
|
|
|
|
"github.com/jinzhu/gorm"
|
|
|
|
"github.com/zitadel/zitadel/internal/database"
|
|
usr_model "github.com/zitadel/zitadel/internal/user/model"
|
|
"github.com/zitadel/zitadel/internal/user/repository/view/model"
|
|
"github.com/zitadel/zitadel/internal/view/repository"
|
|
"github.com/zitadel/zitadel/internal/zerrors"
|
|
)
|
|
|
|
//go:embed user_session_by_id.sql
|
|
var userSessionByIDQuery string
|
|
|
|
//go:embed user_sessions_by_user_agent.sql
|
|
var userSessionsByUserAgentQuery string
|
|
|
|
func UserSessionByIDs(db *database.DB, agentID, userID, instanceID string) (userSession *model.UserSessionView, err error) {
|
|
err = db.QueryRow(
|
|
func(row *sql.Row) error {
|
|
userSession, err = scanUserSession(row)
|
|
return err
|
|
},
|
|
userSessionByIDQuery,
|
|
agentID,
|
|
userID,
|
|
instanceID,
|
|
)
|
|
return userSession, err
|
|
}
|
|
func UserSessionsByAgentID(db *database.DB, agentID, instanceID string) (userSessions []*model.UserSessionView, err error) {
|
|
err = db.Query(
|
|
func(rows *sql.Rows) error {
|
|
userSessions, err = scanUserSessions(rows)
|
|
return err
|
|
},
|
|
userSessionsByUserAgentQuery,
|
|
agentID,
|
|
instanceID,
|
|
)
|
|
return userSessions, err
|
|
}
|
|
|
|
func PutUserSession(db *gorm.DB, table string, session *model.UserSessionView) error {
|
|
save := repository.PrepareSave(table)
|
|
return save(db, session)
|
|
}
|
|
|
|
func DeleteUserSessions(db *gorm.DB, table, userID, instanceID string) error {
|
|
delete := repository.PrepareDeleteByKeys(table,
|
|
repository.Key{Key: model.UserSessionSearchKey(usr_model.UserSessionSearchKeyUserID), Value: userID},
|
|
repository.Key{Key: model.UserSessionSearchKey(usr_model.UserSessionSearchKeyInstanceID), Value: instanceID},
|
|
)
|
|
return delete(db)
|
|
}
|
|
|
|
func DeleteInstanceUserSessions(db *gorm.DB, table, instanceID string) error {
|
|
delete := repository.PrepareDeleteByKey(table,
|
|
model.UserSessionSearchKey(usr_model.UserSessionSearchKeyInstanceID),
|
|
instanceID,
|
|
)
|
|
return delete(db)
|
|
}
|
|
|
|
func DeleteOrgUserSessions(db *gorm.DB, table, instanceID, orgID string) error {
|
|
delete := repository.PrepareDeleteByKeys(table,
|
|
repository.Key{Key: model.UserSessionSearchKey(usr_model.UserSessionSearchKeyResourceOwner), Value: orgID},
|
|
repository.Key{Key: model.UserSessionSearchKey(usr_model.UserSessionSearchKeyInstanceID), Value: instanceID},
|
|
)
|
|
return delete(db)
|
|
}
|
|
|
|
func scanUserSession(row *sql.Row) (*model.UserSessionView, error) {
|
|
session := new(model.UserSessionView)
|
|
var userName, loginName, displayName, avatarKey sql.NullString
|
|
err := row.Scan(
|
|
&session.CreationDate,
|
|
&session.ChangeDate,
|
|
&session.ResourceOwner,
|
|
&session.State,
|
|
&session.UserAgentID,
|
|
&session.UserID,
|
|
&userName,
|
|
&loginName,
|
|
&displayName,
|
|
&avatarKey,
|
|
&session.SelectedIDPConfigID,
|
|
&session.PasswordVerification,
|
|
&session.PasswordlessVerification,
|
|
&session.ExternalLoginVerification,
|
|
&session.SecondFactorVerification,
|
|
&session.SecondFactorVerificationType,
|
|
&session.MultiFactorVerification,
|
|
&session.MultiFactorVerificationType,
|
|
&session.Sequence,
|
|
&session.InstanceID,
|
|
)
|
|
if errors.Is(err, sql.ErrNoRows) {
|
|
return nil, zerrors.ThrowNotFound(nil, "VIEW-NGBs1", "Errors.UserSession.NotFound")
|
|
}
|
|
session.UserName = userName.String
|
|
session.LoginName = loginName.String
|
|
session.DisplayName = displayName.String
|
|
session.AvatarKey = avatarKey.String
|
|
return session, err
|
|
}
|
|
|
|
func scanUserSessions(rows *sql.Rows) ([]*model.UserSessionView, error) {
|
|
sessions := make([]*model.UserSessionView, 0)
|
|
for rows.Next() {
|
|
session := new(model.UserSessionView)
|
|
var userName, loginName, displayName, avatarKey sql.NullString
|
|
err := rows.Scan(
|
|
&session.CreationDate,
|
|
&session.ChangeDate,
|
|
&session.ResourceOwner,
|
|
&session.State,
|
|
&session.UserAgentID,
|
|
&session.UserID,
|
|
&userName,
|
|
&loginName,
|
|
&displayName,
|
|
&avatarKey,
|
|
&session.SelectedIDPConfigID,
|
|
&session.PasswordVerification,
|
|
&session.PasswordlessVerification,
|
|
&session.ExternalLoginVerification,
|
|
&session.SecondFactorVerification,
|
|
&session.SecondFactorVerificationType,
|
|
&session.MultiFactorVerification,
|
|
&session.MultiFactorVerificationType,
|
|
&session.Sequence,
|
|
&session.InstanceID,
|
|
)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
session.UserName = userName.String
|
|
session.LoginName = loginName.String
|
|
session.DisplayName = displayName.String
|
|
session.AvatarKey = avatarKey.String
|
|
sessions = append(sessions, session)
|
|
}
|
|
|
|
if err := rows.Close(); err != nil {
|
|
return nil, zerrors.ThrowInternal(err, "VIEW-FSF3g", "Errors.Query.CloseRows")
|
|
}
|
|
return sessions, nil
|
|
}
|