Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb89dfd7

Browse files
test: add more tests
1 parent39fa0f1 commitb89dfd7

File tree

2 files changed

+128
-14
lines changed

2 files changed

+128
-14
lines changed

‎coderd/userauth.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -274,10 +274,10 @@ func (api *API) postRequestOneTimePasscode(rw http.ResponseWriter, r *http.Reque
274274
return
275275
}
276276

277-
newUser:=user
278-
newUser.HashedOneTimePasscode= []byte(hashedPasscode)
279-
newUser.OneTimePasscodeExpiresAt= sql.NullTime{Time:passcodeExpiresAt,Valid:true}
280-
aReq.New=newUser
277+
auditUser:=user
278+
auditUser.HashedOneTimePasscode= []byte(hashedPasscode)
279+
auditUser.OneTimePasscodeExpiresAt= sql.NullTime{Time:passcodeExpiresAt,Valid:true}
280+
aReq.New=auditUser
281281

282282
// Send the one-time passcode to the user.
283283
err=api.notifyUserRequestedOneTimePasscode(ctx,user,passcode.String())
@@ -425,11 +425,11 @@ func (api *API) postChangePasswordWithOneTimePasscode(rw http.ResponseWriter, r
425425
return
426426
}
427427

428-
newUser:=user
429-
newUser.HashedPassword= []byte(newHashedPassword)
430-
newUser.OneTimePasscodeExpiresAt= sql.NullTime{}
431-
newUser.HashedOneTimePasscode=nil
432-
aReq.New=newUser
428+
auditUser:=user
429+
auditUser.HashedPassword= []byte(newHashedPassword)
430+
auditUser.OneTimePasscodeExpiresAt= sql.NullTime{}
431+
auditUser.HashedOneTimePasscode=nil
432+
aReq.New=auditUser
433433

434434
rw.WriteHeader(http.StatusOK)
435435
}

‎coderd/userauth_test.go

