Rebuild sdk (#60)

* rebuild sdk

* fixed ut include Utils.h

sts/CMakeLists.txt

@@ -26,7 +26,9 @@ set(sts_public_header_model
 	include/alibabacloud/sts/model/GenerateSessionAccessKeyRequest.h
 	include/alibabacloud/sts/model/GenerateSessionAccessKeyResult.h
 	include/alibabacloud/sts/model/AssumeRoleRequest.h
-	include/alibabacloud/sts/model/AssumeRoleResult.h )
+	include/alibabacloud/sts/model/AssumeRoleResult.h
+	include/alibabacloud/sts/model/AssumeRoleWithSAMLRequest.h
+	include/alibabacloud/sts/model/AssumeRoleWithSAMLResult.h )
 
 set(sts_src 
 	src/StsClient.cc
@@ -35,7 +37,9 @@ set(sts_src
 	src/model/GenerateSessionAccessKeyRequest.cc
 	src/model/GenerateSessionAccessKeyResult.cc
 	src/model/AssumeRoleRequest.cc
-	src/model/AssumeRoleResult.cc )
+	src/model/AssumeRoleResult.cc
+	src/model/AssumeRoleWithSAMLRequest.cc
+	src/model/AssumeRoleWithSAMLResult.cc )
 
 add_library(sts ${LIB_TYPE}
 	${sts_public_header}

sts/include/alibabacloud/sts/StsClient.h

@@ -28,6 +28,8 @@
 #include "model/GenerateSessionAccessKeyResult.h"
 #include "model/AssumeRoleRequest.h"
 #include "model/AssumeRoleResult.h"
+#include "model/AssumeRoleWithSAMLRequest.h"
+#include "model/AssumeRoleWithSAMLResult.h"
 
 
 namespace AlibabaCloud
@@ -46,6 +48,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::AssumeRoleResult> AssumeRoleOutcome;
 			typedef std::future<AssumeRoleOutcome> AssumeRoleOutcomeCallable;
 			typedef std::function<void(const StsClient*, const Model::AssumeRoleRequest&, const AssumeRoleOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> AssumeRoleAsyncHandler;
+			typedef Outcome<Error, Model::AssumeRoleWithSAMLResult> AssumeRoleWithSAMLOutcome;
+			typedef std::future<AssumeRoleWithSAMLOutcome> AssumeRoleWithSAMLOutcomeCallable;
+			typedef std::function<void(const StsClient*, const Model::AssumeRoleWithSAMLRequest&, const AssumeRoleWithSAMLOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> AssumeRoleWithSAMLAsyncHandler;
 
 			StsClient(const Credentials &credentials, const ClientConfiguration &configuration);
 			StsClient(const std::shared_ptr<CredentialsProvider> &credentialsProvider, const ClientConfiguration &configuration);
@@ -60,6 +65,9 @@ namespace AlibabaCloud
 			AssumeRoleOutcome assumeRole(const Model::AssumeRoleRequest &request)const;
 			void assumeRoleAsync(const Model::AssumeRoleRequest& request, const AssumeRoleAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			AssumeRoleOutcomeCallable assumeRoleCallable(const Model::AssumeRoleRequest& request) const;
+			AssumeRoleWithSAMLOutcome assumeRoleWithSAML(const Model::AssumeRoleWithSAMLRequest &request)const;
+			void assumeRoleWithSAMLAsync(const Model::AssumeRoleWithSAMLRequest& request, const AssumeRoleWithSAMLAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			AssumeRoleWithSAMLOutcomeCallable assumeRoleWithSAMLCallable(const Model::AssumeRoleWithSAMLRequest& request) const;
 	
 		private:
 			std::shared_ptr<EndpointProvider> endpointProvider_;

sts/include/alibabacloud/sts/model/AssumeRoleWithSAMLRequest.h

@@ -0,0 +1,60 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_STS_MODEL_ASSUMEROLEWITHSAMLREQUEST_H_
+#define ALIBABACLOUD_STS_MODEL_ASSUMEROLEWITHSAMLREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/sts/StsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Sts
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_STS_EXPORT AssumeRoleWithSAMLRequest : public RpcServiceRequest
+			{
+
+			public:
+				AssumeRoleWithSAMLRequest();
+				~AssumeRoleWithSAMLRequest();
+
+				std::string getRoleArn()const;
+				void setRoleArn(const std::string& roleArn);
+				std::string getSAMLProviderArn()const;
+				void setSAMLProviderArn(const std::string& sAMLProviderArn);
+				std::string getSAMLAssertion()const;
+				void setSAMLAssertion(const std::string& sAMLAssertion);
+				long getDurationSeconds()const;
+				void setDurationSeconds(long durationSeconds);
+				std::string getPolicy()const;
+				void setPolicy(const std::string& policy);
+
+            private:
+				std::string roleArn_;
+				std::string sAMLProviderArn_;
+				std::string sAMLAssertion_;
+				long durationSeconds_;
+				std::string policy_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_STS_MODEL_ASSUMEROLEWITHSAMLREQUEST_H_

sts/include/alibabacloud/sts/model/AssumeRoleWithSAMLResult.h

@@ -0,0 +1,74 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_STS_MODEL_ASSUMEROLEWITHSAMLRESULT_H_
+#define ALIBABACLOUD_STS_MODEL_ASSUMEROLEWITHSAMLRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/sts/StsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Sts
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_STS_EXPORT AssumeRoleWithSAMLResult : public ServiceResult
+			{
+			public:
+				struct Credentials
+				{
+					std::string securityToken;
+					std::string accessKeyId;
+					std::string accessKeySecret;
+					std::string expiration;
+				};
+				struct AssumedRoleUser
+				{
+					std::string arn;
+					std::string assumedRoleId;
+				};
+				struct SAMLAssertionInfo
+				{
+					std::string subjectType;
+					std::string issuer;
+					std::string recipient;
+					std::string subject;
+				};
+
+
+				AssumeRoleWithSAMLResult();
+				explicit AssumeRoleWithSAMLResult(const std::string &payload);
+				~AssumeRoleWithSAMLResult();
+				SAMLAssertionInfo getSAMLAssertionInfo()const;
+				AssumedRoleUser getAssumedRoleUser()const;
+				Credentials getCredentials()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				SAMLAssertionInfo sAMLAssertionInfo_;
+				AssumedRoleUser assumedRoleUser_;
+				Credentials credentials_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_STS_MODEL_ASSUMEROLEWITHSAMLRESULT_H_

sts/src/StsClient.cc

@@ -159,3 +159,39 @@ StsClient::AssumeRoleOutcomeCallable StsClient::assumeRoleCallable(const AssumeR
 	return task->get_future();
 }
 
+StsClient::AssumeRoleWithSAMLOutcome StsClient::assumeRoleWithSAML(const AssumeRoleWithSAMLRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return AssumeRoleWithSAMLOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return AssumeRoleWithSAMLOutcome(AssumeRoleWithSAMLResult(outcome.result()));
+	else
+		return AssumeRoleWithSAMLOutcome(outcome.error());
+}
+
+void StsClient::assumeRoleWithSAMLAsync(const AssumeRoleWithSAMLRequest& request, const AssumeRoleWithSAMLAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, assumeRoleWithSAML(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+StsClient::AssumeRoleWithSAMLOutcomeCallable StsClient::assumeRoleWithSAMLCallable(const AssumeRoleWithSAMLRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<AssumeRoleWithSAMLOutcome()>>(
+			[this, request]()
+			{
+			return this->assumeRoleWithSAML(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+

sts/src/model/AssumeRoleRequest.cc

@@ -33,7 +33,7 @@ std::string AssumeRoleRequest::getRoleArn()const
 void AssumeRoleRequest::setRoleArn(const std::string& roleArn)
 {
 	roleArn_ = roleArn;
-	setParameter("RoleArn", roleArn);
+	setCoreParameter("RoleArn", roleArn);
 }
 
 std::string AssumeRoleRequest::getRoleSessionName()const
@@ -44,7 +44,7 @@ std::string AssumeRoleRequest::getRoleSessionName()const
 void AssumeRoleRequest::setRoleSessionName(const std::string& roleSessionName)
 {
 	roleSessionName_ = roleSessionName;
-	setParameter("RoleSessionName", roleSessionName);
+	setCoreParameter("RoleSessionName", roleSessionName);
 }
 
 long AssumeRoleRequest::getDurationSeconds()const
@@ -55,7 +55,7 @@ long AssumeRoleRequest::getDurationSeconds()const
 void AssumeRoleRequest::setDurationSeconds(long durationSeconds)
 {
 	durationSeconds_ = durationSeconds;
-	setParameter("DurationSeconds", std::to_string(durationSeconds));
+	setCoreParameter("DurationSeconds", std::to_string(durationSeconds));
 }
 
 std::string AssumeRoleRequest::getPolicy()const
@@ -66,6 +66,6 @@ std::string AssumeRoleRequest::getPolicy()const
 void AssumeRoleRequest::setPolicy(const std::string& policy)
 {
 	policy_ = policy;
-	setParameter("Policy", policy);
+	setCoreParameter("Policy", policy);
 }
 

sts/src/model/AssumeRoleResult.cc

@@ -35,10 +35,13 @@ AssumeRoleResult::~AssumeRoleResult()
 
 void AssumeRoleResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	auto credentialsNode = value["Credentials"];
 	if(!credentialsNode["SecurityToken"].isNull())

sts/src/model/AssumeRoleWithSAMLRequest.cc

@@ -0,0 +1,82 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/sts/model/AssumeRoleWithSAMLRequest.h>
+
+using AlibabaCloud::Sts::Model::AssumeRoleWithSAMLRequest;
+
+AssumeRoleWithSAMLRequest::AssumeRoleWithSAMLRequest() :
+	RpcServiceRequest("sts", "2015-04-01", "AssumeRoleWithSAML")
+{}
+
+AssumeRoleWithSAMLRequest::~AssumeRoleWithSAMLRequest()
+{}
+
+std::string AssumeRoleWithSAMLRequest::getRoleArn()const
+{
+	return roleArn_;
+}
+
+void AssumeRoleWithSAMLRequest::setRoleArn(const std::string& roleArn)
+{
+	roleArn_ = roleArn;
+	setCoreParameter("RoleArn", roleArn);
+}
+
+std::string AssumeRoleWithSAMLRequest::getSAMLProviderArn()const
+{
+	return sAMLProviderArn_;
+}
+
+void AssumeRoleWithSAMLRequest::setSAMLProviderArn(const std::string& sAMLProviderArn)
+{
+	sAMLProviderArn_ = sAMLProviderArn;
+	setCoreParameter("SAMLProviderArn", sAMLProviderArn);
+}
+
+std::string AssumeRoleWithSAMLRequest::getSAMLAssertion()const
+{
+	return sAMLAssertion_;
+}
+
+void AssumeRoleWithSAMLRequest::setSAMLAssertion(const std::string& sAMLAssertion)
+{
+	sAMLAssertion_ = sAMLAssertion;
+	setCoreParameter("SAMLAssertion", sAMLAssertion);
+}
+
+long AssumeRoleWithSAMLRequest::getDurationSeconds()const
+{
+	return durationSeconds_;
+}
+
+void AssumeRoleWithSAMLRequest::setDurationSeconds(long durationSeconds)
+{
+	durationSeconds_ = durationSeconds;
+	setCoreParameter("DurationSeconds", std::to_string(durationSeconds));
+}
+
+std::string AssumeRoleWithSAMLRequest::getPolicy()const
+{
+	return policy_;
+}
+
+void AssumeRoleWithSAMLRequest::setPolicy(const std::string& policy)
+{
+	policy_ = policy;
+	setCoreParameter("Policy", policy);
+}
+

sts/src/model/AssumeRoleWithSAMLResult.cc

@@ -0,0 +1,86 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/sts/model/AssumeRoleWithSAMLResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Sts;
+using namespace AlibabaCloud::Sts::Model;
+
+AssumeRoleWithSAMLResult::AssumeRoleWithSAMLResult() :
+	ServiceResult()
+{}
+
+AssumeRoleWithSAMLResult::AssumeRoleWithSAMLResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+AssumeRoleWithSAMLResult::~AssumeRoleWithSAMLResult()
+{}
+
+void AssumeRoleWithSAMLResult::parse(const std::string &payload)
+{
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
+	Json::Value value;
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
+	setRequestId(value["RequestId"].asString());
+	auto credentialsNode = value["Credentials"];
+	if(!credentialsNode["SecurityToken"].isNull())
+		credentials_.securityToken = credentialsNode["SecurityToken"].asString();
+	if(!credentialsNode["AccessKeySecret"].isNull())
+		credentials_.accessKeySecret = credentialsNode["AccessKeySecret"].asString();
+	if(!credentialsNode["AccessKeyId"].isNull())
+		credentials_.accessKeyId = credentialsNode["AccessKeyId"].asString();
+	if(!credentialsNode["Expiration"].isNull())
+		credentials_.expiration = credentialsNode["Expiration"].asString();
+	auto assumedRoleUserNode = value["AssumedRoleUser"];
+	if(!assumedRoleUserNode["Arn"].isNull())
+		assumedRoleUser_.arn = assumedRoleUserNode["Arn"].asString();
+	if(!assumedRoleUserNode["AssumedRoleId"].isNull())
+		assumedRoleUser_.assumedRoleId = assumedRoleUserNode["AssumedRoleId"].asString();
+	auto sAMLAssertionInfoNode = value["SAMLAssertionInfo"];
+	if(!sAMLAssertionInfoNode["SubjectType"].isNull())
+		sAMLAssertionInfo_.subjectType = sAMLAssertionInfoNode["SubjectType"].asString();
+	if(!sAMLAssertionInfoNode["Subject"].isNull())
+		sAMLAssertionInfo_.subject = sAMLAssertionInfoNode["Subject"].asString();
+	if(!sAMLAssertionInfoNode["Recipient"].isNull())
+		sAMLAssertionInfo_.recipient = sAMLAssertionInfoNode["Recipient"].asString();
+	if(!sAMLAssertionInfoNode["Issuer"].isNull())
+		sAMLAssertionInfo_.issuer = sAMLAssertionInfoNode["Issuer"].asString();
+
+}
+
+AssumeRoleWithSAMLResult::SAMLAssertionInfo AssumeRoleWithSAMLResult::getSAMLAssertionInfo()const
+{
+	return sAMLAssertionInfo_;
+}
+
+AssumeRoleWithSAMLResult::AssumedRoleUser AssumeRoleWithSAMLResult::getAssumedRoleUser()const
+{
+	return assumedRoleUser_;
+}
+
+AssumeRoleWithSAMLResult::Credentials AssumeRoleWithSAMLResult::getCredentials()const
+{
+	return credentials_;
+}
+

sts/src/model/GetCallerIdentityResult.cc

@@ -35,10 +35,13 @@ GetCallerIdentityResult::~GetCallerIdentityResult()
 
 void GetCallerIdentityResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	if(!value["AccountId"].isNull())
 		accountId_ = value["AccountId"].asString();