Mercurial > hg > orthanc
comparison Core/WebServiceParameters.cpp @ 2659:c27f7ecf9b54 jobs
cont
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 07 Jun 2018 12:24:17 +0200 |
parents | c196d76cb8fa |
children | eaf10085ffa1 |
comparison
equal
deleted
inserted
replaced
2658:ce770f095092 | 2659:c27f7ecf9b54 |
---|---|
32 | 32 |
33 | 33 |
34 #include "PrecompiledHeaders.h" | 34 #include "PrecompiledHeaders.h" |
35 #include "WebServiceParameters.h" | 35 #include "WebServiceParameters.h" |
36 | 36 |
37 #include "../Core/Logging.h" | 37 #include "Logging.h" |
38 #include "../Core/OrthancException.h" | 38 #include "OrthancException.h" |
39 #include "SerializationToolbox.h" | |
39 | 40 |
40 #if ORTHANC_SANDBOXED == 0 | 41 #if ORTHANC_SANDBOXED == 0 |
41 # include "../Core/SystemToolbox.h" | 42 # include "../Core/SystemToolbox.h" |
42 #endif | 43 #endif |
43 | 44 |
272 } | 273 } |
273 | 274 |
274 | 275 |
275 void WebServiceParameters::Serialize(Json::Value& target) const | 276 void WebServiceParameters::Serialize(Json::Value& target) const |
276 { | 277 { |
277 throw OrthancException(ErrorCode_NotImplemented); | 278 target = Json::objectValue; |
279 target["URL"] = url_; | |
280 target["Username"] = username_; | |
281 target["Password"] = password_; | |
282 target["CertificateFile"] = certificateFile_; | |
283 target["CertificateKeyFile"] = certificateKeyFile_; | |
284 target["CertificateKeyPassword"] = certificateKeyPassword_; | |
285 target["PKCS11"] = pkcs11Enabled_; | |
278 } | 286 } |
279 | 287 |
280 | 288 |
281 WebServiceParameters::WebServiceParameters(const Json::Value& serialized) | 289 WebServiceParameters::WebServiceParameters(const Json::Value& serialized) : |
282 { | 290 advancedFormat_(true) |
283 throw OrthancException(ErrorCode_NotImplemented); | 291 { |
292 url_ = SerializationToolbox::ReadString(serialized, "URL"); | |
293 username_ = SerializationToolbox::ReadString(serialized, "Username"); | |
294 password_ = SerializationToolbox::ReadString(serialized, "Password"); | |
295 | |
296 std::string a, b, c; | |
297 a = SerializationToolbox::ReadString(serialized, "CertificateFile"); | |
298 b = SerializationToolbox::ReadString(serialized, "CertificateKeyFile"); | |
299 c = SerializationToolbox::ReadString(serialized, "CertificateKeyPassword"); | |
300 | |
301 if (!a.empty()) | |
302 { | |
303 SetClientCertificate(a, b, c); | |
304 } | |
305 | |
306 pkcs11Enabled_ = SerializationToolbox::ReadBoolean(serialized, "PKCS11"); | |
284 } | 307 } |
285 } | 308 } |