Skip to content
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.

Sign up for GitHub

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

feat: use one transaction for /admin/recovery/code #4225

Merged
merged 3 commits into from
Nov 27, 2024
+30 −18
Merged

feat: use one transaction for /admin/recovery/code #4225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
42f37f6
feat: use one transaction for `/admin/recovery/code`
aeneasr Nov 26, 2024
9e86783
chore: synchronize workspaces
aeneasr Nov 26, 2024
c632393
chore: synchronize workspaces
aeneasr Nov 27, 2024
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
1 change: 1 addition & 0 deletions selfservice/strategy/code/strategy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ type (
x.WriterProvider
x.LoggingProvider
x.TracingProvider
x.TransactionPersistenceProvider

config.Provider

Expand Down
31 changes: 19 additions & 12 deletions selfservice/strategy/code/strategy_recovery_admin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,13 @@
package code

import (
"context"
"net/http"
"net/url"
"time"

"github.com/gobuffalo/pop/v6"

"github.com/gofrs/uuid"
"github.com/julienschmidt/httprouter"
"github.com/pkg/errors"
Expand Down Expand Up @@ -184,16 +187,12 @@
})).
WithMetaLabel(text.NewInfoNodeLabelRecoveryCode()),
)
rawCode := GenerateCode()

recoveryFlow.UI.Nodes.
Append(node.NewInputField("method", s.RecoveryStrategyID(), node.CodeGroup, node.InputAttributeTypeSubmit).
WithMetaLabel(text.NewInfoNodeLabelContinue()))

if err := s.deps.RecoveryFlowPersister().CreateRecoveryFlow(ctx, recoveryFlow); err != nil {
s.deps.Writer().WriteError(w, r, err)
return
}

id, err := s.deps.IdentityPool().GetIdentity(ctx, p.IdentityID, identity.ExpandDefault)
if notFoundErr := sqlcon.ErrNoRows; errors.As(err, &notFoundErr) {
s.deps.Writer().WriteError(w, r, notFoundErr.WithReasonf("could not find identity"))
Expand All @@ -203,14 +202,22 @@
return
}

rawCode := GenerateCode()
if err := s.deps.TransactionalPersisterProvider().Transaction(ctx, func(ctx context.Context, c *pop.Connection) error {
if err := s.deps.RecoveryFlowPersister().CreateRecoveryFlow(ctx, recoveryFlow); err != nil {
return err

Check warning on line 207 in selfservice/strategy/code/strategy_recovery_admin.go

View check run for this annotation

Codecov / codecov/patch

selfservice/strategy/code/strategy_recovery_admin.go#L207 

Added line #L207 was not covered by tests
}

if _, err := s.deps.RecoveryCodePersister().CreateRecoveryCode(ctx, &CreateRecoveryCodeParams{
RawCode: rawCode,
CodeType: RecoveryCodeTypeAdmin,
ExpiresIn: expiresIn,
FlowID: recoveryFlow.ID,
IdentityID: id.ID,
}); err != nil {
return err

Check warning on line 217 in selfservice/strategy/code/strategy_recovery_admin.go

View check run for this annotation

Codecov / codecov/patch

selfservice/strategy/code/strategy_recovery_admin.go#L217 

Added line #L217 was not covered by tests
}

if _, err := s.deps.RecoveryCodePersister().CreateRecoveryCode(ctx, &CreateRecoveryCodeParams{
RawCode: rawCode,
CodeType: RecoveryCodeTypeAdmin,
ExpiresIn: expiresIn,
FlowID: recoveryFlow.ID,
IdentityID: id.ID,
return nil
}); err != nil {
s.deps.Writer().WriteError(w, r, err)
return
Expand Down
1 change: 1 addition & 0 deletions selfservice/strategy/link/strategy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ type (
x.WriterProvider
x.LoggingProvider
x.TracingProvider
x.TransactionPersistenceProvider

config.Provider

Expand Down
15 changes: 9 additions & 6 deletions selfservice/strategy/link/strategy_recovery.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
"net/url"
"time"

"github.com/gobuffalo/pop/v6"

"github.com/gofrs/uuid"
"github.com/julienschmidt/httprouter"
"github.com/pkg/errors"
Expand Down Expand Up @@ -171,11 +173,6 @@
return
}

if err := s.d.RecoveryFlowPersister().CreateRecoveryFlow(r.Context(), req); err != nil {
s.d.Writer().WriteError(w, r, err)
return
}

id, err := s.d.IdentityPool().GetIdentity(r.Context(), p.IdentityID, identity.ExpandDefault)
if errors.Is(err, sqlcon.ErrNoRows) {
s.d.Writer().WriteError(w, r, errors.WithStack(herodot.ErrBadRequest.WithReasonf("The requested identity id does not exist.").WithWrap(err)))
Expand All @@ -186,7 +183,13 @@
}

token := NewAdminRecoveryToken(id.ID, req.ID, expiresIn)
if err := s.d.RecoveryTokenPersister().CreateRecoveryToken(r.Context(), token); err != nil {
if err := s.d.TransactionalPersisterProvider().Transaction(r.Context(), func(ctx context.Context, c *pop.Connection) error {
if err := s.d.RecoveryFlowPersister().CreateRecoveryFlow(ctx, req); err != nil {
return err

Check warning on line 188 in selfservice/strategy/link/strategy_recovery.go

View check run for this annotation

Codecov / codecov/patch

selfservice/strategy/link/strategy_recovery.go#L188 

Added line #L188 was not covered by tests
}

return s.d.RecoveryTokenPersister().CreateRecoveryToken(ctx, token)
}); err != nil {

Check warning on line 192 in selfservice/strategy/link/strategy_recovery.go

View check run for this annotation

Codecov / codecov/patch

selfservice/strategy/link/strategy_recovery.go#L192 

Added line #L192 was not covered by tests
s.d.Writer().WriteError(w, r, err)
return
}
Expand Down
Loading