|
|
@@ -64,11 +64,15 @@ func TestChangePassword_Success(t *testing.T) {
|
|
|
t.Cleanup(func() { testutil.CleanTable(ctx, conn, "`sys_user`", userId) })
|
|
|
|
|
|
logic := NewChangePasswordLogic(ctxWithUserId(userId), svcCtx)
|
|
|
- err := logic.ChangePassword(&types.ChangePasswordReq{
|
|
|
+ resp, err := logic.ChangePassword(&types.ChangePasswordReq{
|
|
|
OldPassword: oldPwd,
|
|
|
NewPassword: newPwd,
|
|
|
})
|
|
|
require.NoError(t, err)
|
|
|
+ require.NotNil(t, resp)
|
|
|
+ assert.NotEmpty(t, resp.AccessToken)
|
|
|
+ assert.NotEmpty(t, resp.RefreshToken)
|
|
|
+ assert.Greater(t, resp.Expires, int64(0))
|
|
|
|
|
|
updated, err := svcCtx.SysUserModel.FindOne(ctx, userId)
|
|
|
require.NoError(t, err)
|
|
|
@@ -89,7 +93,7 @@ func TestChangePassword_MustChangePasswordReset(t *testing.T) {
|
|
|
t.Cleanup(func() { testutil.CleanTable(ctx, conn, "`sys_user`", userId) })
|
|
|
|
|
|
logic := NewChangePasswordLogic(ctxWithUserId(userId), svcCtx)
|
|
|
- err := logic.ChangePassword(&types.ChangePasswordReq{
|
|
|
+ _, err := logic.ChangePassword(&types.ChangePasswordReq{
|
|
|
OldPassword: oldPwd,
|
|
|
NewPassword: newPwd,
|
|
|
})
|
|
|
@@ -112,7 +116,7 @@ func TestChangePassword_WrongOldPassword(t *testing.T) {
|
|
|
t.Cleanup(func() { testutil.CleanTable(ctx, conn, "`sys_user`", userId) })
|
|
|
|
|
|
logic := NewChangePasswordLogic(ctxWithUserId(userId), svcCtx)
|
|
|
- err := logic.ChangePassword(&types.ChangePasswordReq{
|
|
|
+ _, err := logic.ChangePassword(&types.ChangePasswordReq{
|
|
|
OldPassword: "Wrongpass1",
|
|
|
NewPassword: "Newpass456",
|
|
|
})
|
|
|
@@ -128,7 +132,7 @@ func TestChangePassword_NewPasswordTooShort(t *testing.T) {
|
|
|
svcCtx := svc.NewServiceContext(testutil.GetTestConfig())
|
|
|
|
|
|
logic := NewChangePasswordLogic(ctxWithUserId(1), svcCtx)
|
|
|
- err := logic.ChangePassword(&types.ChangePasswordReq{
|
|
|
+ _, err := logic.ChangePassword(&types.ChangePasswordReq{
|
|
|
OldPassword: "oldpass",
|
|
|
NewPassword: "Pas1234",
|
|
|
})
|
|
|
@@ -153,7 +157,7 @@ func TestChangePassword_NewPasswordExactly8Chars(t *testing.T) {
|
|
|
t.Cleanup(func() { testutil.CleanTable(ctx, conn, "`sys_user`", userId) })
|
|
|
|
|
|
logic := NewChangePasswordLogic(ctxWithUserId(userId), svcCtx)
|
|
|
- err := logic.ChangePassword(&types.ChangePasswordReq{
|
|
|
+ _, err := logic.ChangePassword(&types.ChangePasswordReq{
|
|
|
OldPassword: oldPwd,
|
|
|
NewPassword: newPwd,
|
|
|
})
|
|
|
@@ -169,7 +173,7 @@ func TestChangePassword_NewPasswordEmpty(t *testing.T) {
|
|
|
svcCtx := svc.NewServiceContext(testutil.GetTestConfig())
|
|
|
|
|
|
logic := NewChangePasswordLogic(ctxWithUserId(1), svcCtx)
|
|
|
- err := logic.ChangePassword(&types.ChangePasswordReq{
|
|
|
+ _, err := logic.ChangePassword(&types.ChangePasswordReq{
|
|
|
OldPassword: "oldpass",
|
|
|
NewPassword: "",
|
|
|
})
|
|
|
@@ -186,7 +190,7 @@ func TestChangePassword_NewPasswordTooLong(t *testing.T) {
|
|
|
|
|
|
longPwd := "A" + strings.Repeat("a", 71) + "1"
|
|
|
logic := NewChangePasswordLogic(ctxWithUserId(1), svcCtx)
|
|
|
- err := logic.ChangePassword(&types.ChangePasswordReq{
|
|
|
+ _, err := logic.ChangePassword(&types.ChangePasswordReq{
|
|
|
OldPassword: "oldpass",
|
|
|
NewPassword: longPwd,
|
|
|
})
|
|
|
@@ -211,7 +215,7 @@ func TestChangePassword_NewPasswordExactly72Chars(t *testing.T) {
|
|
|
t.Cleanup(func() { testutil.CleanTable(ctx, conn, "`sys_user`", userId) })
|
|
|
|
|
|
logic := NewChangePasswordLogic(ctxWithUserId(userId), svcCtx)
|
|
|
- err := logic.ChangePassword(&types.ChangePasswordReq{
|
|
|
+ _, err := logic.ChangePassword(&types.ChangePasswordReq{
|
|
|
OldPassword: oldPwd,
|
|
|
NewPassword: newPwd,
|
|
|
})
|
|
|
@@ -235,7 +239,7 @@ func TestChangePassword_SameOldAndNew(t *testing.T) {
|
|
|
t.Cleanup(func() { testutil.CleanTable(ctx, conn, "`sys_user`", userId) })
|
|
|
|
|
|
logic := NewChangePasswordLogic(ctxWithUserId(userId), svcCtx)
|
|
|
- err := logic.ChangePassword(&types.ChangePasswordReq{
|
|
|
+ _, err := logic.ChangePassword(&types.ChangePasswordReq{
|
|
|
OldPassword: pwd,
|
|
|
NewPassword: pwd,
|
|
|
})
|
|
|
@@ -282,7 +286,7 @@ func TestChangePassword_SameOldAndNew_ChecksBeforeBcrypt(t *testing.T) {
|
|
|
ctx := middleware.WithUserDetails(t.Context(), &loaders.UserDetails{UserId: userId})
|
|
|
|
|
|
wrongOldButEqualNew := "Samepass123"
|
|
|
- err = NewChangePasswordLogic(ctx, svcCtx).ChangePassword(&types.ChangePasswordReq{
|
|
|
+ _, err = NewChangePasswordLogic(ctx, svcCtx).ChangePassword(&types.ChangePasswordReq{
|
|
|
OldPassword: wrongOldButEqualNew,
|
|
|
NewPassword: wrongOldButEqualNew,
|
|
|
})
|
|
|
@@ -301,7 +305,7 @@ func TestChangePassword_UserNotFound(t *testing.T) {
|
|
|
svcCtx := svc.NewServiceContext(testutil.GetTestConfig())
|
|
|
|
|
|
logic := NewChangePasswordLogic(ctxWithUserId(99999999), svcCtx)
|
|
|
- err := logic.ChangePassword(&types.ChangePasswordReq{
|
|
|
+ _, err := logic.ChangePassword(&types.ChangePasswordReq{
|
|
|
OldPassword: "Oldpass123",
|
|
|
NewPassword: "Newpass456",
|
|
|
})
|
|
|
@@ -341,7 +345,7 @@ func TestChangePassword_UpdateConflict_Maps409(t *testing.T) {
|
|
|
ctx := middleware.WithUserDetails(t.Context(), &loaders.UserDetails{UserId: userId})
|
|
|
|
|
|
logic := NewChangePasswordLogic(ctx, svcCtx)
|
|
|
- err = logic.ChangePassword(&types.ChangePasswordReq{
|
|
|
+ _, err = logic.ChangePassword(&types.ChangePasswordReq{
|
|
|
OldPassword: oldPwd,
|
|
|
NewPassword: newPwd,
|
|
|
})
|
|
|
@@ -382,7 +386,7 @@ func TestChangePassword_GenericUpdateError_StillPropagates(t *testing.T) {
|
|
|
ctx := middleware.WithUserDetails(t.Context(), &loaders.UserDetails{UserId: userId})
|
|
|
|
|
|
logic := NewChangePasswordLogic(ctx, svcCtx)
|
|
|
- err = logic.ChangePassword(&types.ChangePasswordReq{
|
|
|
+ _, err = logic.ChangePassword(&types.ChangePasswordReq{
|
|
|
OldPassword: oldPwd,
|
|
|
NewPassword: newPwd,
|
|
|
})
|
|
|
@@ -438,12 +442,15 @@ func TestChangePassword_E2E_SecondCallWithOldPwd_Maps400(t *testing.T) {
|
|
|
&loaders.UserDetails{UserId: userId, Username: username, Status: 1})
|
|
|
|
|
|
require.NoError(t,
|
|
|
- NewChangePasswordLogic(lctx, svcCtx).ChangePassword(&types.ChangePasswordReq{
|
|
|
- OldPassword: oldPwd, NewPassword: "NewpassX_11",
|
|
|
- }),
|
|
|
+ func() error {
|
|
|
+ _, err := NewChangePasswordLogic(lctx, svcCtx).ChangePassword(&types.ChangePasswordReq{
|
|
|
+ OldPassword: oldPwd, NewPassword: "NewpassX_11",
|
|
|
+ })
|
|
|
+ return err
|
|
|
+ }(),
|
|
|
"首改必须成功")
|
|
|
|
|
|
- err := NewChangePasswordLogic(lctx, svcCtx).ChangePassword(&types.ChangePasswordReq{
|
|
|
+ _, err := NewChangePasswordLogic(lctx, svcCtx).ChangePassword(&types.ChangePasswordReq{
|
|
|
OldPassword: oldPwd, NewPassword: "NewpassY_22",
|
|
|
})
|
|
|
require.Error(t, err)
|
|
|
@@ -502,6 +509,7 @@ func runSnapshotForwardCase(t *testing.T, expectedUpdateTime int64) {
|
|
|
svcCtx := mocks.NewMockServiceContext(mocks.MockModels{User: mockUser})
|
|
|
ctx := middleware.WithUserDetails(t.Context(), &loaders.UserDetails{UserId: userId})
|
|
|
|
|
|
- require.NoError(t, NewChangePasswordLogic(ctx, svcCtx).ChangePassword(
|
|
|
- &types.ChangePasswordReq{OldPassword: oldPwd, NewPassword: newPwd}))
|
|
|
+ _, err = NewChangePasswordLogic(ctx, svcCtx).ChangePassword(
|
|
|
+ &types.ChangePasswordReq{OldPassword: oldPwd, NewPassword: newPwd})
|
|
|
+ require.NoError(t, err)
|
|
|
}
|