From af224931a6b8bf34685bb50a144f30aafb2917dd Mon Sep 17 00:00:00 2001 From: Umesh Lumbhani Date: Tue, 27 Feb 2024 18:11:50 +0530 Subject: [PATCH] fix auto enable github issue Signed-off-by: Umesh Lumbhani --- cla-backend-go/cmd/server.go | 5 +++++ cla-backend-go/v2/sign/handlers.go | 11 ++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/cla-backend-go/cmd/server.go b/cla-backend-go/cmd/server.go index d251021b4..eda3f46d0 100644 --- a/cla-backend-go/cmd/server.go +++ b/cla-backend-go/cmd/server.go @@ -367,6 +367,11 @@ func server(localMode bool) http.Handler { sign.Configure(v2API, v2SignService, usersService) v2GithubActivity.Configure(v2API, v2GithubActivityService) + v2API.AddMiddlewareFor("POST", "/signed/individual/{installation_id}/{github_repository_id}/{change_request_id}", sign.DocusignMiddleware) + v2API.AddMiddlewareFor("POST", "/signed/corporate/{project_id}/{company_id}", sign.CCLADocusignMiddleware) + v2API.AddMiddlewareFor("POST", "/signed/gitlab/individual/{user_id}/{organization_id}/{gitlab_repository_id}/{merge_request_id}", sign.DocusignMiddleware) + v2API.AddMiddlewareFor("POST", "/signed/gerrit/individual/{user_id}", sign.DocusignMiddleware) + userCreaterMiddleware := func(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { createUserFromRequest(authorizer, usersService, eventsService, r) diff --git a/cla-backend-go/v2/sign/handlers.go b/cla-backend-go/v2/sign/handlers.go index b725966a7..b7b1d2cd6 100644 --- a/cla-backend-go/v2/sign/handlers.go +++ b/cla-backend-go/v2/sign/handlers.go @@ -32,8 +32,8 @@ var ( cclaDocusignPayload []byte ) -// docusignMiddleware is used to get access to xml request body -func docusignMiddleware(next http.Handler) http.Handler { +// DocusignMiddleware is used to get access to xml request body +func DocusignMiddleware(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { f := logrus.Fields{ "functionName": "v2.sign.handlers.docusignMiddleware", @@ -53,7 +53,8 @@ func docusignMiddleware(next http.Handler) http.Handler { }) } -func cclaDocusignMiddleware(next http.Handler) http.Handler { +// CCLADocusignMiddleware used to set CCLA middleware +func CCLADocusignMiddleware(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { f := logrus.Fields{ "functionName": "v2.sign.handlers.cclaDocusignMiddleware", @@ -243,10 +244,6 @@ func Configure(api *operations.EasyclaAPI, service Service, userService users.Se return sign.NewCclaCallbackOK() }) - api.AddMiddlewareFor("POST", "/signed/individual/{installation_id}/{github_repository_id}/{change_request_id}", docusignMiddleware) - api.AddMiddlewareFor("POST", "/signed/corporate/{project_id}/{company_id}", cclaDocusignMiddleware) - api.AddMiddlewareFor("POST", "/signed/gitlab/individual/{user_id}/{organization_id}/{gitlab_repository_id}/{merge_request_id}", docusignMiddleware) - api.AddMiddlewareFor("POST", "/signed/gerrit/individual/{user_id}", docusignMiddleware) } type codedResponse interface {