Skip to content

📚 The open-source, offline-first Notion, Obsidian & Confluence alternative. Advanced Markdown, multi-tenant teams, OIDC/SSO, and local S3 backups. Deploy in one command.

feat: 2FA with temporary one-time password (TOTP) (#550)

Smaugc7ecd623a721
diff --git a/backend/app/migrations/000019_totp.down.sql b/backend/app/migrations/000019_totp.down.sql
new file mode 100644
index 00000000..ffe560f0
--- /dev/null
+++ b/backend/app/migrations/000019_totp.down.sql
@@ -0,0 +1,4 @@
+ALTER TABLE users DROP COLUMN totp_secret;
+ALTER TABLE users DROP COLUMN totp_enabled;
+
+DROP TABLE IF EXISTS user_totp_recovery_codes;
\ No newline at end of file
diff --git a/backend/app/migrations/000019_totp.up.sql b/backend/app/migrations/000019_totp.up.sql
new file mode 100644
index 00000000..5fb2f6ac
--- /dev/null
+++ b/backend/app/migrations/000019_totp.up.sql
@@ -0,0 +1,11 @@
+ALTER TABLE users ADD COLUMN totp_secret VARCHAR(255) DEFAULT NULL;
+ALTER TABLE users ADD COLUMN totp_enabled BOOLEAN DEFAULT FALSE;
+
+CREATE TABLE user_totp_recovery_codes (
+ id BIGINT UNSIGNED NOT NULL PRIMARY KEY,
+ user_id BIGINT UNSIGNED NOT NULL,
+ code VARCHAR(255) NOT NULL,
+ used BOOLEAN DEFAULT FALSE,
+ `created_timestamp` BIGINT UNSIGNED NOT NULL,
+ FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
+);
\ No newline at end of file
diff --git a/backend/controllers/authentication.controller.go b/backend/controllers/authentication.controller.go
index ca42555e..ab987c64 100644
--- a/backend/controllers/authentication.controller.go
+++ b/backend/controllers/authentication.controller.go
@@ -12,12 +12,19 @@ import (
type AuthController interface {
GetSessions(c *gin.Context) (int, any)
- Login(c *gin.Context) (int, any)
RefreshSession(c *gin.Context) (int, any)
+ DeleteSession(c *gin.Context) (int, any)
+
+ Login(c *gin.Context) (int, any)
RequestResetPassword(c *gin.Context) (int, any)
ResetPassword(c *gin.Context) (int, any)
Logout(c *gin.Context) (int, any)
LogoutAllDevices(c *gin.Context) (int, any)
+
+ VerifyTOTP(c *gin.Context) (int, any)
+ RequestTOTPActivation(c *gin.Context) (int, any)
+ ConfirmTOTPActivation(c *gin.Context) (int, any)
+ DisableTOTP(c *gin.Context) (int, any)
}
func NewAuthController(app *app.App) AuthController {
@@ -70,10 +77,17 @@ func (ctr *Controller) Login(c *gin.Context) (int, any) {
return http.StatusBadRequest, err
}
- user, session, err := ctr.app.Services.Auth.Login(authClaims.Username, authClaims.Password, c.ClientIP(), c.Request.UserAgent())
+ user, session, preAuthToken, err := ctr.app.Services.Auth.Login(authClaims.Username, authClaims.Password, c.ClientIP(), c.Request.UserAgent())
if err != nil {
return http.StatusUnauthorized, err
}
+ if user.TotpEnabled && session == nil {
+ return http.StatusAccepted, gin.H{
+ "message": "2FA_REQUIRED",
+ "pre_auth_token": preAuthToken,
+ "user_id": user.Id,
+ }
+ }
tokenString, err := ctr.app.Services.Auth.SignAccessToken(user, ctr.app.Config.Auth.AccessTokenExpiry)
if err != nil {
@@ -88,6 +102,42 @@ func (ctr *Controller) Login(c *gin.Context) (int, any) {
return http.StatusOK, user
}
+// VerifyTOTP
+// @Summary Verify TOTP code and login
+// @Method POST
+// @Router /auth/totp [post]
+// @Security TOTP code
+// @Success 200 {object} Success([]models.User)
+// @Failure 400 {object} Error
+// @Failure 401 {object} Error
+type VerifyTOTPClaims struct {
+ PreAuthToken string `json:"pre_auth_token" binding:"required"`
+ Code string `json:"code" binding:"required"`
+}
+
+func (ctr *Controller) VerifyTOTP(c *gin.Context) (int, any) {
+ var claims VerifyTOTPClaims
+ if err := c.ShouldBindJSON(&claims); err != nil {
+ return http.StatusBadRequest, err
+ }
+
+ user, session, err := ctr.app.Services.Auth.VerifyTOTPAndLogin(claims.PreAuthToken, claims.Code, c.ClientIP(), c.Request.UserAgent())
+ if err != nil {
+ return http.StatusUnauthorized, err
+ }
+
+ tokenString, err := ctr.app.Services.Auth.SignAccessToken(user, ctr.app.Config.Auth.AccessTokenExpiry)
+ if err != nil {
+ return http.StatusInternalServerError, errors.New("failed to sign token")
+ }
+ secure := shouldUseSecureCookies()
+ domain := getCookieDomain()
+ c.SetCookie("Authorization", tokenString, ctr.app.Config.Auth.AccessTokenExpiry, "/", domain, secure, true)
+ c.SetCookie("RefreshToken", session.RefreshToken, ctr.app.Config.Auth.RefreshTokenExpiry, "/", domain, secure, true)
+
+ return http.StatusOK, user
+}
+
// RefreshSession
// @Summary Refresh session
// @Method GET
@@ -162,6 +212,96 @@ func (ctr *Controller) LogoutAllDevices(c *gin.Context) (int, any) {
return http.StatusOK, "Logged out from all devices successfully."
}
+// RequestTOTPActivation
+// @Summary Generate TOTP secret and QR Code URL
+// @Method POST
+// @Router /auth/2fa/request [post]
+// @Security Session validation
+// @Success 200 {object} Success
+// @Failure 400 {object} Error
+func (ctr *Controller) RequestTOTPActivation(c *gin.Context) (int, any) {
+ userId, err := utils.GetUserIdCtx(c)
+ if err != nil {
+ return http.StatusBadRequest, err
+ }
+
+ user, err := ctr.app.Services.User.GetUserById(c.Request.Context(), userId)
+ if err != nil || user == nil {
+ return http.StatusBadRequest, errors.New("user not found")
+ }
+
+ secret, qrCodeURL, err := ctr.app.Services.Auth.GenerateTOTPSecret(user)
+ if err != nil {
+ return http.StatusInternalServerError, err
+ }
+
+ return http.StatusOK, gin.H{
+ "secret": secret,
+ "qr_code_url": qrCodeURL,
+ }
+}
+
+// ConfirmTOTPActivation
+// @Summary Validate and activate 2FA definitively
+// @Method POST
+// @Router /auth/2fa/confirm [post]
+// @Security Session validation
+// @Param secret body string true "The TOTP secret generated in the previous step"
+// @Param code body string true "The 6-digit code generated by the authentication app"
+// @Success 200 {object} Success(string)
+// @Failure 400 {object} Error
+func (ctr *Controller) ConfirmTOTPActivation(c *gin.Context) (int, any) {
+ userId, err := utils.GetUserIdCtx(c)
+ if err != nil {
+ return http.StatusBadRequest, err
+ }
+
+ var data struct {
+ Secret string `json:"secret" binding:"required"`
+ Code string `json:"code" binding:"required"`
+ }
+ if err := c.ShouldBindJSON(&data); err != nil {
+ return http.StatusBadRequest, err
+ }
+
+ if codes, err := ctr.app.Services.Auth.EnableTOTP(userId, data.Secret, data.Code); err != nil {
+ return http.StatusBadRequest, err
+ } else {
+ return http.StatusOK, gin.H{
+ "message": "2FA activated successfully.",
+ "backup_codes": codes,
+ }
+ }
+}
+
+// DisableTOTP
+// @Summary Disable TOTP for the user
+// @Method POST
+// @Router /auth/2fa/disable [post]
+// @Security Code validation
+// @Param code body string true "The 6-digit code generated by the authentication app"
+// @Success 200 {object} Success(string)
+// @Failure 400 {object} Error
+func (ctr *Controller) DisableTOTP(c *gin.Context) (int, any) {
+ userId, err := utils.GetUserIdCtx(c)
+ if err != nil {
+ return http.StatusBadRequest, err
+ }
+
+ var data struct {
+ Code string `json:"code" binding:"required"`
+ }
+ if err := c.ShouldBindJSON(&data); err != nil {
+ return http.StatusBadRequest, err
+ }
+
+ if err := ctr.app.Services.Auth.DisableTOTP(userId, data.Code); err != nil {
+ return http.StatusBadRequest, err
+ }
+
+ return http.StatusOK, "2FA disabled successfully."
+}
+
// Reset password
// @Summary Reset password
// @Method POST
@@ -207,6 +347,32 @@ func (ctr *Controller) ResetPassword(c *gin.Context) (int, any) {
return http.StatusOK, "Password reset successfully."
}
+// Close session
+// @Summary Close a specific session
+// @Method POST
+// @Router /auth/sessions/close [post]
+// @Security Session validation
+// @Param session_id body string true "Session ID to close"
+// @Success 200 {object} Success(string)
+// @Failure 400 {object} Error
+func (ctr *Controller) DeleteSession(c *gin.Context) (int, any) {
+ sessionId, err := utils.GetTargetId(c, c.Param("sessionId"))
+ if err != nil {
+ return http.StatusBadRequest, err
+ }
+ userId, err := utils.GetUserIdCtx(c)
+ if err != nil {
+ return http.StatusBadRequest, err
+ }
+
+ err = ctr.app.Services.Session.DeleteSession(sessionId, userId)
+ if err != nil {
+ return http.StatusInternalServerError, errors.New("failed to delete session")
+ }
+
+ return http.StatusOK, "Session closed successfully."
+}
+
// Cookies security helpers
func shouldUseSecureCookies() bool {
diff --git a/backend/go.mod b/backend/go.mod
index f2b0500b..444b6608 100644
--- a/backend/go.mod
+++ b/backend/go.mod
@@ -10,6 +10,7 @@ require (
require (
github.com/aymerick/douceur v0.2.0 // indirect
+ github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect
github.com/bytedance/gopkg v0.1.3 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
@@ -18,6 +19,7 @@ require (
github.com/klauspost/crc32 v1.3.0 // indirect
github.com/philhofer/fwd v1.2.0 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+ github.com/pquerna/otp v1.5.0 // indirect
github.com/quic-go/qpack v0.6.0 // indirect
github.com/quic-go/quic-go v0.59.1 // indirect
github.com/tinylib/msgp v1.6.1 // indirect
diff --git a/backend/go.sum b/backend/go.sum
index 3b1df463..ac81ebaa 100644
--- a/backend/go.sum
+++ b/backend/go.sum
@@ -9,6 +9,8 @@ github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERo
github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
+github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc h1:biVzkmvwrH8WK8raXaxBx6fRVTlJILwEwQGL1I/ByEI=
+github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
github.com/bytedance/gopkg v0.1.3 h1:TPBSwH8RsouGCBcMBktLt1AymVo2TVsBVCY4b6TnZ/M=
github.com/bytedance/gopkg v0.1.3/go.mod h1:576VvJ+eJgyCzdjS+c4+77QF3p7ubbtiKARP3TxducM=
github.com/bytedance/sonic v1.15.0 h1:/PXeWFaR5ElNcVE84U0dOHjiMHQOwNIx3K4ymzh/uSE=
@@ -138,6 +140,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/pquerna/otp v1.5.0 h1:NMMR+WrmaqXU4EzdGJEE1aUUI0AMRzsp96fFFWNPwxs=
+github.com/pquerna/otp v1.5.0/go.mod h1:dkJfzwRKNiegxyNb54X/3fLwhCynbMspSyWKnvi1AEg=
github.com/quic-go/qpack v0.6.0 h1:g7W+BMYynC1LbYLSqRt8PBg5Tgwxn214ZZR34VIOjz8=
github.com/quic-go/qpack v0.6.0/go.mod h1:lUpLKChi8njB4ty2bFLX2x4gzDqXwUpaO1DP9qMDZII=
github.com/quic-go/quic-go v0.59.1 h1:0Gmua0HW1Tv7ANR7hUYwRyD0MG5OJfgvYSZasGZzBic=
diff --git a/backend/models/recovery_code.model.go b/backend/models/recovery_code.model.go
new file mode 100644
index 00000000..51e1e906
--- /dev/null
+++ b/backend/models/recovery_code.model.go
@@ -0,0 +1,11 @@
+package models
+
+import "alexandrie/types"
+
+type UserTOTPRecoveryCode struct {
+ Id types.Snowflake `json:"id" db:"id"`
+ UserId types.Snowflake `json:"user_id" db:"user_id"`
+ Code string `json:"code" db:"code"`
+ Used bool `json:"used" db:"used"`
+ CreatedTimestamp int64 `json:"created_timestamp" db:"created_timestamp"`
+}
diff --git a/backend/models/user.model.go b/backend/models/user.model.go
index b9ab1d7f..bd4821d0 100644
--- a/backend/models/user.model.go
+++ b/backend/models/user.model.go
@@ -11,6 +11,8 @@ type User struct {
Avatar *string `json:"avatar" form:"avatar" binding:"omitempty" db:"avatar"`
Email *string `json:"email" form:"email" binding:"omitempty,email" db:"email"`
Password *string `json:"password,omitempty" form:"password" binding:"omitempty,min=4,max=50" db:"password"`
+ TotpSecret *string `json:"-" db:"totp_secret"`
+ TotpEnabled bool `json:"totp_enabled" db:"totp_enabled"`
CreatedTimestamp int64 `json:"created_timestamp" form:"created_timestamp" binding:"omitempty" db:"created_timestamp"`
UpdatedTimestamp int64 `json:"updated_timestamp" form:"updated_timestamp" binding:"omitempty" db:"updated_timestamp"`
}
diff --git a/backend/repositories/backup_code.repository.go b/backend/repositories/backup_code.repository.go
new file mode 100644
index 00000000..122c4933
--- /dev/null
+++ b/backend/repositories/backup_code.repository.go
@@ -0,0 +1,86 @@
+package repositories
+
+import (
+ "alexandrie/models"
+ "alexandrie/types"
+ "fmt"
+
+ "github.com/jmoiron/sqlx"
+)
+
+type BackupCodesRepositoryImpl struct {
+ db *sqlx.DB
+}
+
+type BackupCodesRepository interface {
+ Create(codes []models.UserTOTPRecoveryCode) error
+ GetActiveCodesByUserId(userId types.Snowflake) ([]models.UserTOTPRecoveryCode, error)
+ MarkAsUsed(id types.Snowflake) error
+ DeleteByUserId(userId types.Snowflake) error
+}
+
+func NewBackupCodesRepository(db *sqlx.DB) BackupCodesRepository {
+ return &BackupCodesRepositoryImpl{db: db}
+}
+
+func (r *BackupCodesRepositoryImpl) Create(codes []models.UserTOTPRecoveryCode) error {
+ if len(codes) == 0 {
+ return nil
+ }
+
+ tx, err := r.db.Beginx()
+ if err != nil {
+ return fmt.Errorf("failed to start transaction for backup codes: %w", err)
+ }
+ defer tx.Rollback()
+
+ for _, code := range codes {
+ _, err := tx.NamedExec(`INSERT INTO user_totp_recovery_codes (id, user_id, code, used, created_timestamp) VALUES (:id, :user_id, :code, :used, :created_timestamp)`, &code)
+ if err != nil {
+ return fmt.Errorf("failed to insert backup code %d: %w", code.Id, err)
+ }
+ }
+
+ if err := tx.Commit(); err != nil {
+ return fmt.Errorf("failed to commit backup codes transaction: %w", err)
+ }
+
+ return nil
+}
+
+func (r *BackupCodesRepositoryImpl) GetActiveCodesByUserId(userId types.Snowflake) ([]models.UserTOTPRecoveryCode, error) {
+ var codes []models.UserTOTPRecoveryCode
+
+ err := r.db.Select(&codes, `
+ SELECT id, user_id, code, used, created_timestamp
+ FROM user_totp_recovery_codes
+ WHERE user_id = ? AND used = FALSE
+ `, userId)
+ if err != nil {
+ return nil, fmt.Errorf("failed to select active backup codes: %w", err)
+ }
+
+ return codes, nil
+}
+
+func (r *BackupCodesRepositoryImpl) MarkAsUsed(id types.Snowflake) error {
+ query := `UPDATE user_totp_recovery_codes SET used = TRUE WHERE id = ?`
+
+ _, err := r.db.Exec(query, id)
+ if err != nil {
+ return fmt.Errorf("failed to mark backup code as used: %w", err)
+ }
+
+ return nil
+}
+
+func (r *BackupCodesRepositoryImpl) DeleteByUserId(userId types.Snowflake) error {
+ query := `DELETE FROM user_totp_recovery_codes WHERE user_id = ?`
+
+ _, err := r.db.Exec(query, userId)
+ if err != nil {
+ return fmt.Errorf("failed to delete backup codes for user: %w", err)
+ }
+
+ return nil
+}
diff --git a/backend/repositories/manager.go b/backend/repositories/manager.go
index 81791c87..88afca16 100644
--- a/backend/repositories/manager.go
+++ b/backend/repositories/manager.go
@@ -16,6 +16,7 @@ type RepositoryManager struct {
Permission PermissionRepository
Log LogRepository
OIDCProvider OIDCProviderRepository
+ BackupCodes BackupCodesRepository
UserSettings UserSettingsRepository
initialized bool
}
@@ -40,6 +41,7 @@ func (rm *RepositoryManager) initializeRepositories() {
rm.Permission = NewPermissionRepository(rm.db)
rm.Log = NewLogRepository(rm.db)
rm.OIDCProvider = NewOIDCProviderRepository(rm.db)
+ rm.BackupCodes = NewBackupCodesRepository(rm.db)
rm.UserSettings = NewUserSettingsRepository(rm.db)
}
diff --git a/backend/repositories/session.repository.go b/backend/repositories/session.repository.go
index 29eba8b1..f73adc48 100644
--- a/backend/repositories/session.repository.go
+++ b/backend/repositories/session.repository.go
@@ -18,7 +18,7 @@ type SessionRepository interface {
GetByRefreshToken(refreshToken string) (*models.Session, error)
Create(session *models.Session) (*models.Session, error)
Update(session *models.Session) (*models.Session, error)
- Delete(sessionId types.Snowflake) error
+ Delete(sessionId types.Snowflake, userId types.Snowflake) error
DeleteAllByUser(userId types.Snowflake) error
DeleteOld() error
}
@@ -31,8 +31,7 @@ func (r *SessionRepositoryImpl) GetByUserId(userId types.Snowflake) ([]models.Se
var sessions []models.Session
err := r.db.Select(&sessions, `
SELECT id, user_id, refresh_token, expire_token, last_refresh_timestamp, active, ip_adress, user_agent, location, type, login_timestamp, logout_timestamp
- FROM sessions
- WHERE user_id = ?`, userId)
+ FROM sessions WHERE user_id = ? ORDER BY login_timestamp DESC`, userId)
if err != nil {
return nil, fmt.Errorf("failed to get sessions by user ID: %w", err)
@@ -79,8 +78,8 @@ func (r *SessionRepositoryImpl) Update(session *models.Session) (*models.Session
return session, nil
}
-func (r *SessionRepositoryImpl) Delete(sessionId types.Snowflake) error {
- _, err := r.db.Exec(`DELETE FROM sessions WHERE id = ?`, sessionId)
+func (r *SessionRepositoryImpl) Delete(sessionId types.Snowflake, userId types.Snowflake) error {
+ _, err := r.db.Exec(`DELETE FROM sessions WHERE id = ? AND user_id = ?`, sessionId, userId)
if err != nil {
return fmt.Errorf("failed to delete session: %w", err)
}
diff --git a/backend/repositories/user.repository.go b/backend/repositories/user.repository.go
index 2c23052f..82a04f97 100644
--- a/backend/repositories/user.repository.go
+++ b/backend/repositories/user.repository.go
@@ -15,7 +15,7 @@ type UserRepositoryImpl struct {
type UserRepository interface {
GetAll() ([]*models.User, error)
- GetByID(id types.Snowflake) (*models.User, error)
+ GetByID(id types.Snowflake, secrets bool) (*models.User, error)
GetByUsername(username string) (*models.User, error)
GetAppAdmins() ([]*models.User, error)
HasPassword(id types.Snowflake) (bool, error)
@@ -25,6 +25,7 @@ type UserRepository interface {
Update(id types.Snowflake, user *models.User) (*models.User, error)
UpdatePassword(id types.Snowflake, password string) error
UpdatePasswordResetToken(id types.Snowflake, resetToken string) error
+ UpdateTOTP(id types.Snowflake, secret string, enabled bool) error
UpdateRole(id types.Snowflake, role int) error // Separate method for security
Delete(id types.Snowflake) error
}
@@ -36,7 +37,7 @@ func NewUserRepository(db *sqlx.DB) UserRepository {
func (r *UserRepositoryImpl) GetAll() ([]*models.User, error) {
var users []*models.User
err := r.db.Select(&users, `
- SELECT id, username, firstname, lastname, role, avatar, email, created_timestamp, updated_timestamp
+ SELECT id, username, firstname, lastname, role, avatar, email, totp_enabled, created_timestamp, updated_timestamp
FROM users
ORDER BY created_timestamp DESC`)
if err != nil {
@@ -45,12 +46,20 @@ func (r *UserRepositoryImpl) GetAll() ([]*models.User, error) {
return users, nil
}
-func (r *UserRepositoryImpl) GetByID(id types.Snowflake) (*models.User, error) {
+func (r *UserRepositoryImpl) GetByID(id types.Snowflake, secrets bool) (*models.User, error) {
var user models.User
- err := r.db.Get(&user, `
- SELECT id, username, firstname, lastname, role, avatar, email, created_timestamp, updated_timestamp
+ var err error
+ if secrets {
+ err = r.db.Get(&user, `
+ SELECT id, username, firstname, lastname, role, avatar, email, password, totp_secret, totp_enabled, created_timestamp, updated_timestamp
+ FROM users
+ WHERE id = ?`, id)
+ } else {
+ err = r.db.Get(&user, `
+ SELECT id, username, firstname, lastname, role, avatar, email, totp_enabled, created_timestamp, updated_timestamp
FROM users
WHERE id = ?`, id)
+ }
if err == sql.ErrNoRows {
return nil, nil
}
@@ -63,7 +72,7 @@ func (r *UserRepositoryImpl) GetByID(id types.Snowflake) (*models.User, error) {
func (r *UserRepositoryImpl) GetByUsername(username string) (*models.User, error) {
var user models.User
err := r.db.Get(&user, `
- SELECT id, username, firstname, lastname, role, avatar, email, password, created_timestamp, updated_timestamp
+ SELECT id, username, firstname, lastname, role, avatar, email, password, totp_enabled, created_timestamp, updated_timestamp
FROM users
WHERE username = ?`, username)
if err == sql.ErrNoRows {
@@ -154,6 +163,14 @@ func (r *UserRepositoryImpl) UpdatePasswordResetToken(id types.Snowflake, resetT
return nil
}
+func (r *UserRepositoryImpl) UpdateTOTP(id types.Snowflake, secret string, enabled bool) error {
+ _, err := r.db.Exec(`UPDATE users SET totp_secret=?, totp_enabled=? WHERE id=?`, secret, enabled, id)
+ if err != nil {
+ return fmt.Errorf("failed to update TOTP settings: %w", err)
+ }
+ return nil
+}
+
func (r *UserRepositoryImpl) UpdateRole(id types.Snowflake, role int) error {
_, err := r.db.Exec(`UPDATE users SET role=? WHERE id=?`, role, id)
if err != nil {
diff --git a/backend/router/routes/auth.go b/backend/router/routes/auth.go
index 95d7befb..2b9dafb7 100644
--- a/backend/router/routes/auth.go
+++ b/backend/router/routes/auth.go
@@ -20,8 +20,14 @@ func Auth(app *app.App, router *gin.RouterGroup) {
auth.POST("/logout", utils.WP(authCtrl.Logout))
auth.POST("/logout/all", middlewares.Auth(), utils.WP(authCtrl.LogoutAllDevices))
+ auth.POST("/2fa/request", middlewares.Auth(), utils.WP(authCtrl.RequestTOTPActivation))
+ auth.POST("/2fa/confirm", middlewares.Auth(), utils.WP(authCtrl.ConfirmTOTPActivation))
+ auth.POST("/2fa/verify", utils.WP(authCtrl.VerifyTOTP))
+ auth.POST("/2fa/disable", middlewares.Auth(), utils.WP(authCtrl.DisableTOTP))
+
// Sessions route
auth.GET("/sessions", middlewares.Auth(), utils.WP(authCtrl.GetSessions))
+ auth.DELETE("/sessions/:sessionId", middlewares.Auth(), utils.WP(authCtrl.DeleteSession))
// OIDC routes
oidcCtrl := controllers.NewOIDCController(app)
diff --git a/backend/services/auth.service.go b/backend/services/auth.service.go
index 968a439a..04f70a9a 100644
--- a/backend/services/auth.service.go
+++ b/backend/services/auth.service.go
@@ -9,38 +9,50 @@ import (
"crypto/rand"
"errors"
"fmt"
+ "math/big"
"os"
"strconv"
"time"
"github.com/golang-jwt/jwt/v5"
+ "github.com/pquerna/otp/totp"
"github.com/wneessen/go-mail"
"golang.org/x/crypto/bcrypt"
)
type AuthService interface {
- Login(username, password, ip, userAgent string) (*models.User, *models.Session, error)
+ Login(username, password, ip, userAgent string) (*models.User, *models.Session, string, error)
+
RefreshSession(refreshToken string) (*models.User, *models.Session, error)
+ SignAccessToken(user *models.User, accessTokenExpiry int) (string, error)
+
Logout(refreshToken string) error
LogoutAllDevices(userId types.Snowflake) error
+
RequestPasswordReset(username string, mailClient *mail.Client) error
ResetPassword(token, newPassword string) error
- SignAccessToken(user *models.User, accessTokenExpiry int) (string, error)
+
+ VerifyTOTPAndLogin(preAuthToken, code, ip, userAgent string) (*models.User, *models.Session, error)
+ GenerateTOTPSecret(user *models.User) (string, string, error)
+ EnableTOTP(userId types.Snowflake, secret, code string) ([]string, error)
+ DisableTOTP(userId types.Snowflake, code string) error
}
type authService struct {
- userRepo repositories.UserRepository
- sessionRepo repositories.SessionRepository
- logRepo repositories.LogRepository
- snowflake *snowflake.Snowflake
+ userRepo repositories.UserRepository
+ sessionRepo repositories.SessionRepository
+ backupCodeRepo repositories.BackupCodesRepository
+ logRepo repositories.LogRepository
+ snowflake *snowflake.Snowflake
}
-func NewAuthService(userRepo repositories.UserRepository, sessionRepo repositories.SessionRepository, logRepo repositories.LogRepository, snowflake *snowflake.Snowflake) AuthService {
+func NewAuthService(userRepo repositories.UserRepository, sessionRepo repositories.SessionRepository, backupCodeRepo repositories.BackupCodesRepository, logRepo repositories.LogRepository, snowflake *snowflake.Snowflake) AuthService {
return &authService{
- userRepo: userRepo,
- sessionRepo: sessionRepo,
- logRepo: logRepo,
- snowflake: snowflake,
+ userRepo: userRepo,
+ sessionRepo: sessionRepo,
+ backupCodeRepo: backupCodeRepo,
+ logRepo: logRepo,
+ snowflake: snowflake,
}
}
@@ -49,20 +61,28 @@ func NewAuthService(userRepo repositories.UserRepository, sessionRepo repositori
// Compare the password with the hashed password
// Create a new session with a refresh token
// Return the user and session
-func (s *authService) Login(username, password, ip, userAgent string) (*models.User, *models.Session, error) {
+func (s *authService) Login(username, password, ip, userAgent string) (*models.User, *models.Session, string, error) {
user, err := s.userRepo.GetByUsername(username)
if user == nil || err != nil {
- return nil, nil, errors.New("invalid credentials")
+ return nil, nil, "", errors.New("invalid credentials")
}
if user.Password == nil {
- return nil, nil, errors.New("please login with OIDC provider")
+ return nil, nil, "", errors.New("please login with OIDC provider")
}
if err := bcrypt.CompareHashAndPassword([]byte(*user.Password), []byte(password)); err != nil {
- return nil, nil, errors.New("invalid credentials")
+ return nil, nil, "", errors.New("invalid credentials")
+ }
+ if user.TotpEnabled {
+ user.Password = nil
+ preAuthToken, err := signPreAuthToken(user.Id)
+ if err != nil {
+ return nil, nil, "", errors.New("failed to generate pre-authentication token")
+ }
+ return user, nil, preAuthToken, nil
}
session := &models.Session{
@@ -81,11 +101,11 @@ func (s *authService) Login(username, password, ip, userAgent string) (*models.U
}
if _, err := s.sessionRepo.Create(session); err != nil {
- return nil, nil, errors.New("failed to create session")
+ return nil, nil, "", errors.New("failed to create session")
}
user.Password = nil
- return user, session, nil
+ return user, session, "", nil
}
func (s *authService) RefreshSession(refreshToken string) (*models.User, *models.Session, error) {
@@ -97,7 +117,7 @@ func (s *authService) RefreshSession(refreshToken string) (*models.User, *models
return nil, nil, errors.New("refresh token expired")
}
- user, err := s.userRepo.GetByID(session.UserId)
+ user, err := s.userRepo.GetByID(session.UserId, false)
if user == nil || err != nil {
return nil, nil, errors.New("failed to get user")
}
@@ -114,6 +134,17 @@ func (s *authService) RefreshSession(refreshToken string) (*models.User, *models
return user, session, nil
}
+func (s *authService) SignAccessToken(user *models.User, accessTokenExpiry int) (string, error) {
+ claims := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{
+ "sub": strconv.FormatUint(uint64(user.Id), 10),
+ "iss": "alexandrie",
+ "exp": time.Now().Add(time.Duration(time.Second * time.Duration(accessTokenExpiry))).Unix(),
+ "iat": time.Now().Unix(),
+ "role": strconv.Itoa(user.Role),
+ })
+ return claims.SignedString([]byte(os.Getenv("JWT_SECRET")))
+}
+
func (s *authService) Logout(refreshToken string) error {
session, err := s.sessionRepo.GetByRefreshToken(refreshToken)
if err != nil {
@@ -122,7 +153,7 @@ func (s *authService) Logout(refreshToken string) error {
if session.ExpireToken < time.Now().UnixMilli() {
return errors.New("refresh token expired")
}
- return s.sessionRepo.Delete(session.Id)
+ return s.sessionRepo.Delete(session.Id, session.UserId)
}
func (s *authService) LogoutAllDevices(userId types.Snowflake) error {
@@ -182,7 +213,7 @@ func (s *authService) ResetPassword(token, newPassword string) error {
return errors.New("invalid user ID in reset token")
}
- user, err := s.userRepo.GetByID(types.Snowflake(userId))
+ user, err := s.userRepo.GetByID(types.Snowflake(userId), false)
if user == nil || err != nil {
return errors.New("failed to get user")
}
@@ -195,13 +226,164 @@ func (s *authService) ResetPassword(token, newPassword string) error {
return s.userRepo.UpdatePassword(user.Id, string(hash))
}
-func (s *authService) SignAccessToken(user *models.User, accessTokenExpiry int) (string, error) {
+func (s *authService) VerifyTOTPAndLogin(preAuthToken, code, ip, userAgent string) (*models.User, *models.Session, error) {
+
+ token, err := jwt.Parse(preAuthToken, func(token *jwt.Token) (interface{}, error) {
+ return []byte(os.Getenv("JWT_SECRET")), nil
+ })
+ if err != nil || !token.Valid {
+ return nil, nil, errors.New("invalid or expired pre-authentication token")
+ }
+
+ claims, ok := token.Claims.(jwt.MapClaims)
+ if !ok || claims["pre_auth"] != true {
+ return nil, nil, errors.New("invalid token type")
+ }
+
+ // 2. Extraire le User ID du token
+ userIdStr, _ := claims["sub"].(string)
+ userIdUint, err := strconv.ParseUint(userIdStr, 10, 64)
+ if err != nil {
+ return nil, nil, errors.New("invalid user ID")
+ }
+ userId := types.Snowflake(userIdUint)
+
+ user, err := s.userRepo.GetByID(userId, true)
+ if user == nil || err != nil {
+ return nil, nil, errors.New("user not found")
+ }
+
+ if !s.validateCode(user, code) {
+ return nil, nil, errors.New("invalid 2FA code")
+ }
+
+ session := &models.Session{
+ Id: s.snowflake.Generate(),
+ UserId: user.Id,
+ RefreshToken: signRefreshToken(),
+ ExpireToken: time.Now().Add(time.Duration(30 * 24 * time.Hour)).UnixMilli(),
+ LastRefreshTimestamp: time.Now().UnixMilli(),
+ Active: 1,
+ IpAddr: &ip,
+ UserAgent: &userAgent,
+ Location: utils.PtrString(s.logRepo.GetLocationFromIP(ip)),
+ Type: utils.PtrString("login"),
+ LoginTimestamp: time.Now().UnixMilli(),
+ LogoutTimestamp: 0,
+ }
+
+ if _, err := s.sessionRepo.Create(session); err != nil {
+ return nil, nil, errors.New("failed to create session")
+ }
+
+ user.Password = nil
+ return user, session, nil
+}
+
+func (s *authService) GenerateTOTPSecret(user *models.User) (string, string, error) {
+ key, err := totp.Generate(totp.GenerateOpts{
+ Issuer: "Alexandrie",
+ AccountName: user.Username,
+ })
+ if err != nil {
+ return "", "", errors.New("failed to generate TOTP key")
+ }
+
+ return key.Secret(), key.URL(), nil
+}
+
+func generateBackupCodes() ([]string, error) {
+ codes := make([]string, 8)
+ for i := range 8 {
+ // Génère un nombre aléatoire entre 10000000 et 99999999
+ nBig, err := rand.Int(rand.Reader, big.NewInt(90000000))
+ if err != nil {
+ return nil, err
+ }
+ codes[i] = fmt.Sprintf("%08d", nBig.Uint64()+10000000)
+ }
+ return codes, nil
+}
+
+func (s *authService) EnableTOTP(userId types.Snowflake, secret, code string) ([]string, error) {
+ valid := totp.Validate(code, secret)
+ if !valid {
+ return nil, errors.New("invalid verification code")
+ }
+
+ plainCodes, err := generateBackupCodes()
+ if err != nil {
+ return nil, errors.New("failed to generate backup codes")
+ }
+
+ backupCodes := make([]models.UserTOTPRecoveryCode, 0, len(plainCodes))
+ for _, plainCode := range plainCodes {
+ hash, _ := bcrypt.GenerateFromPassword([]byte(plainCode), bcrypt.DefaultCost)
+ backupCodes = append(backupCodes, models.UserTOTPRecoveryCode{
+ Id: s.snowflake.Generate(),
+ UserId: userId,
+ Code: string(hash),
+ Used: false,
+ CreatedTimestamp: time.Now().UnixMilli(),
+ })
+ }
+ err = s.backupCodeRepo.Create(backupCodes)
+ if err != nil {
+ return nil, errors.New("failed to create backup codes")
+ }
+
+ return plainCodes, s.userRepo.UpdateTOTP(userId, secret, true)
+}
+
+func (s *authService) DisableTOTP(userId types.Snowflake, code string) error {
+ user, err := s.userRepo.GetByID(userId, true)
+ if err != nil {
+ return errors.New("failed to get user")
+ }
+
+ valid := s.validateCode(user, code)
+ if !valid {
+ return errors.New("invalid verification code")
+ }
+
+ err = s.userRepo.UpdateTOTP(userId, "", false)
+
+ if err != nil {
+ return errors.New("failed to disable TOTP")
+ }
+
+ return s.backupCodeRepo.DeleteByUserId(userId)
+}
+
+func (s *authService) validateCode(user *models.User, code string) bool {
+ valid := false
+
+ if len(code) == 6 {
+ valid = totp.Validate(code, *user.TotpSecret)
+ } else if len(code) == 8 {
+ backupCodes, err := s.backupCodeRepo.GetActiveCodesByUserId(user.Id)
+ if err == nil {
+ for _, bc := range backupCodes {
+ if bcrypt.CompareHashAndPassword([]byte(bc.Code), []byte(code)) == nil {
+ valid = true
+ s.backupCodeRepo.MarkAsUsed(bc.Id)
+ break
+ }
+ }
+ }
+ }
+
+ return valid
+
+}
+
+func signPreAuthToken(userId types.Snowflake) (string, error) {
claims := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{
- "sub": strconv.FormatUint(uint64(user.Id), 10),
- "iss": "alexandrie",
- "exp": time.Now().Add(time.Duration(time.Second * time.Duration(accessTokenExpiry))).Unix(),
- "iat": time.Now().Unix(),
- "role": strconv.Itoa(user.Role),
+ "sub": strconv.FormatUint(uint64(userId), 10),
+ "iss": "alexandrie",
+ "exp": time.Now().Add(3 * time.Minute).Unix(), // Valide seulement 3 minutes
+ "iat": time.Now().Unix(),
+ "pre_auth": true, // Flag crucial pour identifier qu'il ne s'agit pas d'une session finale
})
return claims.SignedString([]byte(os.Getenv("JWT_SECRET")))
}
diff --git a/backend/services/manager.go b/backend/services/manager.go
index ca010969..08bfe448 100644
--- a/backend/services/manager.go
+++ b/backend/services/manager.go
@@ -40,7 +40,7 @@ func NewServiceManager(repos *repositories.RepositoryManager, snowflake *snowfla
func (sm *ServiceManager) initializeServices(repos *repositories.RepositoryManager, snowflake *snowflake.Snowflake, minioClient *minio.Client, resourceConfig ResourceConfig) error {
sm.Access = permissions.NewAccessGuard(repos.Node, repos.Permission)
- sm.Auth = NewAuthService(repos.User, repos.Session, repos.Log, snowflake)
+ sm.Auth = NewAuthService(repos.User, repos.Session, repos.BackupCodes, repos.Log, snowflake)
sm.User = NewUserService(repos.User, repos.Log, snowflake, sm.Access)
sm.Stats = NewStatsService(repos.Stats)
sm.Minio = NewMinioService(minioClient)
diff --git a/backend/services/oidc.service.go b/backend/services/oidc.service.go
index ed37db24..b6653b30 100644
--- a/backend/services/oidc.service.go
+++ b/backend/services/oidc.service.go
@@ -255,7 +255,7 @@ func (s *oidcService) LoginOrCreate(providerName string, userInfo *oidc.UserInfo
}
if link != nil {
// User already linked, perform login
- user, err := s.userRepo.GetByID(link.UserId)
+ user, err := s.userRepo.GetByID(link.UserId, false)
if err != nil || user == nil {
return nil, nil, false, errors.New("linked user not found")
}
diff --git a/backend/services/session.service.go b/backend/services/session.service.go
index 25013a0a..4218bfc4 100644
--- a/backend/services/session.service.go
+++ b/backend/services/session.service.go
@@ -10,6 +10,7 @@ import (
type SessionService interface {
GetSessionsByUserId(userId types.Snowflake) ([]models.Session, error)
+ DeleteSession(sessionId types.Snowflake, userId types.Snowflake) error
DeleteOldSessions()
}
@@ -34,6 +35,10 @@ func (s *sessionService) GetSessionsByUserId(userId types.Snowflake) ([]models.S
return s.sessionRepo.GetByUserId(userId)
}
+func (s *sessionService) DeleteSession(sessionId types.Snowflake, userId types.Snowflake) error {
+ return s.sessionRepo.Delete(sessionId, userId)
+}
+
func (s *sessionService) DeleteOldSessions() {
err := s.sessionRepo.DeleteOld()
if err != nil {
diff --git a/backend/services/user.service.go b/backend/services/user.service.go
index e037e80a..065e2866 100644
--- a/backend/services/user.service.go
+++ b/backend/services/user.service.go
@@ -64,7 +64,7 @@ func (s *userService) GetUserById(ctx context.Context, id types.Snowflake) (*mod
return nil, err
}
- user, err := s.userRepo.GetByID(id)
+ user, err := s.userRepo.GetByID(id, false)
if err != nil {
return nil, err
}
@@ -132,7 +132,7 @@ func (s *userService) UpdateUser(ctx context.Context, id types.Snowflake, firstn
return nil, err
}
- dbUser, err := s.userRepo.GetByID(id)
+ dbUser, err := s.userRepo.GetByID(id, false)
if err != nil || dbUser == nil {
return nil, permissions.ErrNotFound
}
@@ -258,7 +258,7 @@ func (s *userService) LoadAppAdmins() {
logger.Warn("app-admins", "Invalid admin user ID: "+idStr)
continue
}
- user, err := s.userRepo.GetByID(*id)
+ user, err := s.userRepo.GetByID(*id, false)
if err != nil || user == nil {
logger.Warn("app-admins", "Failed to load admin user with ID "+idStr+"\nCheck if the ID is correct and if the user exists.")
continue
diff --git a/frontend/app/composables/useOIDC.ts b/frontend/app/composables/useOIDC.ts
index 51f2790c..ead20ed4 100644
--- a/frontend/app/composables/useOIDC.ts
+++ b/frontend/app/composables/useOIDC.ts
@@ -48,22 +48,24 @@ const OIDC_REDIRECT_URI_KEY = 'oidc_redirect_uri';
const OIDC_FLOW_KEY = 'oidc_flow'; // 'login' or 'link'
export function useOIDC() {
- const providers = ref<OIDCProvider[]>([]);
- const isEnabled = ref(false);
- const isLoading = ref(false);
- const linkedProviders = ref<UserOIDCProvider[]>([]);
+ const providers = useState<OIDCProvider[]>('oidc-providers', () => []);
+ const isEnabled = useState('oidc-enabled', () => false);
+ const isLoading = useState('oidc-loading', () => false);
+ const linkedProviders = useState<UserOIDCProvider[]>('oidc-linked', () => []);
/**
* Fetch available OIDC providers from the backend
*/
async function fetchProviders(): Promise<void> {
- isLoading.value = true;
+ if (providers.value.length > 0) return;
+ isLoading.value = true;
try {
const response = await makeRequest<OIDCProvidersResponse>('auth/oidc/providers', 'GET', {});
+
if (response.status === 'success' && response.result) {
isEnabled.value = response.result.enabled;
- providers.value = response.result.providers || [];
+ providers.value = response.result.providers;
} else {
isEnabled.value = false;
providers.value = [];
@@ -176,6 +178,7 @@ export function useOIDC() {
* Fetch OIDC providers linked to the current user
*/
async function fetchLinkedProviders(): Promise<void> {
+ if (linkedProviders.value.length > 0) return;
try {
const response = await makeRequest<UserOIDCProvider[]>('auth/oidc/linked', 'GET', {});
if (response.status === 'success' && response.result) {
diff --git a/frontend/app/pages/(public)/login/index.vue b/frontend/app/pages/(public)/login/index.vue
index 9ba41d56..1076a64b 100644
--- a/frontend/app/pages/(public)/login/index.vue
+++ b/frontend/app/pages/(public)/login/index.vue
@@ -1,61 +1,93 @@
<template>
<div class="body-container">
<IconApp style="width: 120px" />
- <h1>Connection</h1>
- <form @submit.prevent="login">
- <div class="form-group">
- <label for="username">Username</label>
- <input id="username" v-model="username" type="username" :class="{ 'is-invalid': errors.username }" :disabled="loginDisabled" />
- <p v-if="errors.username" class="invalid-feedback">{{ errors.username }}</p>
- </div>
- <div class="form-group">
- <label for="password">Password</label>
- <div class="password-input">
+
+ <template v-if="!step2FA">
+ <h1>Connection</h1>
+ <form @submit.prevent="login">
+ <div class="form-group">
+ <label for="username">Username</label>
+ <input id="username" v-model="username" type="username" :class="{ 'is-invalid': errors.username }" :disabled="loginDisabled" />
+ <p v-if="errors.username" class="invalid-feedback">{{ errors.username }}</p>
+ </div>
+ <div class="form-group">
+ <label for="password">Password</label>
+ <div class="password-input">
+ <input
+ id="password"
+ :key="`password-${showPassword}`"
+ v-model="password"
+ :type="showPassword ? 'text' : 'password'"
+ :class="{ 'is-invalid': errors.password }"
+ :disabled="loginDisabled"
+ />
+ <button type="button" class="password-toggle" @click="togglePassword">
+ <div class="eye-icon" :class="{ show: showPassword }">
+ <Icon v-if="showPassword" name="eye" />
+ <Icon v-else name="eye_off" />
+ </div>
+ </button>
+ </div>
+ <p v-if="errors.password" class="invalid-feedback">{{ errors.password }}</p>
+ </div>
+ <NuxtLink to="/signup" class="signup-link">Need an account? Sign up</NuxtLink>
+ <button class="btn" :disabled="loginDisabled" @click="login">Login</button>
+ <p v-if="loginDisabled" class="disabled">Native login is currently disabled. Please use one of the available authentication providers below.</p>
+ <OIDCProviders />
+
+ <p v-if="errors.general" class="invalid-feedback general">{{ errors.general }}</p>
+ <p class="forgot-password-link">Forgot your password? <NuxtLink to="/login/request-reset">Click here</NuxtLink></p>
+ </form>
+ </template>
+
+ <template v-else>
+ <h1>Two-Factor Authentication</h1>
+ <p class="section-description">Enter the 6-digit verification code from your authenticator app.</p>
+ <form @submit.prevent="handleVerify2FA">
+ <div class="form-group">
+ <label for="totpCode">Verification Code</label>
<input
- id="password"
- :key="`password-${showPassword}`"
- v-model="password"
- :type="showPassword ? 'text' : 'password'"
- :class="{ 'is-invalid': errors.password }"
+ id="totpCode"
+ v-model="totpCode"
+ type="text"
+ placeholder="000000 or 8-digit backup code"
+ maxlength="8"
+ pattern="[0-9]*"
+ inputmode="numeric"
+ autocomplete="one-time-code"
:disabled="loginDisabled"
/>
- <button type="button" class="password-toggle" @click="togglePassword">
- <div class="eye-icon" :class="{ show: showPassword }">
- <Icon v-if="showPassword" name="eye" />
- <Icon v-else name="eye_off" />
- </div>
- </button>
</div>
- <p v-if="errors.password" class="invalid-feedback">{{ errors.password }}</p>
- </div>
- <NuxtLink to="/signup" class="signup-link">Need an account? Sign up</NuxtLink>
- <button class="btn" :disabled="loginDisabled" @click="login">Login</button>
- <p v-if="loginDisabled" class="disabled">Native login is currently disabled. Please use one of the available authentication providers below.</p>
- <OIDCProviders />
-
- <p v-if="errors.general" class="invalid-feedback general">{{ errors.general }}</p>
- <p class="forgot-password-link">Forgot your password? <NuxtLink to="/login/request-reset">Click here</NuxtLink></p>
- </form>
+ <p v-if="errors.general" class="invalid-feedback">{{ errors.general }}</p>
+ <button class="btn" :disabled="loginDisabled" type="submit">Verify</button>
+ <button class="btn-secondary" type="button" @click="step2FA = false">Back</button>
+ </form>
+ </template>
</div>
</template>
<script setup lang="ts">
+const userStore = useUserStore();
+const router = useRouter();
+
+const username = ref('');
+const password = ref('');
+const totpCode = ref('');
+
+const step2FA = ref(false);
+const pendingPreAuthToken = ref('');
+
definePageMeta({
layout: 'public',
});
-const userStore = useUserStore();
-const router = useRouter();
const route = useRoute();
const config = useRuntimeConfig();
+const loginDisabled = config.public.configDisableNativeLogin;
-const username = ref('');
-const password = ref('');
const errors = ref({ username: '', password: '', general: '' });
const { showPassword, togglePassword } = usePasswordField();
-const loginDisabled = config.public.configDisableNativeLogin;
-
// Check for OIDC error redirect
onMounted(() => {
const errorParam = route.query.error as string | undefined;
@@ -84,20 +116,37 @@ function login() {
errors.value.password = !password.value ? 'Password is required' : '';
if (username.value && password.value) {
- connect(username.value, password.value);
+ connect();
}
}
-watch([username, password], () => {
+watch([username, password, totpCode], () => {
errors.value.general = '';
errors.value.username = '';
errors.value.password = '';
});
-async function connect(username: string, password: string) {
- const result = await userStore.login(username, password);
- if (result === true) router.push('/dashboard');
- else errors.value.general = String(result);
+async function connect() {
+ const res = await userStore.login(username.value, password.value);
+ if (res.success) {
+ if (res.require2FA) {
+ pendingPreAuthToken.value = res.preAuthToken!;
+ step2FA.value = true;
+ } else {
+ router.push('/dashboard');
+ }
+ } else {
+ errors.value.general = (res.error as string) || 'Invalid credentials';
+ }
+}
+
+async function handleVerify2FA() {
+ const res = await userStore.verify2FA(pendingPreAuthToken.value, totpCode.value);
+ if (res.success) {
+ router.push('/dashboard');
+ } else {
+ errors.value.general = (res.error as string) || 'Invalid 2FA code';
+ }
}
</script>
<style scoped lang="scss">
diff --git a/frontend/app/pages/dashboard/settings/_views/_components/BackupCodes2FA.vue b/frontend/app/pages/dashboard/settings/_views/_components/BackupCodes2FA.vue
new file mode 100644
index 00000000..d1ea39a7
--- /dev/null
+++ b/frontend/app/pages/dashboard/settings/_views/_components/BackupCodes2FA.vue
@@ -0,0 +1,155 @@
+<template>
+ <div class="modal">
+ <h2>Backup Recovery Codes</h2>
+
+ <div class="warning-box">
+ <p>
+ <strong>Keep these codes safe!</strong>
+ If you lose your 2FA device, these codes are the only way to recover your account. Each code can only be used once.
+ </p>
+ </div>
+
+ <div class="codes-container">
+ <div class="codes-list">
+ <div v-for="(code, index) in backupCodes" :key="code" class="code-row">
+ <span class="code-index">{{ String(index + 1).padStart(2, '0') }}</span>
+ <code class="code-text">{{ code.slice(0, 4) }}-{{ code.slice(4) }}</code>
+ </div>
+ </div>
+
+ <button class="btn-copy" type="button" @click="copyAllCodes">
+ <Icon :name="copied ? 'check' : 'copy'" display="sm" />
+ <span>{{ copied ? 'Codes copied!' : 'Copy all codes' }}</span>
+ </button>
+ </div>
+
+ <div class="footer">
+ <AppButton type="secondary" @click="downloadCodes"> Download text file </AppButton>
+ <AppButton type="primary" @click="emit('close')"> I have saved these codes </AppButton>
+ </div>
+ </div>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue';
+
+const props = defineProps<{
+ backupCodes: string[];
+}>();
+
+const emit = defineEmits<{
+ (event: 'close'): void;
+}>();
+
+const copied = ref(false);
+
+function downloadCodes() {
+ const text = `ALEXANDRIE RECOVERY CODES\nGenerated on: ${new Date().toLocaleDateString()}\n\n` + props.backupCodes.join('\n');
+ const blob = new Blob([text], { type: 'text/plain' });
+ const url = URL.createObjectURL(blob);
+ const a = document.createElement('a');
+ a.href = url;
+ a.download = `alexandrie-backup-codes.txt`;
+ a.click();
+ URL.revokeObjectURL(url);
+}
+
+async function copyAllCodes() {
+ if (copied.value) return;
+ try {
+ await navigator.clipboard.writeText(props.backupCodes.join('\n'));
+ copied.value = true;
+ setTimeout(() => {
+ copied.value = false;
+ }, 2000);
+ } catch (err) {
+ console.error('Failed to copy codes: ', err);
+ }
+}
+</script>
+
+<style scoped lang="scss">
+.modal {
+ display: flex;
+ width: 100%;
+ flex-direction: column;
+ gap: 1.25rem;
+}
+
+.codes-container {
+ display: flex;
+ padding: 1.25rem;
+ border: 1px solid var(--border);
+ border-radius: var(--radius-lg);
+ background: var(--surface-overlay);
+ flex-direction: column;
+ gap: 1rem;
+}
+
+.codes-list {
+ display: grid;
+ gap: 0.75rem 1.5rem;
+ grid-template-columns: repeat(2, 1fr);
+}
+
+.code-row {
+ display: flex;
+ padding: 0.4rem 0.5rem;
+ border-radius: var(--radius-sm);
+ transition: background-color 0.2s ease;
+ align-items: center;
+ gap: 0.75rem;
+
+ &:hover {
+ background: var(--surface-transparent);
+ }
+
+ .code-index {
+ font-family: monospace;
+ font-size: 0.75rem;
+ color: var(--text-secondary);
+ opacity: 0.6;
+ user-select: none;
+ }
+
+ .code-text {
+ font-family: monospace;
+ font-size: 1.05rem;
+ font-weight: 600;
+ color: var(--text-primary);
+ letter-spacing: 0.05em;
+ }
+}
+
+.btn-copy {
+ display: inline-flex;
+ padding: 0.5rem 1rem;
+ border: 1px solid var(--border);
+ border-radius: var(--radius-md);
+ font-size: 0.85rem;
+ font-weight: 500;
+ color: var(--text-primary);
+ background: var(--surface-transparent);
+ transition: all 0.2s ease;
+ align-items: center;
+ align-self: center;
+ cursor: pointer;
+ gap: 0.5rem;
+ justify-content: center;
+
+ &:hover {
+ background: var(--border);
+ }
+
+ &:active {
+ transform: scale(0.98);
+ }
+}
+
+@media (width <= 400px) {
+ .codes-list {
+ gap: 0.5rem;
+ grid-template-columns: 1fr;
+ }
+}
+</style>
diff --git a/frontend/app/pages/dashboard/settings/_views/_components/Disable2FA.vue b/frontend/app/pages/dashboard/settings/_views/_components/Disable2FA.vue
new file mode 100644
index 00000000..81472658
--- /dev/null
+++ b/frontend/app/pages/dashboard/settings/_views/_components/Disable2FA.vue
@@ -0,0 +1,47 @@
+<template>
+ <div class="modal">
+ <h3>Remove 2FA</h3>
+ <p>Are you sure you want to remove 2FA from your account?</p>
+
+ <input v-model="code" type="text" placeholder="Enter your 2FA code to confirm" />
+ <p class="description">{{ t('nodes.modals.delete.irreversible') }}</p>
+
+ <p v-if="errorMessage" class="error">{{ errorMessage }}</p>
+
+ <div class="footer">
+ <AppButton type="secondary" @click="emit('close')">{{ t('common.actions.cancel') }}</AppButton>
+ <AppButton type="danger" @click="remove2FA">{{ t('common.actions.confirm') }}</AppButton>
+ </div>
+ </div>
+</template>
+
+<script setup lang="ts">
+const emit = defineEmits(['close']);
+
+const userStore = useUserStore();
+
+const { t } = useI18nT();
+
+const code = ref('');
+const errorMessage = ref('');
+
+const remove2FA = async () => {
+ try {
+ await userStore.disable2FA(code.value);
+ emit('close');
+ } catch (err) {
+ errorMessage.value = (err as string) || 'Failed to disable 2FA. Please check your code and try again.';
+ }
+};
+</script>
+
+<style scoped lang="scss">
+.description {
+ opacity: 0.7;
+}
+
+.warn {
+ color: var(--red-dark);
+ opacity: 0.7;
+}
+</style>
diff --git a/frontend/app/pages/dashboard/settings/_views/_components/SecuritySection2FA.vue b/frontend/app/pages/dashboard/settings/_views/_components/SecuritySection2FA.vue
new file mode 100644
index 00000000..70b3f134
--- /dev/null
+++ b/frontend/app/pages/dashboard/settings/_views/_components/SecuritySection2FA.vue
@@ -0,0 +1,151 @@
+<template>
+ <section>
+ <header>
+ <div>
+ <h3>Two-Factor Authentication (2FA)<tag blue>New</tag></h3>
+ <p class="section-description">Secure your account by requiring a 6-digit code during login.</p>
+ </div>
+ <div v-if="userStore.user?.totp_enabled">
+ <AppButton type="danger" @click="disable2FA"> Disable 2FA </AppButton>
+ </div>
+
+ <div v-else-if="!setupMode">
+ <AppButton type="primary" @click="start2FASetup">Enable 2FA</AppButton>
+ </div>
+ </header>
+
+ <p v-if="userStore.user?.totp_enabled" class="enabled">2FA is currently <strong>enabled</strong> on your account.</p>
+
+ <div v-if="setupMode" class="setup-wizard">
+ <p>1. Scan this QR code with your Authenticator application (Google Authenticator, Bitwarden, etc.) :</p>
+
+ <div class="qr-container">
+ <QrcodeVue :value="totpData.qr_code_url" :size="200" level="H" />
+ <code class="secret-text">Secret Key: {{ totpData.secret }}</code>
+ </div>
+
+ <p>2. Enter the verification code generated by your app to finalize activation :</p>
+ <input v-model="setupCode" type="text" placeholder="000000" maxlength="6" />
+
+ <div class="footer">
+ <AppButton type="secondary" @click="setupMode = false">Cancel</AppButton>
+ <AppButton type="primary" @click="confirm2FA">Confirm Activation</AppButton>
+ </div>
+
+ <p v-if="setupError" class="error">{{ setupError }}</p>
+ </div>
+ </section>
+</template>
+
+<script setup lang="ts">
+import QrcodeVue from 'qrcode.vue';
+import Disable2FAModal from './Disable2FA.vue';
+import BackupCodes2FA from './BackupCodes2FA.vue';
+
+const userStore = useUserStore();
+
+const modals = useModal();
+
+const setupMode = ref(false);
+const setupCode = ref('');
+const setupError = ref('');
+const totpData = ref({ secret: '', qr_code_url: '' });
+
+async function start2FASetup() {
+ setupError.value = '';
+ try {
+ const data = await userStore.request2FA();
+ totpData.value = data!;
+ setupMode.value = true;
+ } catch (err) {
+ setupError.value = (err as string) || "Impossible d'initier la configuration 2FA";
+ }
+}
+
+async function confirm2FA() {
+ setupError.value = '';
+ try {
+ const backupCodes = await userStore.confirm2FA(totpData.value.secret, setupCode.value);
+ setupMode.value = false;
+ setupCode.value = '';
+ modals.add(new Modal(shallowRef(BackupCodes2FA), { size: 'small', props: { backupCodes } }));
+ } catch (err) {
+ setupError.value = (err as string) || "Code invalide. L'activation a échoué.";
+ }
+}
+
+function disable2FA() {
+ modals.add(new Modal(shallowRef(Disable2FAModal), { size: 'small' }));
+}
+</script>
+
+<style scoped lang="scss">
+header {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+}
+
+h3 {
+ margin-top: 2.5rem;
+ display: flex;
+ align-items: center;
+ gap: 0.5rem;
+}
+
+.section-description {
+ color: var(--text-secondary);
+ margin-bottom: 1rem;
+}
+
+.enabled {
+ margin: 0;
+ font-size: 0.95rem;
+ color: var(--text-primary);
+
+ strong {
+ color: var(--green);
+ }
+}
+
+.setup-wizard {
+ display: flex;
+ padding: 1.5rem;
+ border: 1px solid var(--border);
+ border-radius: var(--radius-lg);
+ background: var(--surface-overlay);
+ flex-direction: column;
+ gap: 1.25rem;
+ margin-top: 1rem;
+
+ p {
+ margin: 0;
+ font-size: 0.95rem;
+ }
+}
+
+.qr-container {
+ display: flex;
+ width: fit-content;
+ padding: 1.5rem;
+ border: 1px solid var(--border);
+ border-radius: var(--radius-md);
+ background: white;
+ align-items: center;
+ flex-direction: column;
+ gap: 1rem;
+ justify-content: center;
+
+ .secret-text {
+ padding: 0.4rem 0.75rem;
+ border: 1px solid var(--border);
+ border-radius: var(--radius-sm);
+ font-family: var(--font-mono, monospace);
+ font-size: 0.85rem;
+ color: #333; /* Lisible sur fond blanc */
+ text-align: center;
+ background: var(--surface-background);
+ word-break: break-all;
+ }
+}
+</style>
diff --git a/frontend/app/pages/dashboard/settings/_views/_components/SecuritySectionDanger.vue b/frontend/app/pages/dashboard/settings/_views/_components/SecuritySectionDanger.vue
new file mode 100644
index 00000000..88f14391
--- /dev/null
+++ b/frontend/app/pages/dashboard/settings/_views/_components/SecuritySectionDanger.vue
@@ -0,0 +1,218 @@
+<template>
+ <section>
+ <h3>{{ t('settings.security.dangerZone') }}</h3>
+ <p class="page-subtitle">{{ t('settings.security.dangerZoneDesc') }}</p>
+
+ <div class="section">
+ <div class="card">
+ <div class="card-content">
+ <div class="card-icon">
+ <Icon name="logout" display="sm" />
+ </div>
+ <div class="card-info">
+ <h4>{{ t('settings.security.logout') }}</h4>
+ <p>{{ t('settings.security.logoutDesc') }}</p>
+ </div>
+ </div>
+ <AppButton type="secondary" @click="logout">{{ t('settings.security.logout') }}</AppButton>
+ </div>
+
+ <div class="card">
+ <div class="card-content">
+ <div class="card-icon warning">
+ <Icon name="devices" display="sm" />
+ </div>
+ <div class="card-info">
+ <h4>{{ t('settings.security.logoutAll') }}</h4>
+ <p>{{ t('settings.security.logoutAllDesc') }}</p>
+ </div>
+ </div>
+ <AppButton type="danger" @click="logoutAll">{{ t('settings.security.logoutAll') }}</AppButton>
+ </div>
+
+ <div class="card destructive">
+ <div class="card-content">
+ <div class="card-icon destructive">
+ <Icon name="delete" display="sm" />
+ </div>
+ <div class="card-info">
+ <h4>{{ t('settings.security.deleteAccount') }}</h4>
+ <p>{{ t('settings.security.deleteAccountDesc') }}</p>
+ <details class="delete-details">
+ <summary>{{ t('settings.security.deleteAccountDetails') }}</summary>
+ <ul>
+ <li>{{ t('settings.security.deleteAccountList.files') }}</li>
+ <li>{{ t('settings.security.deleteAccountList.uploads') }}</li>
+ <li>{{ t('settings.security.deleteAccountList.shares') }}</li>
+ <li>{{ t('settings.security.deleteAccountList.data') }}</li>
+ </ul>
+ <p class="backup-hint">
+ <NuxtLink to="/dashboard/settings?p=backup">{{ t('settings.security.backupHint') }}</NuxtLink>
+ </p>
+ </details>
+ </div>
+ </div>
+ <AppButton type="danger" @click="openDeleteModal">{{ t('settings.security.deleteAccount') }}</AppButton>
+ </div>
+ </div>
+ </section>
+</template>
+
+<script setup lang="ts">
+import DeleteAccountModal from '../../_modals/DeleteAccountModal.vue';
+
+const emit = defineEmits(['close']);
+
+const userStore = useUserStore();
+
+const { t } = useI18nT();
+const modals = useModal();
+
+userStore.fetchSessions();
+
+const logout = () => {
+ logoutUser();
+ emit('close');
+};
+const logoutAll = () => {
+ logoutUserAll();
+ emit('close');
+};
+
+const openDeleteModal = () => modals.add(new Modal(shallowRef(DeleteAccountModal)));
+</script>
+<style lang="scss" scoped>
+h3 {
+ margin-top: 2.5rem;
+}
+.section {
+ display: flex;
+ flex-direction: column;
+ gap: 0.75rem;
+ margin-top: 1rem;
+}
+
+.card {
+ display: flex;
+ padding: 1rem 1.25rem;
+ border: 1px solid var(--border);
+ border-radius: var(--radius-lg);
+ background: var(--surface-base);
+ transition: border-color $transition-fast ease;
+ align-items: center;
+ gap: 1rem;
+ justify-content: space-between;
+
+ &:hover {
+ border-color: var(--border-strong);
+ }
+
+ &.destructive {
+ border-color: var(--red-border);
+ background: var(--red-bg-light);
+
+ &:hover {
+ border-color: var(--red);
+ }
+ }
+}
+
+.card-content {
+ display: flex;
+ min-width: 0;
+ align-items: flex-start;
+ flex: 1;
+ gap: 1rem;
+}
+
+.card-icon {
+ display: flex;
+ width: 40px;
+ height: 40px;
+ border-radius: var(--radius-lg);
+ color: var(--text-body);
+ background: var(--surface-overlay);
+ align-items: center;
+ flex-shrink: 0;
+ justify-content: center;
+
+ &.warning {
+ color: var(--orange-dark);
+ background: var(--orange-bg);
+ }
+
+ &.destructive {
+ color: var(--red);
+ background: var(--red-bg);
+ }
+}
+
+.card-info {
+ min-width: 0;
+ flex: 1;
+
+ h4 {
+ margin: 0 0 0.25rem;
+ font-size: 0.95rem;
+ font-weight: 600;
+ color: var(--text-primary);
+ }
+
+ > p {
+ margin: 0;
+ font-size: 0.85rem;
+ line-height: 1.4;
+ color: var(--text-secondary);
+ }
+}
+
+.delete-details {
+ margin-top: 0.75rem;
+
+ summary {
+ font-size: 0.8rem;
+ font-weight: 500;
+ color: var(--red-dark);
+ cursor: pointer;
+ user-select: none;
+
+ &:hover {
+ text-decoration: underline;
+ }
+ }
+
+ ul {
+ margin: 0.5rem 0;
+ font-size: 0.8rem;
+ color: var(--text-secondary);
+ padding-left: 1.25rem;
+
+ li {
+ margin: 0.2rem 0;
+ }
+ }
+
+ .backup-hint {
+ font-size: 0.8rem;
+ color: var(--text-secondary);
+
+ a {
+ font-weight: 500;
+ color: var(--primary);
+ text-decoration: underline;
+ }
+ }
+}
+
+@media (width <= 600px) {
+ .card {
+ align-items: stretch;
+ flex-direction: column;
+
+ button {
+ width: 100%;
+ justify-content: center;
+ }
+ }
+}
+</style>
diff --git a/frontend/app/pages/dashboard/settings/_views/_components/SecuritySectionOIDC.vue b/frontend/app/pages/dashboard/settings/_views/_components/SecuritySectionOIDC.vue
new file mode 100644
index 00000000..e811ee36
--- /dev/null
+++ b/frontend/app/pages/dashboard/settings/_views/_components/SecuritySectionOIDC.vue
@@ -0,0 +1,134 @@
+<template>
+ <section>
+ <h3>{{ t('settings.security.connectedAccounts') }}</h3>
+ <p class="section-description">{{ t('settings.security.connectedAccountsDesc') }}</p>
+ <div class="accounts">
+ <div v-if="isLoading" class="loading">
+ <LoaderSpinner />
+ <span>{{ t('settings.security.loadingAccounts') }}</span>
+ </div>
+ <template v-else>
+ <div v-for="provider in availableProviders" :key="provider.name" class="account">
+ <div class="account-info">
+ <!-- eslint-disable-next-line vue/no-v-html -->
+ <span class="icon" v-html="getProviderIcon(provider.name)"></span>
+ <span class="name">{{ getProviderLabel(provider.name) }}</span>
+ </div>
+ <div class="account-actions">
+ <template v-if="isLinked(provider.name)">
+ <span class="status linked">{{ t('settings.security.connected') }}</span>
+ <AppButton type="danger" size="sm" @click="unlinkAccount(provider.name)">{{ t('settings.security.unlink') }}</AppButton>
+ </template>
+ <template v-else>
+ <span class="status">{{ t('settings.security.notConnected') }}</span>
+ <AppButton type="secondary" size="sm" @click="linkAccount(provider.name)">{{ t('settings.security.link') }}</AppButton>
+ </template>
+ </div>
+ </div>
+ <p v-if="availableProviders.length === 0" class="no-providers">{{ t('settings.security.noProviders') }}</p>
+ </template>
+ </div>
+ </section>
+</template>
+
+<script setup lang="ts">
+import { getProviderIcon, getProviderLabel } from '~/helpers/oidc-providers';
+
+const userStore = useUserStore();
+
+const { t } = useI18nT();
+const notifications = useNotifications();
+const { providers: availableProviders, isLoading, linkProvider, unlinkProvider, isProviderLinked } = useOIDC();
+
+userStore.fetchSessions();
+
+function isLinked(providerName: string): boolean {
+ return isProviderLinked(providerName);
+}
+
+async function linkAccount(providerName: string) {
+ try {
+ await linkProvider(providerName);
+ } catch (error) {
+ notifications.add({ type: 'error', title: (error as Error).message || t('settings.security.notifications.linkError') });
+ }
+}
+
+async function unlinkAccount(providerName: string) {
+ try {
+ await unlinkProvider(providerName);
+ notifications.add({ type: 'success', title: t('settings.security.notifications.accountUnlinked', { provider: getProviderLabel(providerName) }) });
+ } catch (error) {
+ notifications.add({ type: 'error', title: (error as Error).message || t('settings.security.notifications.unlinkError') });
+ }
+}
+</script>
+<style lang="scss" scoped>
+h3 {
+ margin-top: 2.5rem;
+}
+.section-description {
+ color: var(--text-secondary);
+ margin-bottom: 1rem;
+}
+
+.accounts {
+ display: flex;
+ flex-direction: column;
+ gap: 0.75rem;
+ margin-bottom: 1.5rem;
+}
+
+.loading {
+ display: flex;
+ padding: 1rem;
+ color: var(--text-secondary);
+ align-items: center;
+ gap: 0.75rem;
+}
+
+.account {
+ display: flex;
+ padding: 0.75rem 1rem;
+ border: 1px solid var(--border);
+ border-radius: var(--radius-lg);
+ background: var(--bg-secondary);
+ align-items: center;
+ gap: 1rem;
+ justify-content: space-between;
+}
+
+.account-info {
+ display: flex;
+ align-items: center;
+ gap: 0.75rem;
+}
+
+.icon {
+ display: flex;
+ width: 24px;
+ height: 24px;
+ align-items: center;
+ justify-content: center;
+}
+
+.name {
+ font-weight: 500;
+}
+
+.account-actions {
+ display: flex;
+ align-items: center;
+ gap: 0.75rem;
+}
+
+.status {
+ font-size: 0.85rem;
+ color: var(--text-secondary);
+
+ &.linked {
+ font-weight: 500;
+ color: var(--green);
+ }
+}
+</style>
diff --git a/frontend/app/pages/dashboard/settings/_views/_components/SecuritySectionPassword.vue b/frontend/app/pages/dashboard/settings/_views/_components/SecuritySectionPassword.vue
new file mode 100644
index 00000000..d79b442c
--- /dev/null
+++ b/frontend/app/pages/dashboard/settings/_views/_components/SecuritySectionPassword.vue
@@ -0,0 +1,55 @@
+<template>
+ <section>
+ <h3>{{ t('settings.security.password') }}</h3>
+ <form @submit.prevent="changePassword">
+ <div class="form-group">
+ <label for="password">{{ t('settings.security.newPassword') }}</label>
+ <input id="password" v-model="passwordValue" autocomplete="new-password" type="password" required />
+ </div>
+ <div class="form-group">
+ <span style="display: flex; align-items: center">
+ <label for="password_confirm">{{ t('settings.security.confirmPassword') }}</label>
+ <span v-if="errPasswordNotMatch" class="err"> {{ t('settings.security.passwordNotMatch') }}</span>
+ </span>
+ <input id="password_confirm" v-model="passwordConfirmValue" autocomplete="new-password" type="password" required />
+ </div>
+ <AppButton type="primary">{{ t('settings.security.changePassword') }}</AppButton>
+ </form>
+ </section>
+</template>
+
+<script setup lang="ts">
+const userStore = useUserStore();
+
+const { t } = useI18nT();
+const notifications = useNotifications();
+
+const passwordValue = ref('');
+const passwordConfirmValue = ref('');
+const errPasswordNotMatch = ref(false);
+
+const changePassword = async () => {
+ if (!userStore.user) return;
+ if (passwordValue.value !== passwordConfirmValue.value) return (errPasswordNotMatch.value = true);
+ userStore
+ .updatePassword(passwordValue.value)
+ .then(() => {
+ passwordValue.value = '';
+ passwordConfirmValue.value = '';
+ errPasswordNotMatch.value = false;
+ notifications.add({ type: 'success', title: t('settings.security.notifications.passwordChanged') });
+ })
+ .catch(e => notifications.add({ type: 'error', title: t('settings.security.notifications.passwordError'), message: e.message }));
+};
+</script>
+<style lang="scss" scoped>
+h3 {
+ margin-top: 2.5rem;
+}
+
+.err {
+ padding: 0.1rem 0.5rem;
+ font-size: 0.8rem;
+ color: var(--red);
+}
+</style>
diff --git a/frontend/app/pages/dashboard/settings/_views/_components/SecuritySectionSessions.vue b/frontend/app/pages/dashboard/settings/_views/_components/SecuritySectionSessions.vue
new file mode 100644
index 00000000..8663c5e9
--- /dev/null
+++ b/frontend/app/pages/dashboard/settings/_views/_components/SecuritySectionSessions.vue
@@ -0,0 +1,72 @@
+<template>
+ <section>
+ <h3>{{ t('settings.security.activeSessions') }}</h3>
+ <p class="section-description">{{ t('settings.security.activeSessionsDesc') }}</p>
+ <div v-if="userStore.sessions.length" class="sessions-list">
+ <SessionCard
+ v-for="session in userStore.sessions"
+ :key="session.id"
+ :session="session"
+ :is-current="currentSession?.id === session.id"
+ :show-user-agent="true"
+ />
+ </div>
+ <p v-else class="no-sessions">{{ t('settings.security.noSessions') }}</p>
+ <div v-if="hasUnrecognizedSession" class="warning-box">
+ <Icon name="warning" display="sm" />
+ <div>
+ <strong>{{ t('settings.security.unrecognizedSession') }}</strong>
+ <p>{{ t('settings.security.unrecognizedSessionDesc') }}</p>
+ </div>
+ </div>
+ </section>
+</template>
+
+<script setup lang="ts">
+import SessionCard from './SessionCard.vue';
+
+const userStore = useUserStore();
+
+const { t } = useI18nT();
+
+userStore.fetchSessions();
+
+const currentSession = computed(() => {
+ const currentUserAgent = navigator.userAgent;
+ const matchingSessions = userStore.sessions.filter(session => session.user_agent === currentUserAgent);
+ if (matchingSessions.length > 0) {
+ return matchingSessions.reduce((latest, session) => (session.login_timestamp > (latest?.login_timestamp || 0) ? session : latest), matchingSessions[0]);
+ }
+ return userStore.sessions[0] || null;
+});
+
+// Check if there might be unrecognized sessions (sessions other than current)
+const hasUnrecognizedSession = computed(() => userStore.sessions.length > 1);
+</script>
+
+<style lang="scss" scoped>
+h3 {
+ margin-top: 2.5rem;
+}
+
+.section-description {
+ color: var(--text-secondary);
+ margin-bottom: 1rem;
+}
+
+.sessions-list {
+ display: flex;
+ flex-direction: column;
+ gap: 0.75rem;
+ margin-bottom: 1.5rem;
+}
+
+.no-sessions {
+ padding: 1rem;
+ border-radius: var(--radius-lg);
+ color: var(--text-secondary);
+ text-align: center;
+ background: var(--surface-raised);
+ font-style: italic;
+}
+</style>
diff --git a/frontend/app/components/SessionCard.vue b/frontend/app/pages/dashboard/settings/_views/_components/SessionCard.vue
similarity index 79%
rename from frontend/app/components/SessionCard.vue
rename to frontend/app/pages/dashboard/settings/_views/_components/SessionCard.vue
index e15e1fd7..31d39109 100644
--- a/frontend/app/components/SessionCard.vue
+++ b/frontend/app/pages/dashboard/settings/_views/_components/SessionCard.vue
@@ -5,23 +5,26 @@
<Icon v-if="deviceType == 'mobile'" name="mobile" fill="var(--purple)" />
<Icon v-else name="computer" fill="var(--blue)" />
</div>
- <div class="session-info">
- <div class="session-title">
- <span class="browser">{{ parsedUserAgent.browser }}</span>
- <span class="os">on {{ parsedUserAgent.os }}</span>
- <span v-if="isCurrent" class="badge current">{{ t('components.sessionCard.current') }}</span>
- <span v-else-if="!session.active" class="badge inactive">{{ t('components.sessionCard.inactive') }}</span>
- </div>
- <div class="session-meta">
- <span class="meta-item">
- <Icon name="location" display="xsm" />
- {{ session.location || t('components.sessionCard.unknownLocation') }}
- </span>
- <span class="meta-item">
- <Icon name="internet" display="xsm" />
- {{ session.ip_adress || t('components.sessionCard.unknownIP') }}
- </span>
+ <div class="session-info-container">
+ <div class="session-info">
+ <div class="session-title">
+ <span class="browser">{{ parsedUserAgent.browser }}</span>
+ <span class="os">on {{ parsedUserAgent.os }}</span>
+ <span v-if="isCurrent" class="badge current">{{ t('components.sessionCard.current') }}</span>
+ <span v-else-if="!session.active" class="badge inactive">{{ t('components.sessionCard.inactive') }}</span>
+ </div>
+ <div class="session-meta">
+ <span class="meta-item">
+ <Icon name="location" display="xsm" />
+ {{ session.location || t('components.sessionCard.unknownLocation') }}
+ </span>
+ <span class="meta-item">
+ <Icon name="internet" display="xsm" />
+ {{ session.ip_adress || t('components.sessionCard.unknownIP') }}
+ </span>
+ </div>
</div>
+ <AppBtnIcon icon="close" display="lg" @click="closeSession" />
</div>
</div>
@@ -51,22 +54,10 @@
<script setup lang="ts">
import { parseUserAgent } from '~/helpers/utils';
+import type { Session } from '~/stores';
const { t } = useI18nT();
-
-export interface Session {
- id: string;
- user_id: string;
- expire_token: number;
- last_refresh_timestamp: number;
- active: boolean;
- ip_adress?: string;
- user_agent?: string;
- location?: string;
- type: string;
- login_timestamp: number;
- logout_timestamp?: number;
-}
+const store = useUserStore();
const props = withDefaults(
defineProps<{
@@ -91,6 +82,14 @@ const deviceType = computed(() => {
}
return 'desktop';
});
+
+const closeSession = async () => {
+ try {
+ await store.deleteSession(props.session.id);
+ } catch (error) {
+ console.error('Failed to delete session:', error);
+ }
+};
</script>
<style scoped lang="scss">
@@ -159,6 +158,15 @@ const deviceType = computed(() => {
}
}
+.session-info-container {
+ display: flex;
+ min-width: 0;
+ align-items: flex-start;
+ flex: 1;
+ gap: 0.5rem;
+ justify-content: space-between;
+}
+
.session-info {
display: flex;
min-width: 0;
diff --git a/frontend/app/pages/dashboard/settings/_views/security.vue b/frontend/app/pages/dashboard/settings/_views/security.vue
index 66f58a6f..0f410d3f 100644
--- a/frontend/app/pages/dashboard/settings/_views/security.vue
+++ b/frontend/app/pages/dashboard/settings/_views/security.vue
@@ -2,459 +2,44 @@
<div>
<h2 class="page-title">{{ t('settings.security.title') }}</h2>
<p class="page-subtitle">{{ t('settings.security.subtitle') }}</p>
- <h3>{{ t('settings.security.activeSessions') }}</h3>
- <p class="section-description">{{ t('settings.security.activeSessionsDesc') }}</p>
- <div class="sessions-list">
- <SessionCard v-for="(session, index) in userStore.sessions" :key="session.id" :session="session" :is-current="index === 0" :show-user-agent="true" />
- </div>
- <p v-if="userStore.sessions.length === 0" class="no-sessions">{{ t('settings.security.noSessions') }}</p>
- <div v-if="hasUnrecognizedSession" class="warning-box">
- <Icon name="warning" display="sm" />
- <div>
- <strong>{{ t('settings.security.unrecognizedSession') }}</strong>
- <p>{{ t('settings.security.unrecognizedSessionDesc') }}</p>
- </div>
- </div>
- <!-- OIDC Linked Accounts -->
- <template v-if="oidcEnabled">
- <h3>{{ t('settings.security.connectedAccounts') }}</h3>
- <p class="section-description">{{ t('settings.security.connectedAccountsDesc') }}</p>
- <div class="oidc-accounts">
- <div v-if="loadingOIDC" class="oidc-loading">
- <LoaderSpinner :size="24" />
- <span>{{ t('settings.security.loadingAccounts') }}</span>
- </div>
- <template v-else>
- <div v-for="provider in availableProviders" :key="provider.name" class="oidc-account">
- <div class="oidc-account-info">
- <!-- eslint-disable-next-line vue/no-v-html -->
- <span class="oidc-icon" v-html="getProviderIcon(provider.name)"></span>
- <span class="oidc-name">{{ getProviderLabel(provider.name) }}</span>
- </div>
- <div class="oidc-account-actions">
- <template v-if="isLinked(provider.name)">
- <span class="oidc-status linked">{{ t('settings.security.connected') }}</span>
- <AppButton type="danger" size="sm" @click="unlinkAccount(provider.name)">{{ t('settings.security.unlink') }}</AppButton>
- </template>
- <template v-else>
- <span class="oidc-status">{{ t('settings.security.notConnected') }}</span>
- <AppButton type="secondary" size="sm" @click="linkAccount(provider.name)">{{ t('settings.security.link') }}</AppButton>
- </template>
- </div>
- </div>
- <p v-if="availableProviders.length === 0" class="no-providers">{{ t('settings.security.noProviders') }}</p>
- </template>
- </div>
- </template>
+ <!-- Sessions -->
+ <SecuritySectionSessions />
- <h3>{{ t('settings.security.password') }}</h3>
- <form @submit.prevent="changePassword">
- <div class="form-group">
- <label for="password">{{ t('settings.security.newPassword') }}</label>
- <input id="password" v-model="passwordValue" autocomplete="new-password" type="password" required />
- </div>
- <div class="form-group">
- <span style="display: flex; align-items: center">
- <label for="password_confirm">{{ t('settings.security.confirmPassword') }}</label>
- <span v-if="errPasswordNotMatch" class="err"> {{ t('settings.security.passwordNotMatch') }}</span>
- </span>
- <input id="password_confirm" v-model="passwordConfirmValue" autocomplete="new-password" type="password" required />
- </div>
- <AppButton type="primary">{{ t('settings.security.changePassword') }}</AppButton>
- </form>
- <h2>{{ t('settings.security.dangerZone') }}</h2>
- <p class="page-subtitle">{{ t('settings.security.dangerZoneDesc') }}</p>
+ <!-- Two-Factor Authentication (2FA) -->
+ <SecuritySection2FA @close="emit('close')" />
- <div class="danger-section">
- <div class="danger-card">
- <div class="danger-card-content">
- <div class="danger-card-icon">
- <Icon name="logout" display="sm" />
- </div>
- <div class="danger-card-info">
- <h4>{{ t('settings.security.logout') }}</h4>
- <p>{{ t('settings.security.logoutDesc') }}</p>
- </div>
- </div>
- <AppButton type="secondary" @click="logout">{{ t('settings.security.logout') }}</AppButton>
- </div>
+ <!-- OIDC Linked Accounts -->
+ <SecuritySectionOIDC v-if="oidcEnabled" @close="emit('close')" />
- <div class="danger-card">
- <div class="danger-card-content">
- <div class="danger-card-icon warning">
- <Icon name="devices" display="sm" />
- </div>
- <div class="danger-card-info">
- <h4>{{ t('settings.security.logoutAll') }}</h4>
- <p>{{ t('settings.security.logoutAllDesc') }}</p>
- </div>
- </div>
- <AppButton type="danger" @click="logoutAll">{{ t('settings.security.logoutAll') }}</AppButton>
- </div>
+ <!-- Password Change -->
+ <SecuritySectionPassword @close="emit('close')" />
- <div class="danger-card destructive">
- <div class="danger-card-content">
- <div class="danger-card-icon destructive">
- <Icon name="delete" display="sm" />
- </div>
- <div class="danger-card-info">
- <h4>{{ t('settings.security.deleteAccount') }}</h4>
- <p>{{ t('settings.security.deleteAccountDesc') }}</p>
- <details class="delete-details">
- <summary>{{ t('settings.security.deleteAccountDetails') }}</summary>
- <ul>
- <li>{{ t('settings.security.deleteAccountList.files') }}</li>
- <li>{{ t('settings.security.deleteAccountList.uploads') }}</li>
- <li>{{ t('settings.security.deleteAccountList.shares') }}</li>
- <li>{{ t('settings.security.deleteAccountList.data') }}</li>
- </ul>
- <p class="backup-hint">
- <NuxtLink to="/dashboard/settings?p=backup">{{ t('settings.security.backupHint') }}</NuxtLink>
- </p>
- </details>
- </div>
- </div>
- <AppButton type="danger" @click="openDeleteModal">{{ t('settings.security.deleteAccount') }}</AppButton>
- </div>
- </div>
+ <!-- Danger Zone -->
+ <SecuritySectionDanger @close="emit('close')" />
</div>
</template>
<script setup lang="ts">
-import { getProviderIcon, getProviderLabel } from '~/helpers/oidc-providers';
-import DeleteAccountModal from '../_modals/DeleteAccountModal.vue';
+import SecuritySectionSessions from './_components/SecuritySectionSessions.vue';
+import SecuritySection2FA from './_components/SecuritySection2FA.vue';
+import SecuritySectionOIDC from './_components/SecuritySectionOIDC.vue';
+import SecuritySectionPassword from './_components/SecuritySectionPassword.vue';
+import SecuritySectionDanger from './_components/SecuritySectionDanger.vue';
const emit = defineEmits(['close']);
const userStore = useUserStore();
const { t } = useI18nT();
-const modals = useModal();
-const notifications = useNotifications();
userStore.fetchSessions();
-const {
- providers: availableProviders,
- isEnabled: oidcEnabled,
- fetchProviders,
- fetchLinkedProviders,
- linkProvider,
- unlinkProvider,
- isProviderLinked,
-} = useOIDC();
-
-const loadingOIDC = ref(true);
-
-// Check if there might be unrecognized sessions (sessions other than current)
-const hasUnrecognizedSession = computed(() => {
- return userStore.sessions.length > 1;
-});
-
-function isLinked(providerName: string): boolean {
- return isProviderLinked(providerName);
-}
-
-async function linkAccount(providerName: string) {
- try {
- await linkProvider(providerName);
- } catch (error) {
- notifications.add({ type: 'error', title: (error as Error).message || t('settings.security.notifications.linkError') });
- }
-}
-
-async function unlinkAccount(providerName: string) {
- try {
- await unlinkProvider(providerName);
- notifications.add({ type: 'success', title: t('settings.security.notifications.accountUnlinked', { provider: getProviderLabel(providerName) }) });
- } catch (error) {
- notifications.add({ type: 'error', title: (error as Error).message || t('settings.security.notifications.unlinkError') });
- }
-}
-
// Load OIDC data on mount
+const { isEnabled: oidcEnabled, fetchProviders, fetchLinkedProviders } = useOIDC();
+
onMounted(async () => {
await fetchProviders();
if (oidcEnabled.value) await fetchLinkedProviders();
- loadingOIDC.value = false;
});
-
-const passwordValue = ref('');
-const passwordConfirmValue = ref('');
-const errPasswordNotMatch = ref(false);
-
-const changePassword = async () => {
- if (!userStore.user) return;
- if (passwordValue.value !== passwordConfirmValue.value) return (errPasswordNotMatch.value = true);
- userStore
- .updatePassword(passwordValue.value)
- .then(() => {
- passwordValue.value = '';
- passwordConfirmValue.value = '';
- errPasswordNotMatch.value = false;
- notifications.add({ type: 'success', title: t('settings.security.notifications.passwordChanged') });
- })
- .catch(e => notifications.add({ type: 'error', title: t('settings.security.notifications.passwordError'), message: e.message }));
-};
-
-const logout = () => {
- logoutUser();
- emit('close');
-};
-const logoutAll = () => {
- logoutUserAll();
- emit('close');
-};
-
-const openDeleteModal = () => modals.add(new Modal(shallowRef(DeleteAccountModal)));
</script>
-
-<style scoped lang="scss">
-.sessions-list {
- display: flex;
- flex-direction: column;
- gap: 0.75rem;
- margin-bottom: 1.5rem;
-}
-
-.no-sessions {
- padding: 1rem;
- border-radius: var(--radius-lg);
- color: var(--text-secondary);
- text-align: center;
- background: var(--surface-raised);
- font-style: italic;
-}
-
-p {
- margin: 0.5rem 0;
- font-size: 0.9rem;
-}
-
-.warning-box {
- display: flex;
- padding: 1rem 1.25rem;
- border: 1px solid var(--orange-border);
- border-radius: var(--radius-lg);
- background: var(--orange-bg);
- gap: 1rem;
- margin-bottom: 1.5rem;
-
- strong {
- display: block;
- color: var(--orange-dark);
- margin-bottom: 0.25rem;
- }
-
- p {
- margin: 0;
- font-size: 0.85rem;
- color: var(--text-body);
- }
-}
-
-.err {
- padding: 0.1rem 0.5rem;
- font-size: 0.8rem;
- color: var(--red);
-}
-
-/* OIDC Accounts Section */
-.section-description {
- color: var(--text-secondary);
- margin-bottom: 1rem;
-}
-
-.oidc-accounts {
- display: flex;
- flex-direction: column;
- gap: 0.75rem;
- margin-bottom: 1.5rem;
-}
-
-.oidc-loading {
- display: flex;
- padding: 1rem;
- color: var(--text-secondary);
- align-items: center;
- gap: 0.75rem;
-}
-
-.oidc-account {
- display: flex;
- padding: 0.75rem 1rem;
- border: 1px solid var(--border);
- border-radius: var(--radius-lg);
- background: var(--bg-secondary);
- align-items: center;
- gap: 1rem;
- justify-content: space-between;
-}
-
-.oidc-account-info {
- display: flex;
- align-items: center;
- gap: 0.75rem;
-}
-
-.oidc-icon {
- display: flex;
- width: 24px;
- height: 24px;
- align-items: center;
- justify-content: center;
-}
-
-.oidc-name {
- font-weight: 500;
-}
-
-.oidc-account-actions {
- display: flex;
- align-items: center;
- gap: 0.75rem;
-}
-
-.oidc-status {
- font-size: 0.85rem;
- color: var(--text-secondary);
-
- &.linked {
- font-weight: 500;
- color: var(--green);
- }
-}
-
-/* Danger Section */
-.danger-section {
- display: flex;
- flex-direction: column;
- gap: 0.75rem;
- margin-top: 1rem;
-}
-
-.danger-card {
- display: flex;
- padding: 1rem 1.25rem;
- border: 1px solid var(--border);
- border-radius: var(--radius-lg);
- background: var(--surface-base);
- transition: border-color $transition-fast ease;
- align-items: center;
- gap: 1rem;
- justify-content: space-between;
-
- &:hover {
- border-color: var(--border-strong);
- }
-
- &.destructive {
- border-color: var(--red-border);
- background: var(--red-bg-light);
-
- &:hover {
- border-color: var(--red);
- }
- }
-}
-
-.danger-card-content {
- display: flex;
- min-width: 0;
- align-items: flex-start;
- flex: 1;
- gap: 1rem;
-}
-
-.danger-card-icon {
- display: flex;
- width: 40px;
- height: 40px;
- border-radius: var(--radius-lg);
- color: var(--text-body);
- background: var(--surface-overlay);
- align-items: center;
- flex-shrink: 0;
- justify-content: center;
-
- &.warning {
- color: var(--orange-dark);
- background: var(--orange-bg);
- }
-
- &.destructive {
- color: var(--red);
- background: var(--red-bg);
- }
-}
-
-.danger-card-info {
- min-width: 0;
- flex: 1;
-
- h4 {
- margin: 0 0 0.25rem;
- font-size: 0.95rem;
- font-weight: 600;
- color: var(--text-primary);
- }
-
- > p {
- margin: 0;
- font-size: 0.85rem;
- line-height: 1.4;
- color: var(--text-secondary);
- }
-}
-
-.delete-details {
- margin-top: 0.75rem;
-
- summary {
- font-size: 0.8rem;
- font-weight: 500;
- color: var(--red-dark);
- cursor: pointer;
- user-select: none;
-
- &:hover {
- text-decoration: underline;
- }
- }
-
- ul {
- margin: 0.5rem 0;
- font-size: 0.8rem;
- color: var(--text-secondary);
- padding-left: 1.25rem;
-
- li {
- margin: 0.2rem 0;
- }
- }
-
- .backup-hint {
- font-size: 0.8rem;
- color: var(--text-secondary);
-
- a {
- font-weight: 500;
- color: var(--primary);
- text-decoration: underline;
- }
- }
-}
-
-@media (width <= 600px) {
- .danger-card {
- align-items: stretch;
- flex-direction: column;
-
- button {
- width: 100%;
- justify-content: center;
- }
- }
-}
-</style>
diff --git a/frontend/app/pages/dashboard/settings/index.vue b/frontend/app/pages/dashboard/settings/index.vue
index b966c522..94f39745 100644
--- a/frontend/app/pages/dashboard/settings/index.vue
+++ b/frontend/app/pages/dashboard/settings/index.vue
@@ -18,9 +18,15 @@
>{{ section.title }} <tag v-if="section.tag" blue>{{ section.tag }}</tag></span
>
<template v-for="item in section.items" :key="item.label">
- <NuxtLink v-if="item.type === 'link'" :to="item.to" @click="close"> <Icon :name="item.icon" />{{ item.label }} </NuxtLink>
- <NuxtLink v-else-if="item.type === 'action'" @click="item.action?.()"> <Icon :name="item.icon" />{{ item.label }} </NuxtLink>
- <NuxtLink v-else :class="{ active: currentPage === item.key }" @click="setPage(item.key!)"> <Icon :name="item.icon" />{{ item.label }} </NuxtLink>
+ <NuxtLink v-if="item.type === 'link'" :to="item.to" @click="close">
+ <Icon :name="item.icon" /><span v-if="item.bubble" class="bubble" />{{ item.label }}
+ </NuxtLink>
+ <NuxtLink v-else-if="item.type === 'action'" @click="item.action?.()">
+ <Icon :name="item.icon" /><span v-if="item.bubble" class="bubble" />{{ item.label }}
+ </NuxtLink>
+ <NuxtLink v-else :class="{ active: currentPage === item.key }" @click="setPage(item.key!)">
+ <span v-if="item.bubble" class="bubble" /> <Icon :name="item.icon" />{{ item.label }}
+ </NuxtLink>
</template>
</template>
</nav>
@@ -55,6 +61,7 @@ interface NavItem {
icon: string;
to?: string;
action?: () => void;
+ bubble?: boolean;
}
interface NavSection {
@@ -104,8 +111,8 @@ const navSections = computed<NavSection[]>(() => [
title: t('settings.nav.general'),
items: [
{ key: 'profile', label: t('settings.pages.profile'), icon: 'profil' },
- { key: 'apparence', label: t('settings.pages.appearance'), icon: 'brush', bubble: true },
- { key: 'security', label: t('settings.pages.security'), icon: 'security' },
+ { key: 'apparence', label: t('settings.pages.appearance'), icon: 'brush' },
+ { key: 'security', label: t('settings.pages.security'), icon: 'security', bubble: true },
],
},
{
@@ -177,6 +184,7 @@ watchEffect(() => {
a {
display: flex;
+ position: relative;
margin: 0.4rem 0.2rem;
padding: 0.05rem 0.4rem;
border-radius: var(--radius-sm);
@@ -235,6 +243,17 @@ watchEffect(() => {
}
}
+.bubble {
+ position: absolute;
+ top: 4px;
+ right: 4px;
+ width: 10px;
+ height: 10px;
+ border: 3px solid var(--primary);
+ border-radius: 50%;
+ background: var(--primary-bg);
+}
+
@media screen and (width <= 920px) {
.component {
position: relative;
diff --git a/frontend/app/pages/dashboard/teams/index.vue b/frontend/app/pages/dashboard/teams/index.vue
index d0bfe381..7c5ad265 100644
--- a/frontend/app/pages/dashboard/teams/index.vue
+++ b/frontend/app/pages/dashboard/teams/index.vue
@@ -138,7 +138,7 @@ h1 {
}
}
-@media (max-width: 768px) {
+@media (width <= 768px) {
.team-grid {
grid-template-columns: 1fr;
}
diff --git a/frontend/app/stores/db_structures.d.ts b/frontend/app/stores/db_structures.d.ts
index bae2408c..9c94d05a 100644
--- a/frontend/app/stores/db_structures.d.ts
+++ b/frontend/app/stores/db_structures.d.ts
@@ -67,6 +67,7 @@ export interface User {
avatar?: string;
password?: string;
email?: string;
+ totp_enabled: boolean;
created_timestamp: number;
updated_timestamp: number;
}
diff --git a/frontend/app/stores/user.store.ts b/frontend/app/stores/user.store.ts
index 6d17856c..1af16a94 100644
--- a/frontend/app/stores/user.store.ts
+++ b/frontend/app/stores/user.store.ts
@@ -17,14 +17,58 @@ export const useUserStore = defineStore('user', {
actions: {
async login(username: string, password: string) {
try {
- const response = await makeRequest<{ auth: boolean }>('auth', 'POST', { username, password });
- if (response.status == 'success') {
+ // makeRequest doit être capable de vous retourner la réponse brute ou le body complet
+ const response = await makeRequest<{ auth: boolean; pre_auth_token?: string; message?: string }>('auth', 'POST', { username, password });
+
+ if (response.status === 'success') {
+ if (response.result?.message === '2FA_REQUIRED') return { success: true, require2FA: true, preAuthToken: response.result?.pre_auth_token };
if (import.meta.client) localStorage.setItem('isLoggedIn', 'true');
- return true;
- } else throw response.message;
+ return { success: true, require2FA: false };
+ } else {
+ throw response.message;
+ }
} catch (e) {
- return e;
+ return { success: false, error: e };
+ }
+ },
+
+ async request2FA() {
+ const response = await makeRequest<{ secret: string; qr_code_url: string }>('auth/2fa/request', 'POST', {});
+ if (response.status === 'success') {
+ return response.result; // contient { secret, qr_code_url }
}
+ throw response.message;
+ },
+
+ async confirm2FA(secret: string, code: string): Promise<string[]> {
+ const response = await makeRequest<{ message: string; backup_codes: string[] }>('auth/2fa/confirm', 'POST', { secret, code });
+ if (response.status === 'success') {
+ if (this.user) this.user.totp_enabled = true;
+ return response.result?.backup_codes || [];
+ }
+ throw response.message;
+ },
+
+ async verify2FA(preAuthToken: string, code: string) {
+ try {
+ const response = await makeRequest<{ success: boolean }>('auth/2fa/verify', 'POST', { pre_auth_token: preAuthToken, code });
+ if (response.status === 'success') {
+ if (import.meta.client) localStorage.setItem('isLoggedIn', 'true');
+ return { success: true };
+ }
+ throw response.message;
+ } catch (e) {
+ return { success: false, error: e };
+ }
+ },
+
+ async disable2FA(code: string) {
+ const response = await makeRequest('auth/2fa/disable', 'POST', { code });
+ if (response.status === 'success') {
+ if (this.user) this.user.totp_enabled = false;
+ return true;
+ }
+ throw response.message;
},
async register(user: Omit<User, 'created_timestamp' | 'id' | 'updated_timestamp'>): Promise<boolean> {
@@ -46,7 +90,7 @@ export const useUserStore = defineStore('user', {
if (this.sessions.length) return this.sessions;
const response = await makeRequest<Session[]>(`auth/sessions`, 'GET', {});
if (response.status === 'success') {
- this.sessions = response.result as Session[];
+ this.sessions = response.result?.length ? response.result : [];
return this.sessions;
}
throw response.message;
@@ -130,6 +174,15 @@ export const useUserStore = defineStore('user', {
} else throw request.message;
},
+ async deleteSession(sessionId: string) {
+ if (!this.user) return;
+ const request = await makeRequest(`auth/sessions/${sessionId}`, 'DELETE', {});
+ if (request.status === 'success') {
+ this.sessions = this.sessions.filter(s => s.id !== sessionId);
+ return true;
+ } else throw request.message;
+ },
+
async deleteAccount() {
if (!this.user) return;
const request = await makeRequest(`users/${this.user.id}`, 'DELETE', {});
diff --git a/frontend/app/styles/components/_index.scss b/frontend/app/styles/components/_index.scss
index 553a0640..91c948ea 100644
--- a/frontend/app/styles/components/_index.scss
+++ b/frontend/app/styles/components/_index.scss
@@ -1,3 +1,4 @@
+@forward "boxes.scss";
@forward "common.scss";
@forward "page-components.scss";
@forward "tags.scss";
diff --git a/frontend/app/styles/components/boxes.scss b/frontend/app/styles/components/boxes.scss
new file mode 100644
index 00000000..23e1e0fb
--- /dev/null
+++ b/frontend/app/styles/components/boxes.scss
@@ -0,0 +1,21 @@
+.warning-box {
+ display: flex;
+ padding: 1rem 1.25rem;
+ border: 1px solid var(--orange-border);
+ border-radius: var(--radius-lg);
+ background: var(--orange-bg);
+ gap: 1rem;
+ margin-bottom: 1.5rem;
+
+ strong {
+ display: block;
+ color: var(--orange-dark);
+ margin-bottom: 0.25rem;
+ }
+
+ p {
+ margin: 0;
+ font-size: 0.85rem;
+ color: var(--text-body);
+ }
+}
\ No newline at end of file
diff --git a/frontend/bun.lock b/frontend/bun.lock
index aa439266..326c63ae 100644
--- a/frontend/bun.lock
+++ b/frontend/bun.lock
@@ -43,6 +43,7 @@
"pinia": "^3.0.4",
"postcss-scss": "^4.0.9",
"punycode": "^2.3.1",
+ "qrcode.vue": "^3.10.0",
"sass": "^1.101.0",
"stylelint": "^17.13.0",
"stylelint-config-recommended-vue": "^1.6.1",
@@ -2057,6 +2058,8 @@
"qified": ["[email protected]", "", { "dependencies": { "hookified": "^2.1.1" } }, "sha512-+Owyggi9IxT1ePKGafcI87ubSmxol6smwJ+RAHDQlx9+9cPwFWDiKFFCPuWhr9ignlGpZ9vDQLw67N4dcTVFEA=="],
+ "qrcode.vue": ["[email protected]", "", { "peerDependencies": { "vue": "^3.0.0" } }, "sha512-1bjeBds9hRKMszZuBuYQZor9HdJYWtb0S44HG1JofZ9uicpJpdF+TtDvqo3+2ZlH0k80WVIkmiKB4hq0/N6/rA=="],
+
"quansync": ["[email protected]", "", {}, "sha512-AifT7QEbW9Nri4tAwR5M/uzpBuqfZf+zwaEM/QkzEjj7NBuFD2rBuy0K3dE+8wltbezDV7JMA0WfnCPYRSYbXA=="],
"query-string": ["[email protected]", "", { "dependencies": { "object-assign": "^4.1.0", "strict-uri-encode": "^1.0.0" } }, "sha512-O2XLNDBIg1DnTOa+2XrIwSiXEV8h2KImXUnjhhn2+UsvZ+Es2uyd5CCRTNQlDGbzUQOW3aYCBx9rVA6dzsiY7Q=="],
diff --git a/frontend/nuxt.config.ts b/frontend/nuxt.config.ts
index 3988ec90..54cf77c6 100644
--- a/frontend/nuxt.config.ts
+++ b/frontend/nuxt.config.ts
@@ -1,6 +1,7 @@
import { defineNuxtConfig } from 'nuxt/config';
import { resolve } from 'path';
import { createSvgIconsPlugin } from './vite/plugins/svg-sprite';
+import type { NuxtPage } from 'nuxt/schema';
export default defineNuxtConfig({
app: {
@@ -85,6 +86,21 @@ export default defineNuxtConfig({
imports: {
dirs: ['stores/**'],
},
+ hooks: {
+ 'pages:extend'(pages: NuxtPage[]) {
+ function remove(pages: NuxtPage[]) {
+ for (const page of [...pages]) {
+ if (page.file?.includes('/components/') || page.file?.includes('/_')) {
+ pages.splice(pages.indexOf(page), 1);
+ }
+
+ if (page.children) remove(page.children);
+ }
+ }
+
+ remove(pages);
+ },
+ },
colorMode: {
classSuffix: '-mode',
fallback: 'light', // fallback value if not system preference found
diff --git a/frontend/package.json b/frontend/package.json
index 99ecc491..c9833fd1 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -40,6 +40,7 @@
"pinia": "^3.0.4",
"postcss-scss": "^4.0.9",
"punycode": "^2.3.1",
+ "qrcode.vue": "^3.10.0",
"sass": "^1.101.0",
"stylelint": "^17.13.0",
"stylelint-config-recommended-vue": "^1.6.1",