From 2b5fbe9d03bf4149969560a0fce38cfcbd1aa26b Mon Sep 17 00:00:00 2001 From: alagishev Date: Fri, 24 Jan 2025 23:57:51 +0300 Subject: [PATCH] Rename gitlab callbacks (#8) --- qubership-apihub-service/Service.go | 4 ++-- qubership-apihub-service/security/Oauth2Controller.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qubership-apihub-service/Service.go b/qubership-apihub-service/Service.go index 3f8f56d..8c893b2 100644 --- a/qubership-apihub-service/Service.go +++ b/qubership-apihub-service/Service.go @@ -497,8 +497,8 @@ func main() { r.HandleFunc("/api/v2/space", security.SecureJWT(userController.CreatePrivateUserPackage)).Methods(http.MethodPost) r.HandleFunc("/api/v2/space", security.SecureJWT(userController.GetPrivateUserPackage)).Methods(http.MethodGet) - r.HandleFunc("/login/ncgitlab/callback", security.NoSecure(oauthController.GitlabOauthCallback)).Methods(http.MethodGet) - r.HandleFunc("/login/ncgitlab", security.NoSecure(oauthController.StartOauthProcessWithGitlab)).Methods(http.MethodGet) + r.HandleFunc("/login/gitlab/callback", security.NoSecure(oauthController.GitlabOauthCallback)).Methods(http.MethodGet) + r.HandleFunc("/login/gitlab", security.NoSecure(oauthController.StartOauthProcessWithGitlab)).Methods(http.MethodGet) r.HandleFunc("/api/v2/packages/{packageId}/versions/{version}/changes/summary", security.Secure(comparisonController.GetComparisonChangesSummary)).Methods(http.MethodGet) r.HandleFunc("/api/v2/packages/{packageId}/versions/{version}/{apiType}/operations", security.Secure(operationController.GetOperationList)).Methods(http.MethodGet) diff --git a/qubership-apihub-service/security/Oauth2Controller.go b/qubership-apihub-service/security/Oauth2Controller.go index d1dca94..83fdd90 100644 --- a/qubership-apihub-service/security/Oauth2Controller.go +++ b/qubership-apihub-service/security/Oauth2Controller.go @@ -102,7 +102,7 @@ func (o oauth20ControllerImpl) GitlabOauthCallback(w http.ResponseWriter, r *htt } req := makeRequest() - authRedirectUri := fmt.Sprintf("%s%s", o.systemInfoService.GetAPIHubUrl(), "/login/ncgitlab/callback?redirectUri="+redirectUri) + authRedirectUri := fmt.Sprintf("%s%s", o.systemInfoService.GetAPIHubUrl(), "/login/gitlab/callback?redirectUri="+redirectUri) //todo move query parameters to body with Content-Type: application/x-www-form-urlencoded https://www.rfc-editor.org/rfc/rfc6749#section-4.1.3 url := fmt.Sprintf("%s%s?client_id=%s&client_secret=%s&code=%s&grant_type=authorization_code&redirect_uri=%s", o.gitlabUrl, gitlabOauthTokenUri, o.clientId, o.clientSecret, code, authRedirectUri) @@ -211,7 +211,7 @@ func (o oauth20ControllerImpl) StartOauthProcessWithGitlab(w http.ResponseWriter } } - fullRedirectUrl := fmt.Sprintf("%s%s?redirectUri=%s", o.systemInfoService.GetAPIHubUrl(), "/login/ncgitlab/callback", redirectUri) + fullRedirectUrl := fmt.Sprintf("%s%s?redirectUri=%s", o.systemInfoService.GetAPIHubUrl(), "/login/gitlab/callback", redirectUri) http.Redirect(w, r, fmt.Sprintf("%s%s?client_id=%s&response_type=code&redirect_uri=%s", o.gitlabUrl, gitlabOauthAuthorize, o.clientId, fullRedirectUrl), http.StatusFound) }