Remove MustReg

cmd/microrouterd/handler/handler.go

@@ -339,7 +339,7 @@ func (h *Handler) proxy(serviceName string, route *routerclientpb.RoutesReply_Ro
 		req := h.cReg.Service().Client().NewRequest(serviceName, route.Endpoint, request, client.WithContentType("application/json"))
 
 		// Auth
-		u, authErr := auth2.RouterAuthMust(c).Plugin().Inspect(c.Request)
+		u, authErr := auth2.RouterAuthMustReg(h.cReg).Plugin().Inspect(c.Request)
 		var (
 			ctx context.Context
 			err error
@@ -356,7 +356,7 @@ func (h *Handler) proxy(serviceName string, route *routerclientpb.RoutesReply_Ro
 			c.Abort()
 			return
 		} else if authErr != nil {
-			ctx, err = auth2.RouterAuthMust(c).Plugin().ForwardContext(auth2.AnonUser, c.Request, c)
+			ctx, err = auth2.RouterAuthMustReg(h.cReg).Plugin().ForwardContext(auth2.AnonUser, c.Request, c)
 			if err != nil {
 				c.JSON(http.StatusInternalServerError, gin.H{
 					"errors": []gin.H{
@@ -368,7 +368,7 @@ func (h *Handler) proxy(serviceName string, route *routerclientpb.RoutesReply_Ro
 				})
 			}
 		} else {
-			ctx, err = auth2.RouterAuthMust(c).Plugin().ForwardContext(u, c.Request, c)
+			ctx, err = auth2.RouterAuthMustReg(h.cReg).Plugin().ForwardContext(u, c.Request, c)
 			if err != nil {
 				c.JSON(http.StatusInternalServerError, gin.H{
 					"errors": []gin.H{

go.mod

@@ -17,9 +17,9 @@ 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.1
-	jochum.dev/jo-micro/components v0.2.0
-	jochum.dev/jo-micro/logruscomponent v0.0.3
+	jochum.dev/jo-micro/auth2 v0.4.2
+	jochum.dev/jo-micro/components v0.3.0
+	jochum.dev/jo-micro/logruscomponent v0.0.4
 )
 
 require (
@@ -106,5 +106,5 @@ require (
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	jochum.dev/jo-micro/buncomponent v0.0.2 // indirect
+	jochum.dev/jo-micro/buncomponent v0.0.3 // indirect
 )

go.sum

@@ -1966,19 +1966,27 @@ jochum.dev/jo-micro/auth2 v0.4.0 h1:rBJG85pTyfauwNvgzRv39HjQw9EQYD1az9UYu5/aISw=
 jochum.dev/jo-micro/auth2 v0.4.0/go.mod h1:PXMhmzxBvDUzJ5kT39878heQDYtnLB8elUHoGJIlqNw=
 jochum.dev/jo-micro/auth2 v0.4.1 h1:J/EAJjiXql0jGBqhu9UHW5G9YfphrC7LW2Xu0iQ/RG4=
 jochum.dev/jo-micro/auth2 v0.4.1/go.mod h1:M/DjWTvOamYIItB+g5fMZkkHL8G3F5wj+9RTuvRUTYU=
+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/buncomponent v0.0.1 h1:UHLODCgkv0x29jt46SPZ8h20WCT2B8ZNG9wW1OQwdVQ=
 jochum.dev/jo-micro/buncomponent v0.0.1/go.mod h1:nQLcdOa3KMOZpm6SLmZK0ef18fX3V9L0BdABdedHiD4=
 jochum.dev/jo-micro/buncomponent v0.0.2/go.mod h1:hZpOmq78AKf0nViehhY4k9Y0tvAjQxoks9sQQeTDwu4=
+jochum.dev/jo-micro/buncomponent v0.0.3 h1:+cJzIe5nYUG90FptTQr2u1/iw7wPjtw20iiActyYQJM=
+jochum.dev/jo-micro/buncomponent v0.0.3/go.mod h1:tw26M9+UixdDamDWsRGTUpXmp/cF7XPjlfQWyggoKAo=
 jochum.dev/jo-micro/components v0.0.11 h1:Rtm0J+MiMcyFVrweJ3r1eoxQY5qP59GzC1TPc7O9Ixs=
 jochum.dev/jo-micro/components v0.0.11/go.mod h1:XzhOsv4pAOoRdnrgvYlZXwPzzBd9/8h2CzehB/Yf92w=
 jochum.dev/jo-micro/components v0.1.0 h1:9QP79NK+lShksiswtqtxsW8kfd0aBtF87HuBZsu8yxE=
 jochum.dev/jo-micro/components v0.1.0/go.mod h1:Yvn0Qz1zctUQUI6WIjq7PbfLY87Qvywpw+KxnVZeCvA=
 jochum.dev/jo-micro/components v0.2.0 h1:aeV1nOUqpDzZafpKrBd86GdhCJAMYvC2pGeiXl751Ls=
 jochum.dev/jo-micro/components v0.2.0/go.mod h1:Yvn0Qz1zctUQUI6WIjq7PbfLY87Qvywpw+KxnVZeCvA=
+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.2 h1:IPyQXOdC0t6Howf4ndykRzVYovrxP5OHM3ZbalRqjYk=
 jochum.dev/jo-micro/logruscomponent v0.0.2/go.mod h1:WtSAK/M/zSKuawJhh+Ub+9pknbOKyUScK+qhEbCvFAU=
 jochum.dev/jo-micro/logruscomponent v0.0.3 h1:mjgzKKFDQ4uX1slSwajXq7IhrMBuHpkPhcozKWZwPGw=
 jochum.dev/jo-micro/logruscomponent v0.0.3/go.mod h1:SPdHhgI+L1xUouhtfuXS28bQn7ojF1YGsgEvhdh4deU=
+jochum.dev/jo-micro/logruscomponent v0.0.4 h1:KkJhLIM0mm2tlk+z+gZdpb5vCeuBs6bhG3bncGhCqoQ=
+jochum.dev/jo-micro/logruscomponent v0.0.4/go.mod h1:NVy+eN3Xm2SlzdsQGuC/9/+MwU+8BwxFZuaTprmLguU=
 k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo=
 k8s.io/api v0.20.4/go.mod h1:++lNL1AJMkDymriNniQsWRkMDzRaX2Y/POTUi8yvqYQ=
 k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8=

handler.go

@@ -27,10 +27,6 @@ func New() *Handler {
 	return &Handler{initialized: false, routes: []*routerclientpb.RoutesReply_Route{}}
 }
 
-func Must(ctx context.Context) *Handler {
-	return components.Must(ctx).Must(Name).(*Handler)
-}
-
 func MustReg(cReg *components.Registry) *Handler {
 	return cReg.Must(Name).(*Handler)
 }