diff --git a/tests/automation/main_test.go b/tests/automation/main_test.go index aadc1db11..875dbc911 100644 --- a/tests/automation/main_test.go +++ b/tests/automation/main_test.go @@ -35,6 +35,7 @@ type ( cUser *sysTypes.User roleID uint64 + token string } ) @@ -97,6 +98,12 @@ func newHelper(t *testing.T) helper { }, } + var err error + h.token, err = auth.DefaultJwtHandler.Generate(context.Background(), h.cUser) + if err != nil { + panic(err) + } + h.cUser.SetRoles(h.roleID) helpers.UpdateRBAC(h.roleID) @@ -116,15 +123,10 @@ func (h helper) secCtx() context.Context { func (h helper) apiInit() *apitest.APITest { InitTestApp() - tkn, err := auth.DefaultJwtHandler.Generate(context.Background(), h.cUser) - if err != nil { - panic(err) - } - return apitest. New(). Handler(r). - Intercept(helpers.ReqHeaderRawAuthBearer(tkn)) + Intercept(helpers.ReqHeaderRawAuthBearer(h.token)) } diff --git a/tests/compose/main_test.go b/tests/compose/main_test.go index 0f27d4687..eb650cc1d 100644 --- a/tests/compose/main_test.go +++ b/tests/compose/main_test.go @@ -42,6 +42,7 @@ type ( cUser *sysTypes.User roleID uint64 + token string } ) @@ -108,6 +109,12 @@ func newHelper(t *testing.T) helper { }, } + var err error + h.token, err = auth.DefaultJwtHandler.Generate(context.Background(), h.cUser) + if err != nil { + panic(err) + } + h.cUser.SetRoles(h.roleID) helpers.UpdateRBAC(h.roleID) @@ -127,15 +134,10 @@ func (h helper) secCtx() context.Context { func (h helper) apiInit() *apitest.APITest { InitTestApp() - tkn, err := auth.DefaultJwtHandler.Generate(context.Background(), h.cUser) - if err != nil { - panic(err) - } - return apitest. New(). Handler(r). - Intercept(helpers.ReqHeaderRawAuthBearer(tkn)) + Intercept(helpers.ReqHeaderRawAuthBearer(h.token)) } func (h helper) mockPermissions(rules ...*rbac.Rule) { diff --git a/tests/federation/main_test.go b/tests/federation/main_test.go index 67e0375a4..58633e7f5 100644 --- a/tests/federation/main_test.go +++ b/tests/federation/main_test.go @@ -30,6 +30,7 @@ type ( cUser *sysTypes.User roleID uint64 + token string } ) @@ -82,6 +83,12 @@ func newHelper(t *testing.T) helper { }, } + var err error + h.token, err = auth.DefaultJwtHandler.Generate(context.Background(), h.cUser) + if err != nil { + panic(err) + } + h.cUser.SetRoles(h.roleID) helpers.UpdateRBAC(h.roleID) @@ -101,15 +108,10 @@ func (h helper) secCtx() context.Context { func (h helper) apiInit() *apitest.APITest { InitTestApp() - tkn, err := auth.DefaultJwtHandler.Generate(context.Background(), h.cUser) - if err != nil { - panic(err) - } - return apitest. New(). Handler(r). - Intercept(helpers.ReqHeaderRawAuthBearer(tkn)) + Intercept(helpers.ReqHeaderRawAuthBearer(h.token)) } // Unwraps error before it passes it to the tester diff --git a/tests/reporter/main_test.go b/tests/reporter/main_test.go index 912355c4a..07b60c151 100644 --- a/tests/reporter/main_test.go +++ b/tests/reporter/main_test.go @@ -47,6 +47,7 @@ type ( cUser *sysTypes.User roleID uint64 + token string } auxReport struct { @@ -120,6 +121,12 @@ func newHelper(t *testing.T) helper { }, } + var err error + h.token, err = auth.DefaultJwtHandler.Generate(context.Background(), h.cUser) + if err != nil { + panic(err) + } + h.cUser.SetRoles(h.roleID) helpers.UpdateRBAC(h.roleID) @@ -139,15 +146,10 @@ func (h helper) secCtx() context.Context { func (h helper) apiInit() *apitest.APITest { InitTestApp() - tkn, err := auth.DefaultJwtHandler.Generate(context.Background(), h.cUser) - if err != nil { - panic(err) - } - return apitest. New(). Handler(r). - Intercept(helpers.ReqHeaderRawAuthBearer(tkn)) + Intercept(helpers.ReqHeaderRawAuthBearer(h.token)) } func (h helper) mockPermissions(rules ...*rbac.Rule) { h.noError(rbac.Global().Grant( diff --git a/tests/system/main_test.go b/tests/system/main_test.go index 1ddd0134a..1a268b062 100644 --- a/tests/system/main_test.go +++ b/tests/system/main_test.go @@ -47,6 +47,7 @@ type ( cUser *types.User roleID uint64 + token string data embed.FS } ) @@ -130,6 +131,12 @@ func newHelper(t *testing.T) helper { data: mockData, } + var err error + h.token, err = auth.DefaultJwtHandler.Generate(context.Background(), h.cUser) + if err != nil { + panic(err) + } + h.cUser.SetRoles(h.roleID) helpers.UpdateRBAC(h.roleID) h.mockPermissionsWithAccess() @@ -150,15 +157,10 @@ func (h helper) secCtx() context.Context { func (h helper) apiInit() *apitest.APITest { InitTestApp() - tkn, err := auth.DefaultJwtHandler.Generate(context.Background(), h.cUser) - if err != nil { - panic(err) - } - return apitest. New(). Handler(r). - Intercept(helpers.ReqHeaderRawAuthBearer(tkn)) + Intercept(helpers.ReqHeaderRawAuthBearer(h.token)) } func (h helper) mockPermissions(rules ...*rbac.Rule) {