feat chaotic-openapi: handle request context

.mapping.json

@@ -4457,6 +4457,16 @@
   "samples/benchmark_service/static_config.yaml":"taxi/uservices/userver/samples/benchmark_service/static_config.yaml",
   "samples/benchmark_service/testsuite/conftest.py":"taxi/uservices/userver/samples/benchmark_service/testsuite/conftest.py",
   "samples/benchmark_service/testsuite/test_benchmark.py":"taxi/uservices/userver/samples/benchmark_service/testsuite/test_benchmark.py",
+  "samples/chaotic_openapi_auth_service/CMakeLists.txt":"taxi/uservices/userver/samples/chaotic_openapi_auth_service/CMakeLists.txt",
+  "samples/chaotic_openapi_auth_service/handlers/secure/openapi.yaml":"taxi/uservices/userver/samples/chaotic_openapi_auth_service/handlers/secure/openapi.yaml",
+  "samples/chaotic_openapi_auth_service/main.cpp":"taxi/uservices/userver/samples/chaotic_openapi_auth_service/main.cpp",
+  "samples/chaotic_openapi_auth_service/src/auth_bearer.cpp":"taxi/uservices/userver/samples/chaotic_openapi_auth_service/src/auth_bearer.cpp",
+  "samples/chaotic_openapi_auth_service/src/auth_bearer.hpp":"taxi/uservices/userver/samples/chaotic_openapi_auth_service/src/auth_bearer.hpp",
+  "samples/chaotic_openapi_auth_service/src/handlers/secure/greetingget/view.cpp":"taxi/uservices/userver/samples/chaotic_openapi_auth_service/src/handlers/secure/greetingget/view.cpp",
+  "samples/chaotic_openapi_auth_service/src/handlers/secure/greetingget/view.hpp":"taxi/uservices/userver/samples/chaotic_openapi_auth_service/src/handlers/secure/greetingget/view.hpp",
+  "samples/chaotic_openapi_auth_service/static_config.yaml":"taxi/uservices/userver/samples/chaotic_openapi_auth_service/static_config.yaml",
+  "samples/chaotic_openapi_auth_service/testsuite/conftest.py":"taxi/uservices/userver/samples/chaotic_openapi_auth_service/testsuite/conftest.py",
+  "samples/chaotic_openapi_auth_service/testsuite/test_auth.py":"taxi/uservices/userver/samples/chaotic_openapi_auth_service/testsuite/test_auth.py",
   "samples/chaotic_openapi_service/CMakeLists.txt":"taxi/uservices/userver/samples/chaotic_openapi_service/CMakeLists.txt",
   "samples/chaotic_openapi_service/clients/test.yaml":"taxi/uservices/userver/samples/chaotic_openapi_service/clients/test.yaml",
   "samples/chaotic_openapi_service/handlers/insecure/openapi.yaml":"taxi/uservices/userver/samples/chaotic_openapi_service/handlers/insecure/openapi.yaml",

chaotic-openapi/AGENTS.md

@@ -32,6 +32,23 @@ that generates the `PEERDIR`/include lists for `ya.make` files. It is never call
 `main.py`.
 
 
+## View contract
+
+For each operation the generator emits a `View` with a hand-written entry point:
+
+```cpp
+using RequestContext = userver::server::request::RequestContext;
+
+static Response Handle(Request&& request, Deps&& deps, RequestContext& context);
+```
+
+The third parameter gives the handler access to the per-request context (e.g. data set by
+the auth middleware via `userver::server::auth::GetUserAuthInfo(context)` / `context.SetData`).
+It is **always** passed by the runtime dispatcher (`BaseHandler` in
+`include/userver/chaotic/openapi/server/handler_base.hpp`) — the legacy 2-argument
+`Handle(Request&&, Deps&&)` is not supported.
+
+
 # Tests
 
 Tests are implemented at multiple levels:

chaotic-openapi/chaotic_openapi/back/cpp/handler/templates/view.cpp.jinja

