diff --git a/VERSION b/VERSION index fdd46ca9b..5cfea5912 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.1777 \ No newline at end of file +1.36.1778 \ No newline at end of file diff --git a/sts/CMakeLists.txt b/sts/CMakeLists.txt index e32f45c0f..d2eadf6f9 100644 --- a/sts/CMakeLists.txt +++ b/sts/CMakeLists.txt @@ -80,12 +80,6 @@ if(CMAKE_HOST_WIN32) set_target_properties(sts PROPERTIES COMPILE_OPTIONS "/bigobj") -elseif(CMAKE_HOST_APPLE) - MESSAGE(STATUS "sts: include & link for MACOS") - target_include_directories(sts - PRIVATE /usr/local/include) - target_link_libraries(sts - /usr/local/lib/libjsoncpp.dylib) else() target_include_directories(sts PRIVATE /usr/include/jsoncpp) diff --git a/sts/include/alibabacloud/sts/model/AssumeRoleWithOIDCResult.h b/sts/include/alibabacloud/sts/model/AssumeRoleWithOIDCResult.h index 27ac32c0b..9ee915a67 100644 --- a/sts/include/alibabacloud/sts/model/AssumeRoleWithOIDCResult.h +++ b/sts/include/alibabacloud/sts/model/AssumeRoleWithOIDCResult.h @@ -35,6 +35,9 @@ namespace AlibabaCloud struct OIDCTokenInfo { std::string issuer; + std::string issuanceTime; + std::string verificationInfo; + std::string expirationTime; std::string subject; std::string clientIds; }; diff --git a/sts/src/model/AssumeRoleWithOIDCResult.cc b/sts/src/model/AssumeRoleWithOIDCResult.cc index 98aa5649c..e5e8dd6a2 100644 --- a/sts/src/model/AssumeRoleWithOIDCResult.cc +++ b/sts/src/model/AssumeRoleWithOIDCResult.cc @@ -46,6 +46,12 @@ void AssumeRoleWithOIDCResult::parse(const std::string &payload) oIDCTokenInfo_.issuer = oIDCTokenInfoNode["Issuer"].asString(); if(!oIDCTokenInfoNode["ClientIds"].isNull()) oIDCTokenInfo_.clientIds = oIDCTokenInfoNode["ClientIds"].asString(); + if(!oIDCTokenInfoNode["ExpirationTime"].isNull()) + oIDCTokenInfo_.expirationTime = oIDCTokenInfoNode["ExpirationTime"].asString(); + if(!oIDCTokenInfoNode["IssuanceTime"].isNull()) + oIDCTokenInfo_.issuanceTime = oIDCTokenInfoNode["IssuanceTime"].asString(); + if(!oIDCTokenInfoNode["VerificationInfo"].isNull()) + oIDCTokenInfo_.verificationInfo = oIDCTokenInfoNode["VerificationInfo"].asString(); auto assumedRoleUserNode = value["AssumedRoleUser"]; if(!assumedRoleUserNode["AssumedRoleId"].isNull()) assumedRoleUser_.assumedRoleId = assumedRoleUserNode["AssumedRoleId"].asString();