Switch to auth2@v0.5.0 with AddVerifier

cmd/microrouterd/handler/handler.go

@@ -23,6 +23,7 @@ import (
 	"go-micro.dev/v4/logger"
 	"google.golang.org/protobuf/types/known/emptypb"
 	"jochum.dev/jo-micro/auth2"
+	"jochum.dev/jo-micro/auth2/plugins/verifier/endpointroles"
 	"jochum.dev/jo-micro/components"
 	"jochum.dev/jo-micro/logruscomponent"
 	"jochum.dev/jo-micro/router"
@@ -220,6 +221,20 @@ func (h *Handler) Init(r *components.Registry, engine *gin.Engine, refreshSecond
 		),
 	)
 
+	authVerifier := endpointroles.NewVerifier(
+		endpointroles.WithLogrus(logruscomponent.MustReg(h.cReg).Logger()),
+	)
+	authVerifier.AddRules(
+		endpointroles.RouterRule,
+		endpointroles.NewRule(
+			endpointroles.Endpoint(routerserverpb.RouterServerService.Routes),
+			endpointroles.RolesAllow(auth2.RolesServiceAndAdmin),
+		),
+	)
+	auth2.ClientAuthMustReg(h.cReg).Plugin().AddVerifier(authVerifier)
+
+	routerserverpb.RegisterRouterServerServiceHandler(h.cReg.Service().Server(), h)
+
 	return nil
 }
 

cmd/microrouterd/main.go

@@ -14,14 +14,12 @@ import (
 	"jochum.dev/jo-micro/auth2"
 	jwtClient "jochum.dev/jo-micro/auth2/plugins/client/jwt"
 	jwtRouter "jochum.dev/jo-micro/auth2/plugins/router/jwt"
-	"jochum.dev/jo-micro/auth2/plugins/verifier/endpointroles"
 	"jochum.dev/jo-micro/components"
 	"jochum.dev/jo-micro/logruscomponent"
 	"jochum.dev/jo-micro/router"
 
 	"jochum.dev/jo-micro/router/cmd/microrouterd/config"
 	"jochum.dev/jo-micro/router/cmd/microrouterd/handler"
-	"jochum.dev/jo-micro/router/internal/proto/routerserverpb"
 	"jochum.dev/jo-micro/router/internal/util"
 )
 
@@ -47,20 +45,6 @@ func internalService(cReg *components.Registry, r *gin.Engine) {
 				return err
 			}
 
-			routerserverpb.RegisterRouterServerServiceHandler(cReg.Service().Server(), routerHandler)
-
-			authVerifier := endpointroles.NewVerifier(
-				endpointroles.WithLogrus(logruscomponent.MustReg(cReg).Logger()),
-			)
-			authVerifier.AddRules(
-				endpointroles.RouterRule,
-				endpointroles.NewRule(
-					endpointroles.Endpoint(routerserverpb.RouterServerService.Routes),
-					endpointroles.RolesAllow(auth2.RolesServiceAndAdmin),
-				),
-			)
-			auth2.ClientAuthMustReg(cReg).Plugin().SetVerifier(authVerifier)
-
 			return nil
 		}),
 	}

go.mod

@@ -15,7 +15,7 @@ require (
 	github.com/urfave/cli/v2 v2.16.3
 	go-micro.dev/v4 v4.8.1
 	google.golang.org/protobuf v1.28.1
-	jochum.dev/jo-micro/auth2 v0.4.5
+	jochum.dev/jo-micro/auth2 v0.5.0
 	jochum.dev/jo-micro/components v0.3.0
 	jochum.dev/jo-micro/logruscomponent v0.0.4
 )

go.sum

@@ -312,6 +312,12 @@ jochum.dev/jo-micro/auth2 v0.4.2 h1:FbdE4+1APXXy/TVCGemD1iPjWslqI/aNgiwYgIr3Jmk=
 jochum.dev/jo-micro/auth2 v0.4.2/go.mod h1:kAsJvRgyTmvrt5hyR84gPmMg1R/fZGjHGkCZxwO8gTk=
 jochum.dev/jo-micro/auth2 v0.4.5 h1:C+MuHy+F+n2gT3hv9wYc3f2W9RZiFrwrDsNopeYR7Ew=
 jochum.dev/jo-micro/auth2 v0.4.5/go.mod h1:+ampDxKyldCznub6wn0eM+NvqxZ2ndFajYa47vLs1+Q=
+jochum.dev/jo-micro/auth2 v0.4.6 h1:SxRRCdIXIDAEJir6DJZtBuJwage/QThmx3b1/kAZ3qc=
+jochum.dev/jo-micro/auth2 v0.4.6/go.mod h1:oJdxQWMriBehFBCqSydLlAgNOD+HMcfCW/jerZN537Q=
+jochum.dev/jo-micro/auth2 v0.4.7 h1:PsjQEJF8IpLRgPzhA3d9U7LWbGIZqY3GunZRB1QfRiA=
+jochum.dev/jo-micro/auth2 v0.4.7/go.mod h1:oJdxQWMriBehFBCqSydLlAgNOD+HMcfCW/jerZN537Q=
+jochum.dev/jo-micro/auth2 v0.5.0 h1:LU9N8xfzt85PYf1VWYb3bWoc08//XhD+cOXaDlbokg0=
+jochum.dev/jo-micro/auth2 v0.5.0/go.mod h1:oJdxQWMriBehFBCqSydLlAgNOD+HMcfCW/jerZN537Q=
 jochum.dev/jo-micro/components v0.3.0 h1:mo9IzK6UVbQuIit+vp74RFeT/VtS5mVv0ggBZ9q0tiE=
 jochum.dev/jo-micro/components v0.3.0/go.mod h1:Yvn0Qz1zctUQUI6WIjq7PbfLY87Qvywpw+KxnVZeCvA=
 jochum.dev/jo-micro/logruscomponent v0.0.4 h1:KkJhLIM0mm2tlk+z+gZdpb5vCeuBs6bhG3bncGhCqoQ=