@@ -1686,9 +1686,9 @@ func (s *MethodTestSuite) TestUser() {
1686
1686
check .Args (arg ,emptyPreparedAuthorized {}).Asserts ()
1687
1687
}))
1688
1688
s .Run ("DeleteAPIKeysByUserID" ,s .Mocked (func (dbm * dbmock.MockStore ,faker * gofakeit.Faker ,check * expects ) {
1689
- u := testutil .Fake (s .T (),faker , database.User {})
1690
- dbm .EXPECT ().DeleteAPIKeysByUserID (gomock .Any (),u . ID ).Return (nil ).AnyTimes ()
1691
- check .Args (u . ID ).Asserts (rbac . ResourceApiKey . WithOwner ( u . ID . String ()) ,policy .ActionDelete ).Returns ()
1689
+ key := testutil .Fake (s .T (),faker , database.APIKey {})
1690
+ dbm .EXPECT ().DeleteAPIKeysByUserID (gomock .Any (),key . UserID ).Return (nil ).AnyTimes ()
1691
+ check .Args (key . UserID ).Asserts (key ,policy .ActionDelete ).Returns ()
1692
1692
}))
1693
1693
s .Run ("GetQuotaAllowanceForUser" ,s .Mocked (func (dbm * dbmock.MockStore ,faker * gofakeit.Faker ,check * expects ) {
1694
1694
u := testutil .Fake (s .T (),faker , database.User {})
@@ -1704,7 +1704,7 @@ func (s *MethodTestSuite) TestUser() {
1704
1704
}))
1705
1705
s .Run ("GetUserByEmailOrUsername" ,s .Mocked (func (dbm * dbmock.MockStore ,faker * gofakeit.Faker ,check * expects ) {
1706
1706
u := testutil .Fake (s .T (),faker , database.User {})
1707
- arg := database.GetUserByEmailOrUsernameParams {Username : u . Username , Email :u .Email }
1707
+ arg := database.GetUserByEmailOrUsernameParams {Email :u .Email }
1708
1708
dbm .EXPECT ().GetUserByEmailOrUsername (gomock .Any (),arg ).Return (u ,nil ).AnyTimes ()
1709
1709
check .Args (arg ).Asserts (u ,policy .ActionRead ).Returns (u )
1710
1710
}))
@@ -1728,7 +1728,7 @@ func (s *MethodTestSuite) TestUser() {
1728
1728
}))
1729
1729
s .Run ("InsertUser" ,s .Mocked (func (dbm * dbmock.MockStore ,_ * gofakeit.Faker ,check * expects ) {
1730
1730
arg := database.InsertUserParams {ID :uuid .New (),LoginType :database .LoginTypePassword ,RBACRoles : []string {}}
1731
- dbm .EXPECT ().InsertUser (gomock .Any (),arg ).Return (database.User {},nil ).AnyTimes ()
1731
+ dbm .EXPECT ().InsertUser (gomock .Any (),arg ).Return (database.User {ID : arg . ID , LoginType : arg . LoginType },nil ).AnyTimes ()
1732
1732
check .Args (arg ).Asserts (rbac .ResourceAssignRole ,policy .ActionAssign ,rbac .ResourceUser ,policy .ActionCreate )
1733
1733
}))
1734
1734
s .Run ("InsertUserLink" ,s .Mocked (func (dbm * dbmock.MockStore ,faker * gofakeit.Faker ,check * expects ) {
@@ -1759,7 +1759,7 @@ func (s *MethodTestSuite) TestUser() {
1759
1759
}))
1760
1760
s .Run ("UpdateUserHashedOneTimePasscode" ,s .Mocked (func (dbm * dbmock.MockStore ,faker * gofakeit.Faker ,check * expects ) {
1761
1761
u := testutil .Fake (s .T (),faker , database.User {})
1762
- arg := database.UpdateUserHashedOneTimePasscodeParams {ID :u .ID , HashedOneTimePasscode : [] byte {}, OneTimePasscodeExpiresAt : sql. NullTime { Time : u . CreatedAt , Valid : true } }
1762
+ arg := database.UpdateUserHashedOneTimePasscodeParams {ID :u .ID }
1763
1763
dbm .EXPECT ().UpdateUserHashedOneTimePasscode (gomock .Any (),arg ).Return (nil ).AnyTimes ()
1764
1764
check .Args (arg ).Asserts (rbac .ResourceSystem ,policy .ActionUpdate ).Returns ()
1765
1765
}))