@@ -2,7 +2,10 @@
 
 namespace {{ spec.cpp_namespace }}::{{ op.cpp_namespace() }} {
 
-Response View::Handle(Request&& /*request*/, Deps&& /*deps*/) {
+Response View::Handle(
+    Request&& /*request*/,
+    Deps&& /*deps*/,
+    RequestContext& /*context*/) {
     // Handle request using dependencies from Deps (clients, caches, configs, databases...)
     return {};
 }
@@ -32,7 +35,7 @@ std::string View::GetRequestBodyForLogging(const std::string& body) {
 std::string View::GetResponseForLogging(
     const Response& response,
     const std::string& serialized_response,
-    {{ userver }}::server::request::RequestContext& context) {
+    RequestContext& context) {
     (void)response;
     (void)serialized_response;
     (void)context;

chaotic-openapi/chaotic_openapi/back/cpp/handler/templates/view.hpp.jinja

@@ -18,8 +18,9 @@ struct HandlerTag;
 class View final {
 public:
     using Deps = {{ userver }}::chaotic::openapi::server::dependencies::ForHandler<HandlerTag>;
+    using RequestContext = {{ userver }}::server::request::RequestContext;
 
-    static Response Handle(Request&& request, Deps&& deps);
+    static Response Handle(Request&& request, Deps&& deps, RequestContext& context);
 
     /* Uncomment, if you want to define a custom logging for request/response body.
      * E.g. you want to log several fields, but omit the others (secrets, etc.).
@@ -40,7 +41,7 @@ public:
     static std::string GetResponseForLogging(
         const Response& response,
         const std::string& serialized_response,
-        {{ userver }}::server::request::RequestContext& context);
+        RequestContext& context);
     */
 };
 

chaotic-openapi/golden_tests/output/handlers/handlers/test/testme/post/view.cpp

@@ -2,7 +2,10 @@
 
 namespace handlers::test::testme::post {
 
-Response View::Handle(Request&& /*request*/, Deps&& /*deps*/) {
+Response View::Handle(
+Request&& /*request*/,
+Deps&& /*deps*/,
+RequestContext& /*context*/) {
 // Handle request using dependencies from Deps (clients, caches, configs, databases...)
 return {};
 }
@@ -23,7 +26,7 @@ return {};
 std::string View::GetResponseForLogging(
 const Response& response,
 const std::string& serialized_response,
-USERVER_NAMESPACE::server::request::RequestContext& context) {
+RequestContext& context) {
 (void)response;
 (void)serialized_response;
 (void)context;

chaotic-openapi/golden_tests/output/handlers/handlers/test/testme/post/view.hpp

@@ -16,8 +16,9 @@ struct HandlerTag;
 class View final {
 public:
 using Deps = USERVER_NAMESPACE::chaotic::openapi::server::dependencies::ForHandler<HandlerTag>;
+using RequestContext = USERVER_NAMESPACE::server::request::RequestContext;
 
-static Response Handle(Request&& request, Deps&& deps);
+static Response Handle(Request&& request, Deps&& deps, RequestContext& context);
 
 /* Uncomment, if you want to define a custom logging for request/response body.
 * E.g. you want to log several fields, but omit the others (secrets, etc.).
@@ -32,7 +33,7 @@ const USERVER_NAMESPACE::server::http::HttpRequest& request);
 static std::string GetResponseForLogging(
 const Response& response,
 const std::string& serialized_response,
-USERVER_NAMESPACE::server::request::RequestContext& context);
+RequestContext& context);
 */
 };
 

chaotic-openapi/include/userver/chaotic/openapi/server/handler_base.hpp

@@ -142,6 +142,16 @@ class BaseHandler final : public USERVER_NAMESPACE::server::handlers::HttpHandle
         "View::GetInvalidRequestBodyForLogging requires "
         "View::GetRequestBodyForLogging(const formats::json::Value&)."
     );
+    static_assert(
+        requires(Request&& r, Deps&& d, USERVER_NAMESPACE::server::request::RequestContext& ctx) {
+            {
+                View::Handle(std::move(r), std::move(d), ctx)
+            } -> std::convertible_to<Response>;
+        },
+        "View::Handle must accept server::request::RequestContext as the third parameter: "
+        "static Response Handle(Request&& request, Deps&& deps, RequestContext& context). "
+        "The legacy 2-argument Handle(Request&&, Deps&&) is no longer supported."
+    );
 
     using Factories = chaotic::openapi::server::dependencies::Factories;
     using FactoriesContainer = USERVER_NAMESPACE::components::Container<Factories>;
@@ -165,7 +175,7 @@ class BaseHandler final : public USERVER_NAMESPACE::server::handlers::HttpHandle
         USERVER_NAMESPACE::server::request::RequestContext& context
     ) const {
         auto deps = factories_.Get().template Make<HandlerTag>();
-        auto response = View::Handle(std::move(request), std::move(deps));
+        auto response = View::Handle(std::move(request), std::move(deps), context);
         auto serialized = SerializeResponse(response, http_request);
         if constexpr (impl::ViewHasGetResponseForLogging<View, Response>) {
             context.SetData<

chaotic-openapi/integration_tests/src/handlers/simple/formpost/view.cpp

@@ -2,14 +2,20 @@
 
 namespace handlers::simple::formpost {
 
-Response View::Handle(Request&& /*request*/, Deps&& /*deps*/) { return {}; }
+Response View::Handle(
+    Request&& /*request*/,
+    Deps&& /*deps*/,
+    RequestContext& /*context*/
+) {
+    return {};
+}
 
 std::string View::GetRequestBodyForLogging(const std::string& /*body*/) { return {}; }
 
 std::string View::GetResponseForLogging(
     const Response& /*response*/,
     const std::string& /*serialized_response*/,
-    USERVER_NAMESPACE::server::request::RequestContext& /*context*/
+    RequestContext& /*context*/
 ) {
     return {};
 }

chaotic-openapi/integration_tests/src/handlers/simple/formpost/view.hpp

@@ -14,15 +14,16 @@ struct HandlerTag;
 class View final {
 public:
     using Deps = USERVER_NAMESPACE::chaotic::openapi::server::dependencies::ForHandler<HandlerTag>;
+    using RequestContext = USERVER_NAMESPACE::server::request::RequestContext;
 
-    static Response Handle(Request&& request, Deps&& deps);
+    static Response Handle(Request&& request, Deps&& deps, RequestContext& context);
 
     static std::string GetRequestBodyForLogging(const std::string& body);
 
     static std::string GetResponseForLogging(
         const Response& response,
         const std::string& serialized_response,
-        USERVER_NAMESPACE::server::request::RequestContext& context
+        RequestContext& context
     );
 };
 

chaotic-openapi/integration_tests/src/handlers/simple/greetget/view.cpp

@@ -2,12 +2,18 @@
 
 namespace handlers::simple::greetget {
 
-Response View::Handle(Request&& /*request*/, Deps&& /*deps*/) { return {}; }
+Response View::Handle(
+    Request&& /*request*/,
+    Deps&& /*deps*/,
+    RequestContext& /*context*/
+) {
+    return {};
+}
 
 std::string View::GetResponseForLogging(
     const Response& /*response*/,
     const std::string& /*serialized_response*/,
-    USERVER_NAMESPACE::server::request::RequestContext& /*context*/
+    RequestContext& /*context*/
 ) {
     return {};
 }

chaotic-openapi/integration_tests/src/handlers/simple/greetget/view.hpp

@@ -14,13 +14,14 @@ struct HandlerTag;
 class View final {
 public:
     using Deps = USERVER_NAMESPACE::chaotic::openapi::server::dependencies::ForHandler<HandlerTag>;
+    using RequestContext = USERVER_NAMESPACE::server::request::RequestContext;
 
-    static Response Handle(Request&& request, Deps&& deps);
+    static Response Handle(Request&& request, Deps&& deps, RequestContext& context);
 
     static std::string GetResponseForLogging(
         const Response& response,
         const std::string& serialized_response,
-        USERVER_NAMESPACE::server::request::RequestContext& context
+        RequestContext& context
     );
 };
 

chaotic-openapi/integration_tests/src/handlers/simple/headersget/view.cpp

@@ -2,12 +2,22 @@
 
 namespace handlers::simple::headersget {
 
-Response View::Handle(Request&& /*request*/, Deps&& /*deps*/) { return {}; }
+Response View::Handle(
+    Request&& /*request*/,
+    Deps&& /*deps*/,
+    RequestContext& context
+) {
+    Response200 response;
+    const auto* user_id = context.GetDataOptional<std::string>("x-user-id");
+    response.X_String = user_id ? *user_id : "";
+    response.body = response.X_String;
+    return response;
+}
 
 std::string View::GetResponseForLogging(
     const Response& /*response*/,
     const std::string& /*serialized_response*/,
-    USERVER_NAMESPACE::server::request::RequestContext& /*context*/
+    RequestContext& /*context*/
 ) {
     return {};
 }

chaotic-openapi/integration_tests/src/handlers/simple/headersget/view.hpp

@@ -14,13 +14,14 @@ struct HandlerTag;
 class View final {
 public:
     using Deps = USERVER_NAMESPACE::chaotic::openapi::server::dependencies::ForHandler<HandlerTag>;
+    using RequestContext = USERVER_NAMESPACE::server::request::RequestContext;
 
-    static Response Handle(Request&& request, Deps&& deps);
+    static Response Handle(Request&& request, Deps&& deps, RequestContext& context);
 
     static std::string GetResponseForLogging(
         const Response& response,
         const std::string& serialized_response,
-        USERVER_NAMESPACE::server::request::RequestContext& context
+        RequestContext& context
     );
 };
 

chaotic-openapi/integration_tests/src/handlers/simple/multipartpost/view.cpp

@@ -2,14 +2,20 @@
 
 namespace handlers::simple::multipartpost {
 
-Response View::Handle(Request&& /*request*/, Deps&& /*deps*/) { return {}; }
+Response View::Handle(
+    Request&& /*request*/,
+    Deps&& /*deps*/,
+    RequestContext& /*context*/
+) {
+    return {};
+}
 
 std::string View::GetRequestBodyForLogging(const std::string& /*body*/) { return {}; }
 
 std::string View::GetResponseForLogging(
     const Response& /*response*/,
     const std::string& /*serialized_response*/,
-    USERVER_NAMESPACE::server::request::RequestContext& /*context*/
+    RequestContext& /*context*/
 ) {
     return {};
 }

chaotic-openapi/integration_tests/src/handlers/simple/multipartpost/view.hpp

@@ -14,15 +14,16 @@ struct HandlerTag;
 class View final {
 public:
     using Deps = USERVER_NAMESPACE::chaotic::openapi::server::dependencies::ForHandler<HandlerTag>;
+    using RequestContext = USERVER_NAMESPACE::server::request::RequestContext;
 
-    static Response Handle(Request&& request, Deps&& deps);
+    static Response Handle(Request&& request, Deps&& deps, RequestContext& context);
 
     static std::string GetRequestBodyForLogging(const std::string& body);
 
     static std::string GetResponseForLogging(
         const Response& response,
         const std::string& serialized_response,
-        USERVER_NAMESPACE::server::request::RequestContext& context
+        RequestContext& context
     );
 };
 

chaotic-openapi/integration_tests/src/handlers/simple/multipost/view.cpp

@@ -2,12 +2,18 @@
 
 namespace handlers::simple::multipost {
 
-Response View::Handle(Request&& /*request*/, Deps&& /*deps*/) { return {}; }
+Response View::Handle(
+    Request&& /*request*/,
+    Deps&& /*deps*/,
+    RequestContext& /*context*/
+) {
+    return {};
+}
 
 std::string View::GetResponseForLogging(
     const Response& /*response*/,
     const std::string& /*serialized_response*/,
-    USERVER_NAMESPACE::server::request::RequestContext& /*context*/
+    RequestContext& /*context*/
 ) {
     return {};
 }

chaotic-openapi/integration_tests/src/handlers/simple/multipost/view.hpp

@@ -14,13 +14,14 @@ struct HandlerTag;
 class View final {
 public:
     using Deps = USERVER_NAMESPACE::chaotic::openapi::server::dependencies::ForHandler<HandlerTag>;
+    using RequestContext = USERVER_NAMESPACE::server::request::RequestContext;
 
-    static Response Handle(Request&& request, Deps&& deps);
+    static Response Handle(Request&& request, Deps&& deps, RequestContext& context);
 
     static std::string GetResponseForLogging(
         const Response& response,
         const std::string& serialized_response,
-        USERVER_NAMESPACE::server::request::RequestContext& context
+        RequestContext& context
     );
 };
 

chaotic-openapi/integration_tests/src/handlers/simple/octetget/view.cpp

@@ -2,14 +2,20 @@
 
 namespace handlers::simple::octetget {
 
-Response View::Handle(Request&& /*request*/, Deps&& /*deps*/) { return {}; }
+Response View::Handle(
+    Request&& /*request*/,
+    Deps&& /*deps*/,
+    RequestContext& /*context*/
+) {
+    return {};
+}
 
 std::string View::GetRequestBodyForLogging(const std::string& /*body*/) { return {}; }
 
 std::string View::GetResponseForLogging(
     const Response& /*response*/,
     const std::string& /*serialized_response*/,
-    USERVER_NAMESPACE::server::request::RequestContext& /*context*/
+    RequestContext& /*context*/
 ) {
     return {};
 }

chaotic-openapi/integration_tests/src/handlers/simple/octetget/view.hpp

@@ -14,15 +14,16 @@ struct HandlerTag;
 class View final {
 public:
     using Deps = USERVER_NAMESPACE::chaotic::openapi::server::dependencies::ForHandler<HandlerTag>;
+    using RequestContext = USERVER_NAMESPACE::server::request::RequestContext;
 
-    static Response Handle(Request&& request, Deps&& deps);
+    static Response Handle(Request&& request, Deps&& deps, RequestContext& context);
 
     static std::string GetRequestBodyForLogging(const std::string& body);
 
     static std::string GetResponseForLogging(
         const Response& response,
         const std::string& serialized_response,
-        USERVER_NAMESPACE::server::request::RequestContext& context
+        RequestContext& context
     );
 };