diff --git a/backend/.idea/cmake.xml b/backend/.idea/cmake.xml index 590a81f..f5374c0 100644 --- a/backend/.idea/cmake.xml +++ b/backend/.idea/cmake.xml @@ -3,7 +3,7 @@ - + \ No newline at end of file diff --git a/backend/src/controllers/auth/auth_gitlab.cpp b/backend/src/controllers/auth/auth_gitlab.cpp index f5074eb..4f5222f 100644 --- a/backend/src/controllers/auth/auth_gitlab.cpp +++ b/backend/src/controllers/auth/auth_gitlab.cpp @@ -3,8 +3,6 @@ #pragma ide diagnostic ignored "readability-make-member-function-const" #pragma ide diagnostic ignored "readability-convert-member-functions-to-static" -#include - #include "controllers/controllers.h" #include "dto/dto.h" @@ -16,9 +14,9 @@ const std::string GITLAB_API_URL = "https://ssh.gitlab.mattv.de"; std::string get_redirect_uri(req_type req) { auto host_header = req->headers().find("host"); std::stringstream ss; - ss << (req->isOnSecureConnection() ? "https" : "http") + ss << (req->path().starts_with("127") ? (req->isOnSecureConnection() ? "https" : "http") : "https") << "://" - << (host_header != req->headers().end() ? host_header->second : "127.0.0.1:1234") + << (host_header != req->headers().end() ? host_header->second : "127.0.0.1:2345") << "/api/auth/gitlab_callback"; return drogon::utils::urlEncode(ss.str()); }