Mercurial > hg > orthanc
comparison OrthancFramework/Sources/RestApi/RestApiCall.h @ 4330:a01b1c9cbef4
moving generic type definitions from IHttpHandler to HttpToolbox
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 25 Nov 2020 14:39:10 +0100 |
parents | bf7b9edf6b81 |
children | 3af1d763763a |
comparison
equal
deleted
inserted
replaced
4329:9dc0e42f868b | 4330:a01b1c9cbef4 |
---|---|
20 **/ | 20 **/ |
21 | 21 |
22 | 22 |
23 #pragma once | 23 #pragma once |
24 | 24 |
25 #include "../HttpServer/IHttpHandler.h" | |
26 #include "../HttpServer/HttpToolbox.h" | 25 #include "../HttpServer/HttpToolbox.h" |
27 #include "RestApiPath.h" | 26 #include "RestApiPath.h" |
28 #include "RestApiOutput.h" | 27 #include "RestApiOutput.h" |
29 | 28 |
30 #include <boost/noncopyable.hpp> | 29 #include <boost/noncopyable.hpp> |
39 RestApiOutput& output_; | 38 RestApiOutput& output_; |
40 RestApi& context_; | 39 RestApi& context_; |
41 RequestOrigin origin_; | 40 RequestOrigin origin_; |
42 const char* remoteIp_; | 41 const char* remoteIp_; |
43 const char* username_; | 42 const char* username_; |
44 const IHttpHandler::Arguments& httpHeaders_; | 43 const HttpToolbox::Arguments& httpHeaders_; |
45 const IHttpHandler::Arguments& uriComponents_; | 44 const HttpToolbox::Arguments& uriComponents_; |
46 const UriComponents& trailing_; | 45 const UriComponents& trailing_; |
47 const UriComponents& fullUri_; | 46 const UriComponents& fullUri_; |
48 | 47 |
49 protected: | 48 protected: |
50 static bool ParseJsonRequestInternal(Json::Value& result, | 49 static bool ParseJsonRequestInternal(Json::Value& result, |
55 RestApiCall(RestApiOutput& output, | 54 RestApiCall(RestApiOutput& output, |
56 RestApi& context, | 55 RestApi& context, |
57 RequestOrigin origin, | 56 RequestOrigin origin, |
58 const char* remoteIp, | 57 const char* remoteIp, |
59 const char* username, | 58 const char* username, |
60 const IHttpHandler::Arguments& httpHeaders, | 59 const HttpToolbox::Arguments& httpHeaders, |
61 const IHttpHandler::Arguments& uriComponents, | 60 const HttpToolbox::Arguments& uriComponents, |
62 const UriComponents& trailing, | 61 const UriComponents& trailing, |
63 const UriComponents& fullUri) : | 62 const UriComponents& fullUri) : |
64 output_(output), | 63 output_(output), |
65 context_(context), | 64 context_(context), |
66 origin_(origin), | 65 origin_(origin), |
103 const std::string& defaultValue) const | 102 const std::string& defaultValue) const |
104 { | 103 { |
105 return HttpToolbox::GetArgument(httpHeaders_, name, defaultValue); | 104 return HttpToolbox::GetArgument(httpHeaders_, name, defaultValue); |
106 } | 105 } |
107 | 106 |
108 const IHttpHandler::Arguments& GetHttpHeaders() const | 107 const HttpToolbox::Arguments& GetHttpHeaders() const |
109 { | 108 { |
110 return httpHeaders_; | 109 return httpHeaders_; |
111 } | 110 } |
112 | 111 |
113 void ParseCookies(IHttpHandler::Arguments& result) const | 112 void ParseCookies(HttpToolbox::Arguments& result) const |
114 { | 113 { |
115 HttpToolbox::ParseCookies(result, httpHeaders_); | 114 HttpToolbox::ParseCookies(result, httpHeaders_); |
116 } | 115 } |
117 | 116 |
118 std::string FlattenUri() const; | 117 std::string FlattenUri() const; |