Skip to content

fix: show audit logs for forgot password flow #15181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Oct 22, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor: request one-time passcode -> request password reset
  • Loading branch information
DanielleMaywood committed Oct 22, 2024
commit a258f68ee63e25d15bf3350df7584d657e89c599
4 changes: 2 additions & 2 deletions coderd/apidoc/docs.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions coderd/apidoc/swagger.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions coderd/audit.go
Original file line number Diff line number Diff line change
Expand Up @@ -277,9 +277,9 @@ func auditLogDescription(alog database.GetAuditLogsOffsetRow) string {

// NOTE: WriteString always returns a nil error, so we never check it

// Requesting a one-time passcode can be performed by anyone that knows the email
// Requesting a password reset can be performed by anyone that knows the email
// of a user so saying the user performed this action might be slightly misleading.
if alog.AuditLog.Action != database.AuditActionRequestOneTimePasscode {
if alog.AuditLog.Action != database.AuditActionRequestPasswordReset {
_, _ = b.WriteString("{user} ")
}

Expand All @@ -305,7 +305,7 @@ func auditLogDescription(alog database.GetAuditLogsOffsetRow) string {
return b.String()
}

if alog.AuditLog.Action == database.AuditActionRequestOneTimePasscode {
if alog.AuditLog.Action == database.AuditActionRequestPasswordReset {
_, _ = b.WriteString(" for")
} else {
_, _ = b.WriteString(" ")
Expand Down
2 changes: 1 addition & 1 deletion coderd/database/dump.sql

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ALTER TYPE audit_action
ADD VALUE IF NOT EXISTS 'request_password_reset';
22 changes: 11 additions & 11 deletions coderd/database/models.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion coderd/userauth.go
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ func (api *API) postRequestOneTimePasscode(rw http.ResponseWriter, r *http.Reque
Audit: *auditor,
Log: api.Logger,
Request: r,
Action: database.AuditActionRequestOneTimePasscode,
Action: database.AuditActionRequestPasswordReset,
})
)
defer commitAudit()
Expand Down
22 changes: 11 additions & 11 deletions codersdk/audit.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,15 @@ func (r ResourceType) FriendlyString() string {
type AuditAction string

const (
AuditActionCreate AuditAction = "create"
AuditActionWrite AuditAction = "write"
AuditActionDelete AuditAction = "delete"
AuditActionStart AuditAction = "start"
AuditActionStop AuditAction = "stop"
AuditActionLogin AuditAction = "login"
AuditActionLogout AuditAction = "logout"
AuditActionRegister AuditAction = "register"
AuditActionRequestOneTimePasscode AuditAction = "request_one_time_passcode"
AuditActionCreate AuditAction = "create"
AuditActionWrite AuditAction = "write"
AuditActionDelete AuditAction = "delete"
AuditActionStart AuditAction = "start"
AuditActionStop AuditAction = "stop"
AuditActionLogin AuditAction = "login"
AuditActionLogout AuditAction = "logout"
AuditActionRegister AuditAction = "register"
AuditActionRequestPasswordReset AuditAction = "request_password_reset"
)

func (a AuditAction) Friendly() string {
Expand All @@ -115,8 +115,8 @@ func (a AuditAction) Friendly() string {
return "logged out"
case AuditActionRegister:
return "registered"
case AuditActionRequestOneTimePasscode:
return "one time passcode requested"
case AuditActionRequestPasswordReset:
return "password reset requested"
default:
return "unknown"
}
Expand Down
22 changes: 11 additions & 11 deletions docs/reference/api/schemas.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions site/src/api/typesGenerated.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions site/src/testHelpers/entities.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2604,8 +2604,8 @@ export const MockAuditLogRequestOneTimePasscode: TypesGen.AuditLog = {
...MockAuditLog,
resource_type: "user",
resource_target: "member",
action: "request_one_time_passcode",
description: "one time passcode requested for {target}",
action: "request_password_reset",
description: "password reset requested for {target}",
diff: {
hashed_password: {
old: "",
Expand Down
Loading