internal/worker: use TenantChannelMiddleware

internal/cloudapi/v2/v2_multi_tenancy_test.go

@@ -176,6 +176,7 @@ func runNextJob(t *testing.T, jobs []uuid.UUID, workerHandler http.Handler, orgI
 		Method:         http.MethodPatch,
 		Path:           job.Location,
 		RequestBody:    test.JSONRequestBody(`{"result": {"job_result":{}}}`),
+		Context:        reqContext(orgID),
 		ExpectedStatus: http.StatusOK,
 	}.Do(t)
 }

internal/worker/server.go

@@ -100,8 +100,13 @@ func (s *Server) Handler() http.Handler {
 		server: s,
 	}
 
-	statusMW := prometheus.StatusMiddleware(prometheus.WorkerSubsystem)
-	api.RegisterHandlers(e.Group(api.BasePath, statusMW), &handler)
+	mws := []echo.MiddlewareFunc{
+		prometheus.StatusMiddleware(prometheus.WorkerSubsystem),
+	}
+	if s.config.JWTEnabled {
+		mws = append(mws, auth.TenantChannelMiddleware(s.config.TenantProviderFields, api.HTTPError(api.ErrorTenantNotFound)))
+	}
+	api.RegisterHandlers(e.Group(api.BasePath, mws...), &handler)
 
 	return e
 }