make tests functional

aws · Sep 6, 2024 · f6111ca · f6111ca
1 parent ca282bb
commit f6111ca
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 12 deletions.
diff --git a/src/aws-cpp-sdk-core/include/smithy/identity/identity/AwsBearerTokenIdentity.h b/src/aws-cpp-sdk-core/include/smithy/identity/identity/AwsBearerTokenIdentity.h
@@ -9,10 +9,20 @@
 namespace smithy {
     class AwsBearerTokenIdentity : public AwsBearerTokenIdentityBase {
     public:
-        virtual Aws::String token() const override;
+
+        virtual const Aws::String& token() const override;
 
         virtual Aws::Crt::Optional<AwsIdentity::DateTime> expiration() const override;
 
+        Aws::String& token(){
+            return m_token;
+        }
+
+        Aws::Crt::Optional<AwsIdentity::DateTime>& expiration(){
+            return m_expiration;
+        }
+
+
     protected:
         Aws::String m_token;
         Aws::Crt::Optional<AwsIdentity::DateTime> m_expiration;

diff --git a/src/aws-cpp-sdk-core/include/smithy/identity/identity/AwsBearerTokenIdentityBase.h b/src/aws-cpp-sdk-core/include/smithy/identity/identity/AwsBearerTokenIdentityBase.h
@@ -9,7 +9,7 @@
 namespace smithy {
     class AwsBearerTokenIdentityBase : public AwsIdentity {
     public:
-        virtual Aws::String token() const = 0;
+        virtual const Aws::String& token() const = 0;
 
         virtual Aws::Crt::Optional<AwsIdentity::DateTime> expiration() const override = 0 ;
     };

diff --git a/src/aws-cpp-sdk-core/include/smithy/identity/identity/impl/AwsBearerTokenIdentityImpl.h b/src/aws-cpp-sdk-core/include/smithy/identity/identity/impl/AwsBearerTokenIdentityImpl.h
@@ -8,7 +8,7 @@
 #include <smithy/identity/identity/AwsBearerTokenIdentity.h>
 
 namespace smithy {
-    Aws::String AwsBearerTokenIdentity::token() const {
+    const Aws::String& AwsBearerTokenIdentity::token() const {
         return m_token;
     }
 

diff --git a/src/aws-cpp-sdk-core/include/smithy/identity/resolver/AwsBearerTokenIdentityResolver.h b/src/aws-cpp-sdk-core/include/smithy/identity/resolver/AwsBearerTokenIdentityResolver.h
@@ -20,6 +20,8 @@ namespace smithy {
         using IdentityT = AwsBearerTokenIdentity;
         virtual ~AwsBearerTokenIdentityResolver() = default;
 
+        AwsBearerTokenIdentityResolver() = default;
+
         AwsBearerTokenIdentityResolver(const Aws::Vector<std::shared_ptr<Aws::Auth::AWSBearerTokenProviderBase> >& providerChain) : m_providerChainLegacy{providerChain}
         {
 

diff --git a/tests/aws-cpp-sdk-core-tests/smithy/client/SmithyClientTest.cpp b/tests/aws-cpp-sdk-core-tests/smithy/client/SmithyClientTest.cpp
@@ -85,7 +85,7 @@ class SmithyClientTest : public Aws::Testing::AwsCppSdkGTestSuite {
 };
 
 
-
+//====================bearer token ===============================
 class TestSSOBearerTokenProvider : public Aws::Auth::AWSBearerTokenProviderBase
 {
     public:
@@ -95,14 +95,14 @@ class TestSSOBearerTokenProvider : public Aws::Auth::AWSBearerTokenProviderBase
     }
 };
 
-class TestAwsBearerTokenIdentityResolver : smithy::DefaultAwsBearerTokenIdentityResolver
+class TestAwsBearerTokenIdentityResolver : public smithy::DefaultAwsBearerTokenIdentityResolver
 {
     public:
-    TestAwsBearerTokenIdentityResolver():DefaultAwsBearerTokenIdentityResolver(){
+    TestAwsBearerTokenIdentityResolver(): smithy::DefaultAwsBearerTokenIdentityResolver(){
         AddBearerTokenProvider(Aws::MakeShared<TestSSOBearerTokenProvider>(ALLOC_TAG));
     }
 };
-
+//===============================================================
 const char SmithyClientTest::ALLOCATION_TAG[] = "SmithyClientTest";
 
 
@@ -255,8 +255,6 @@ TEST_F(SmithyClientTest, testSigV4a) {
     EXPECT_FALSE(res2.GetResult()->GetUri().GetURIString(true).empty());
 
 }
-//      using AwsCredentialIdentityResolverT = IdentityResolverBase<IdentityT>;
-//      using AwsCredentialSignerT = AwsSignerBase<IdentityT>;
 
 TEST_F(SmithyClientTest, bearer) {
 
@@ -265,9 +263,10 @@ TEST_F(SmithyClientTest, bearer) {
     Aws::UnorderedMap<Aws::String, SigVariant> authSchemesMap;
 
     Aws::String key{"Bearer"};
-    auto credentialsResolver = Aws::MakeShared<TestAwsBearerTokenIdentityResolver>(ALLOCATION_TAG);
 
-    SigVariant val{smithy::BearerTokenAuthScheme(credentialsResolver, "MyService", "us-west-2")};
+    std::shared_ptr<smithy::AwsBearerTokenIdentityResolver> resolver = Aws::MakeShared<TestAwsBearerTokenIdentityResolver>(ALLOCATION_TAG);
+
+    SigVariant val{smithy::BearerTokenAuthScheme(resolver, "MyService", "us-west-2")};
 
     authSchemesMap.emplace(key, val);
 
@@ -298,7 +297,10 @@ TEST_F(SmithyClientTest, bearer) {
     auto res2 = ptr->SignRequest(httpRequest, res.GetResult());
 
     EXPECT_EQ(res2.IsSuccess(), true);
-
+
+    EXPECT_TRUE(!res2.GetResult()->GetHeaderValue("authorization").empty());
+
+    std::cout<<"header="<<res2.GetResult()->GetHeaderValue("authorization")<<std::endl;
 
     //EXPECT_TRUE(res2.GetResult()->GetSigningAccessKey().empty());