Refactor JWT implementation

tests/apigw/main_test.go

@@ -79,7 +79,7 @@ func InitTestApp() {
 		helpers.BindAuthMiddleware(r)
 
 		// Sys routes for route management tests
-		rest.MountRoutes(r)
+		r.Group(rest.MountRoutes(auth.JWT()))
 
 		// API gw routes
 		apigw.Setup(options.Apigw(), service.DefaultLogger, service.DefaultStore)
@@ -111,7 +111,7 @@ func newHelper(t *testing.T) helper {
 	helpers.UpdateRBAC(h.roleID)
 
 	var err error
-	h.token, err = auth.DefaultJwtHandler.Generate(context.Background(), h.cUser, 0)
+	h.token, err = auth.JWT().Generate(context.Background(), h.cUser, 0)
 	if err != nil {
 		panic(err)
 	}

tests/automation/main_test.go

@@ -84,7 +84,7 @@ func InitTestApp() {
 		r = chi.NewRouter()
 		r.Use(server.BaseMiddleware(false, logger.Default())...)
 		helpers.BindAuthMiddleware(r)
-		rest.MountRoutes(r)
+		r.Group(rest.MountRoutes(auth.JWT()))
 	}
 }
 
@@ -107,7 +107,7 @@ func newHelper(t *testing.T) helper {
 	helpers.UpdateRBAC(h.roleID)
 
 	var err error
-	h.token, err = auth.DefaultJwtHandler.Generate(context.Background(), h.cUser, 0)
+	h.token, err = auth.JWT().Generate(context.Background(), h.cUser, 0)
 	if err != nil {
 		panic(err)
 	}

tests/compose/main_test.go

@@ -95,7 +95,7 @@ func InitTestApp() {
 		r = chi.NewRouter()
 		r.Use(server.BaseMiddleware(false, logger.Default())...)
 		helpers.BindAuthMiddleware(r)
-		rest.MountRoutes(r)
+		r.Group(rest.MountRoutes(auth.JWT()))
 	}
 }
 
@@ -124,7 +124,7 @@ func newHelper(t *testing.T) helper {
 func (h *helper) identityToHelper(u *sysTypes.User) {
 	var err error
 	h.cUser = u
-	h.token, err = auth.DefaultJwtHandler.Generate(context.Background(), u, 0)
+	h.token, err = auth.JWT().Generate(context.Background(), u, 0)
 	if err != nil {
 		panic(err)
 	}

tests/federation/main_test.go

@@ -64,7 +64,7 @@ func InitTestApp() {
 		r = chi.NewRouter()
 		r.Use(server.BaseMiddleware(false, logger.Default())...)
 		helpers.BindAuthMiddleware(r)
-		rest.MountRoutes(r)
+		r.Group(rest.MountRoutes(auth.JWT()))
 	}
 }
 
@@ -87,7 +87,7 @@ func newHelper(t *testing.T) helper {
 	helpers.UpdateRBAC(h.roleID)
 
 	var err error
-	h.token, err = auth.DefaultJwtHandler.Generate(context.Background(), h.cUser, 0)
+	h.token, err = auth.JWT().Generate(context.Background(), h.cUser, 0)
 	if err != nil {
 		panic(err)
 	}

tests/helpers/auth.go

@@ -11,8 +11,8 @@ import (
 
 func BindAuthMiddleware(r chi.Router) {
 	r.Use(
-		auth.DefaultJwtHandler.HttpVerifier(),
-		auth.DefaultJwtHandler.HttpAuthenticator(),
+		auth.JWT().HttpVerifier(),
+		auth.JWT().HttpValidator("api"),
 	)
 }
 

tests/reporter/main_test.go

@@ -102,7 +102,7 @@ func InitTestApp() {
 		r = chi.NewRouter()
 		r.Use(server.BaseMiddleware(false, logger.Default())...)
 		helpers.BindAuthMiddleware(r)
-		rest.MountRoutes(r)
+		r.Group(rest.MountRoutes(auth.JWT()))
 	}
 }
 
@@ -125,7 +125,7 @@ func newHelper(t *testing.T) helper {
 	helpers.UpdateRBAC(h.roleID)
 
 	var err error
-	h.token, err = auth.DefaultJwtHandler.Generate(context.Background(), h.cUser, 0)
+	h.token, err = auth.JWT().Generate(context.Background(), h.cUser, 0)
 	if err != nil {
 		panic(err)
 	}

tests/system/main_test.go

@@ -116,7 +116,7 @@ func InitTestApp() {
 		r.Use(server.BaseMiddleware(false, logger.Default())...)
 
 		helpers.BindAuthMiddleware(r)
-		rest.MountRoutes(r)
+		r.Group(rest.MountRoutes(auth.JWT()))
 		hh.MountHttpRoutes(r)
 	}
 }
@@ -142,7 +142,7 @@ func newHelper(t *testing.T) helper {
 	h.mockPermissionsWithAccess()
 
 	var err error
-	h.token, err = auth.DefaultJwtHandler.Generate(context.Background(), h.cUser, 0)
+	h.token, err = auth.JWT().Generate(context.Background(), h.cUser, 0)
 	if err != nil {
 		panic(err)
 	}

tests/system/static/idp_to_sp.cookie

@@ -1 +1 @@
-eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJodHRwOi8vbG9jYWxob3N0OjgwODQiLCJleHAiOjE2MjEyNDMwODIsImlhdCI6MTYyMTI0Mjk5MiwiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo4MDg0IiwibmJmIjoxNjIxMjQyOTkyLCJzdWIiOiJ0Q3U1UFY2RWd4Y3ZVQWE5ZTU3dUoyZy1iVGtxbk5reXlISGFPdTE1eUVmWmpnV0t0MDJBdFhHZSIsImlkIjoiaWQtN2JmZmIyNmQ2YmVlNGI1YmRmODZmOGRjNGRhMmNmYzExN2Q4OWQwZiIsInVyaSI6Ii9hdXRoL2V4dGVybmFsL3NhbWwvaW5pdCIsInNhbWwtYXV0aG4tcmVxdWVzdCI6dHJ1ZX0.CU_jrc5gx6JhafzbekO-7VXLJU6jzDd-R4QyrtQIZN3jyqIZtYB466KiTFZnyYeEWEjK7GW18eHuzZFHmDpcQ9weOtvu9u0Z7UUDm3YQoG-6XgUeQKTV2i1uPzq1ZlT8iiMBUsn0kdKL2F18U4jl4Fss0_Ysdc3OqoEJ73xcu0P721ZSsg-vEwyooe1WMSosunN_HEmWOU2aC61uQwNFSRk5_JotdUEytko1Jzn9JeOnLllf8izr7z7JWEnBqN8845IV_zqiScrAptpAZRocAeMAbFPFPmj5_lL2SzKC4GF4lkoOIZ5vWRBVdfzIxvD21rVZK5rRlSdYUmT0txFoQw
+eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJodHRwOi8vbG9jYWxob3N0OjgwODQiLCJpYXQiOjE2MjEyNDI5OTIsImlzcyI6Imh0dHA6Ly9sb2NhbGhvc3Q6ODA4NCIsIm5iZiI6MTYyMTI0Mjk5Miwic3ViIjoidEN1NVBWNkVneGN2VUFhOWU1N3VKMmctYlRrcW5Oa3l5SEhhT3UxNXlFZlpqZ1dLdDAyQXRYR2UiLCJpZCI6ImlkLTdiZmZiMjZkNmJlZTRiNWJkZjg2ZjhkYzRkYTJjZmMxMTdkODlkMGYiLCJ1cmkiOiIvYXV0aC9leHRlcm5hbC9zYW1sL2luaXQiLCJzYW1sLWF1dGhuLXJlcXVlc3QiOnRydWV9.fBI_TorEbXYMtoNRGApQs5_89Q9IZjV-1dwkOeF5ZC9xQ6p3Mbo3r0x4CgKzYS2n8i4mMIEUDI_C4bY5jqyVEfmrwtv4qGbhYCJjnvSu1vAncJGQNfbcWCmSW0RMiiJZzfj3whHTzmK_mLgOch07iwxKGBOyNscdZfxfJp_sDMuHePwiggGssWglCC_KWXNkGh3TPad-_mo4kc_9qUf4onyISms6uyZpbJW-BqGP-iYiTnbEGdbF-24bmbTpVBU8Arv3jQjaHq8teT9XI4vFgWHfEp497LD7snYNOn3-9S05JGWKA74wrgZwFcRBaIhfVMtOqy7YMHBJZ8NNbVH8Tg