-
Notifications
You must be signed in to change notification settings - Fork 451
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(v2): implement user register OTP (#6030)
* feat(v2): implement user register OTP * feat(v2): implement user verify OTP * session: retry on permission denied
- Loading branch information
Showing
10 changed files
with
1,113 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
package user | ||
|
||
import ( | ||
"context" | ||
|
||
"github.com/zitadel/zitadel/internal/api/authz" | ||
"github.com/zitadel/zitadel/internal/api/grpc/object/v2" | ||
"github.com/zitadel/zitadel/internal/domain" | ||
user "github.com/zitadel/zitadel/pkg/grpc/user/v2alpha" | ||
) | ||
|
||
func (s *Server) RegisterOTP(ctx context.Context, req *user.RegisterOTPRequest) (*user.RegisterOTPResponse, error) { | ||
return otpDetailsToPb( | ||
s.command.AddUserOTP(ctx, req.GetUserId(), authz.GetCtxData(ctx).ResourceOwner), | ||
) | ||
|
||
} | ||
|
||
func otpDetailsToPb(otp *domain.OTPv2, err error) (*user.RegisterOTPResponse, error) { | ||
if err != nil { | ||
return nil, err | ||
} | ||
return &user.RegisterOTPResponse{ | ||
Details: object.DomainToDetailsPb(otp.ObjectDetails), | ||
Uri: otp.URI, | ||
Secret: otp.Secret, | ||
}, nil | ||
} | ||
|
||
func (s *Server) VerifyOTPRegistration(ctx context.Context, req *user.VerifyOTPRegistrationRequest) (*user.VerifyOTPRegistrationResponse, error) { | ||
objectDetails, err := s.command.CheckUserOTP(ctx, req.GetUserId(), req.GetCode(), authz.GetCtxData(ctx).ResourceOwner) | ||
if err != nil { | ||
return nil, err | ||
} | ||
return &user.VerifyOTPRegistrationResponse{ | ||
Details: object.DomainToDetailsPb(objectDetails), | ||
}, nil | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,155 @@ | ||
//go:build integration | ||
|
||
package user_test | ||
|
||
import ( | ||
"context" | ||
"testing" | ||
|
||
"github.com/stretchr/testify/assert" | ||
"github.com/stretchr/testify/require" | ||
|
||
"github.com/zitadel/zitadel/internal/integration" | ||
user "github.com/zitadel/zitadel/pkg/grpc/user/v2alpha" | ||
) | ||
|
||
func TestServer_RegisterOTP(t *testing.T) { | ||
// userID := Tester.CreateHumanUser(CTX).GetUserId() | ||
|
||
type args struct { | ||
ctx context.Context | ||
req *user.RegisterOTPRequest | ||
} | ||
tests := []struct { | ||
name string | ||
args args | ||
want *user.RegisterOTPResponse | ||
wantErr bool | ||
}{ | ||
{ | ||
name: "missing user id", | ||
args: args{ | ||
ctx: CTX, | ||
req: &user.RegisterOTPRequest{}, | ||
}, | ||
wantErr: true, | ||
}, | ||
{ | ||
name: "user mismatch", | ||
args: args{ | ||
ctx: CTX, | ||
req: &user.RegisterOTPRequest{ | ||
UserId: "wrong", | ||
}, | ||
}, | ||
wantErr: true, | ||
}, | ||
/* TODO: after we are able to obtain a Bearer token for a human user | ||
https://github.com/zitadel/zitadel/issues/6022 | ||
{ | ||
name: "human user", | ||
args: args{ | ||
ctx: CTX, | ||
req: &user.RegisterOTPRequest{ | ||
UserId: userID, | ||
}, | ||
}, | ||
want: &user.RegisterOTPResponse{ | ||
Details: &object.Details{ | ||
ResourceOwner: Tester.Organisation.ID, | ||
}, | ||
}, | ||
}, | ||
*/ | ||
} | ||
for _, tt := range tests { | ||
t.Run(tt.name, func(t *testing.T) { | ||
got, err := Client.RegisterOTP(tt.args.ctx, tt.args.req) | ||
if tt.wantErr { | ||
require.Error(t, err) | ||
return | ||
} | ||
require.NoError(t, err) | ||
require.NotNil(t, got) | ||
integration.AssertDetails(t, tt.want, got) | ||
assert.NotEmpty(t, got.GetUri()) | ||
assert.NotEmpty(t, got.GetSecret()) | ||
}) | ||
} | ||
} | ||
|
||
func TestServer_VerifyOTPRegistration(t *testing.T) { | ||
userID := Tester.CreateHumanUser(CTX).GetUserId() | ||
|
||
/* TODO: after we are able to obtain a Bearer token for a human user | ||
reg, err := Client.RegisterOTP(CTX, &user.RegisterOTPRequest{ | ||
UserId: userID, | ||
}) | ||
require.NoError(t, err) | ||
code, err := totp.GenerateCode(reg.Secret, time.Now()) | ||
require.NoError(t, err) | ||
*/ | ||
|
||
type args struct { | ||
ctx context.Context | ||
req *user.VerifyOTPRegistrationRequest | ||
} | ||
tests := []struct { | ||
name string | ||
args args | ||
want *user.VerifyOTPRegistrationResponse | ||
wantErr bool | ||
}{ | ||
{ | ||
name: "user mismatch", | ||
args: args{ | ||
ctx: CTX, | ||
req: &user.VerifyOTPRegistrationRequest{ | ||
UserId: "wrong", | ||
}, | ||
}, | ||
wantErr: true, | ||
}, | ||
{ | ||
name: "wrong code", | ||
args: args{ | ||
ctx: CTX, | ||
req: &user.VerifyOTPRegistrationRequest{ | ||
UserId: userID, | ||
Code: "123", | ||
}, | ||
}, | ||
wantErr: true, | ||
}, | ||
/* TODO: after we are able to obtain a Bearer token for a human user | ||
https://github.com/zitadel/zitadel/issues/6022 | ||
{ | ||
name: "success", | ||
args: args{ | ||
ctx: CTX, | ||
req: &user.VerifyOTPRegistrationRequest{ | ||
UserId: userID, | ||
Code: code, | ||
}, | ||
}, | ||
want: &user.VerifyOTPRegistrationResponse{ | ||
Details: &object.Details{ | ||
ResourceOwner: Tester.Organisation.ResourceOwner, | ||
}, | ||
}, | ||
}, | ||
*/ | ||
} | ||
for _, tt := range tests { | ||
t.Run(tt.name, func(t *testing.T) { | ||
got, err := Client.VerifyOTPRegistration(tt.args.ctx, tt.args.req) | ||
if tt.wantErr { | ||
require.Error(t, err) | ||
return | ||
} | ||
require.NoError(t, err) | ||
require.NotNil(t, got) | ||
integration.AssertDetails(t, tt.want, got) | ||
}) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
package user | ||
|
||
import ( | ||
"io" | ||
"testing" | ||
"time" | ||
|
||
"github.com/stretchr/testify/require" | ||
"google.golang.org/protobuf/proto" | ||
"google.golang.org/protobuf/types/known/timestamppb" | ||
|
||
"github.com/zitadel/zitadel/internal/domain" | ||
object "github.com/zitadel/zitadel/pkg/grpc/object/v2alpha" | ||
user "github.com/zitadel/zitadel/pkg/grpc/user/v2alpha" | ||
) | ||
|
||
func Test_otpDetailsToPb(t *testing.T) { | ||
type args struct { | ||
otp *domain.OTPv2 | ||
err error | ||
} | ||
tests := []struct { | ||
name string | ||
args args | ||
want *user.RegisterOTPResponse | ||
wantErr error | ||
}{ | ||
{ | ||
name: "error", | ||
args: args{ | ||
err: io.ErrClosedPipe, | ||
}, | ||
wantErr: io.ErrClosedPipe, | ||
}, | ||
{ | ||
name: "success", | ||
args: args{ | ||
otp: &domain.OTPv2{ | ||
ObjectDetails: &domain.ObjectDetails{ | ||
Sequence: 123, | ||
EventDate: time.Unix(456, 789), | ||
ResourceOwner: "me", | ||
}, | ||
Secret: "secret", | ||
URI: "URI", | ||
}, | ||
}, | ||
want: &user.RegisterOTPResponse{ | ||
Details: &object.Details{ | ||
Sequence: 123, | ||
ChangeDate: ×tamppb.Timestamp{ | ||
Seconds: 456, | ||
Nanos: 789, | ||
}, | ||
ResourceOwner: "me", | ||
}, | ||
Secret: "secret", | ||
Uri: "URI", | ||
}, | ||
}, | ||
} | ||
for _, tt := range tests { | ||
t.Run(tt.name, func(t *testing.T) { | ||
got, err := otpDetailsToPb(tt.args.otp, tt.args.err) | ||
require.ErrorIs(t, err, tt.wantErr) | ||
if !proto.Equal(tt.want, got) { | ||
t.Errorf("RegisterOTPResponse =\n%v\nwant\n%v", got, tt.want) | ||
} | ||
}) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
09aafb3
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Successfully deployed to the following URLs:
docs – ./
zitadel-docs.vercel.app
docs-git-main-zitadel.vercel.app
docs-zitadel.vercel.app