Lines changed: 119 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1658,7 +1658,16 @@ func TestOIDCSkipIssuer(t *testing.T) {
16581658
funcTestUserForgotPassword(t*testing.T) {
16591659
t.Parallel()
16601660

1661-
t.Run("Can change their password",func(t*testing.T) {
1661+
verifyOneTimePasscodeNotification:=func(t*testing.T,notif*testutil.Notification,userID uuid.UUID) {
1662+
require.Equal(t,notifications.TemplateUserRequestedOneTimePasscode,notif.TemplateID)
1663+
require.Equal(t,userID,notif.UserID)
1664+
require.Equal(t,1,len(notif.Targets))
1665+
require.Equal(t,userID,notif.Targets[0])
1666+
}
1667+
1668+
t.Run("CanChangeTheirPassword",func(t*testing.T) {
1669+
constnewPassword="SomeNewSecurePassword!"
1670+
16621671
t.Parallel()
16631672

16641673
notifyEnq:=&testutil.FakeNotificationsEnqueuer{}
@@ -1681,19 +1690,124 @@ func TestUserForgotPassword(t *testing.T) {
16811690
require.Equal(t,2,len(notifyEnq.Sent))
16821691

16831692
notif:=notifyEnq.Sent[1]
1684-
require.Equal(t,notifications.TemplateUserRequestedOneTimePasscode,notif.TemplateID)
1685-
require.Equal(t,anotherUser.ID,notif.UserID)
1686-
require.Equal(t,1,len(notif.Targets))
1687-
require.Equal(t,anotherUser.ID,notif.Targets[0])
1693+
verifyOneTimePasscodeNotification(t,notif,anotherUser.ID)
16881694

16891695
oneTimePasscode:=notif.Labels["one_time_passcode"]
16901696

16911697
err=anotherClient.ChangePasswordWithOneTimePasscode(ctx, codersdk.ChangePasswordWithOneTimePasscodeRequest{
16921698
Email:anotherUser.Email,
16931699
OneTimePasscode:oneTimePasscode,
1700+
Password:newPassword,
1701+
})
1702+
require.NoError(t,err)
1703+
1704+
_,err=anotherClient.LoginWithPassword(ctx, codersdk.LoginWithPasswordRequest{
1705+
Email:anotherUser.Email,
1706+
Password:newPassword,
1707+
})
1708+
require.NoError(t,err)
1709+
})
1710+
1711+
t.Run("CannotChangePasswordWithInvalidOneTimePasscode",func(t*testing.T) {
1712+
t.Parallel()
1713+
1714+
notifyEnq:=&testutil.FakeNotificationsEnqueuer{}
1715+
1716+
client:=coderdtest.New(t,&coderdtest.Options{
1717+
NotificationsEnqueuer:notifyEnq,
1718+
})
1719+
user:=coderdtest.CreateFirstUser(t,client)
1720+
1721+
ctx,cancel:=context.WithTimeout(context.Background(),testutil.WaitLong)
1722+
defercancel()
1723+
1724+
anotherClient,anotherUser:=coderdtest.CreateAnotherUser(t,client,user.OrganizationID)
1725+
1726+
err:=anotherClient.RequestOneTimePasscode(ctx, codersdk.RequestOneTimePasscodeRequest{
1727+
Email:anotherUser.Email,
1728+
})
1729+
require.NoError(t,err)
1730+
1731+
require.Equal(t,2,len(notifyEnq.Sent))
1732+
1733+
notif:=notifyEnq.Sent[1]
1734+
verifyOneTimePasscodeNotification(t,notif,anotherUser.ID)
1735+
1736+
err=anotherClient.ChangePasswordWithOneTimePasscode(ctx, codersdk.ChangePasswordWithOneTimePasscodeRequest{
1737+
Email:anotherUser.Email,
1738+
OneTimePasscode:uuid.New().String(),// Use a different UUID to the one expected
16941739
Password:"SomeNewSecurePassword!",
16951740
})
1741+
require.Error(t,err)
1742+
1743+
varapiErr*codersdk.Error
1744+
require.ErrorAs(t,err,&apiErr)
1745+
require.Equal(t,http.StatusBadRequest,apiErr.StatusCode())
1746+
})
1747+
1748+
t.Run("CannotChangePasswordWithWeakPassword",func(t*testing.T) {
1749+
t.Parallel()
1750+
1751+
notifyEnq:=&testutil.FakeNotificationsEnqueuer{}
1752+
1753+
client:=coderdtest.New(t,&coderdtest.Options{
1754+
NotificationsEnqueuer:notifyEnq,
1755+
})
1756+
user:=coderdtest.CreateFirstUser(t,client)
1757+
1758+
ctx,cancel:=context.WithTimeout(context.Background(),testutil.WaitLong)
1759+
defercancel()
1760+
1761+
anotherClient,anotherUser:=coderdtest.CreateAnotherUser(t,client,user.OrganizationID)
1762+
1763+
err:=anotherClient.RequestOneTimePasscode(ctx, codersdk.RequestOneTimePasscodeRequest{
1764+
Email:anotherUser.Email,
1765+
})
16961766
require.NoError(t,err)
1767+
1768+
require.Equal(t,2,len(notifyEnq.Sent))
1769+
1770+
notif:=notifyEnq.Sent[1]
1771+
verifyOneTimePasscodeNotification(t,notif,anotherUser.ID)
1772+
1773+
oneTimePasscode:=notif.Labels["one_time_passcode"]
1774+
1775+
err=anotherClient.ChangePasswordWithOneTimePasscode(ctx, codersdk.ChangePasswordWithOneTimePasscodeRequest{
1776+
Email:anotherUser.Email,
1777+
OneTimePasscode:oneTimePasscode,
1778+
Password:"notstrong",
1779+
})
1780+
require.Error(t,err)
1781+
1782+
varapiErr*codersdk.Error
1783+
require.ErrorAs(t,err,&apiErr)
1784+
require.Equal(t,http.StatusBadRequest,apiErr.StatusCode())
1785+
})
1786+
1787+
t.Run("NoNotificationIsSentIfEmailInvalid",func(t*testing.T) {
1788+
t.Parallel()
1789+
1790+
notifyEnq:=&testutil.FakeNotificationsEnqueuer{}
1791+
1792+
client:=coderdtest.New(t,&coderdtest.Options{
1793+
NotificationsEnqueuer:notifyEnq,
1794+
})
1795+
user:=coderdtest.CreateFirstUser(t,client)
1796+
1797+
ctx,cancel:=context.WithTimeout(context.Background(),testutil.WaitLong)
1798+
defercancel()
1799+
1800+
anotherClient,_:=coderdtest.CreateAnotherUser(t,client,user.OrganizationID)
1801+
1802+
err:=anotherClient.RequestOneTimePasscode(ctx, codersdk.RequestOneTimePasscodeRequest{
1803+
Email:"not-a-valid-email@coder.com",
1804+
})
1805+
require.NoError(t,err)
1806+
1807+
require.Equal(t,1,len(notifyEnq.Sent))
1808+
1809+
notif:=notifyEnq.Sent[0]
1810+
require.NotEqual(t,notifications.TemplateUserRequestedOneTimePasscode,notif.TemplateID)
16971811
})
16981812
}
16991813

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp