refactor: improve all credentials providers

aliyun · Oct 14, 2024 · 69e0ee8 · 69e0ee8
1 parent 8750d18
commit 69e0ee8
Show file tree

Hide file tree

Showing 73 changed files with 4,492 additions and 1,714 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2

diff --git a/README-zh-CN.md b/README-zh-CN.md
@@ -134,7 +134,6 @@ $bearerToken = new Credential([
     'bearer_token' => '<bearer_token>',
 ]);
 $bearerToken->getBearerToken();
-$bearerToken->getSignature();
 ```
 
 ## 默认凭证提供程序链

diff --git a/README.md b/README.md
@@ -134,7 +134,6 @@ $bearerToken = new Credential([
     'bearer_token' => '<bearer_token>',
 ]);
 $bearerToken->getBearerToken();
-$bearerToken->getSignature();
 ```
 
 ## Default credential provider chain

diff --git a/phpunit.xml b/phpunit.xml
@@ -39,14 +39,9 @@
         <whitelist processUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">./src</directory>
             <exclude>
-                <file>./src/Profile/DefaultProfile.php</file>
-                <file>./src/DefaultAcsClient.php</file>
-                <file>./src/Release.php</file>
-                <file>./src/SDK.php</file>
-                <file>./src/Functions.php</file>
-                <file>./src/Constants/Business.php</file>
-                <file>./src/Constants/ErrorCode.php</file>
-                <file>./src/Signature/Signature.php</file>
+                <file>./src/Credential/Config.php</file>
+                <file>./src/Credential/CredentialModel.php</file>
+                <file>./src/Providers/CredentialsProvider.php</file>
                 <file>./src/Credentials/CredentialsInterface.php</file>
             </exclude>
         </whitelist>

diff --git a/src/AccessKeyCredential.php b/src/AccessKeyCredential.php
@@ -2,9 +2,11 @@
 
 namespace AlibabaCloud\Credentials;
 
-use AlibabaCloud\Credentials\Signature\ShaHmac1Signature;
+use AlibabaCloud\Credentials\Utils\Filter;
+use AlibabaCloud\Credentials\Credential\CredentialModel;
 
 /**
+ * @deprecated
  * Use the AccessKey to complete the authentication.
  */
 class AccessKeyCredential implements CredentialsInterface
@@ -29,7 +31,7 @@ public function __construct($access_key_id, $access_key_secret)
     {
         Filter::accessKey($access_key_id, $access_key_secret);
 
-        $this->accessKeyId     = $access_key_id;
+        $this->accessKeyId = $access_key_id;
         $this->accessKeySecret = $access_key_secret;
     }
 
@@ -57,16 +59,19 @@ public function __toString()
         return "$this->accessKeyId#$this->accessKeySecret";
     }
 
-    /**
-     * @return ShaHmac1Signature
-     */
-    public function getSignature()
-    {
-        return new ShaHmac1Signature();
-    }
-
     public function getSecurityToken()
     {
         return '';
     }
+    /**
+     * @inheritDoc
+     */
+    public function getCredential()
+    {
+        return new CredentialModel([
+            'accessKeyId' => $this->accessKeyId,
+            'accessKeySecret' => $this->accessKeySecret,
+            'type' => 'access_key',
+        ]);
+    }
 }
diff --git a/src/BearerTokenCredential.php b/src/BearerTokenCredential.php
@@ -2,7 +2,8 @@
 
 namespace AlibabaCloud\Credentials;
 
-use AlibabaCloud\Credentials\Signature\BearerTokenSignature;
+use AlibabaCloud\Credentials\Utils\Filter;
+use AlibabaCloud\Credentials\Credential\CredentialModel;
 
 /**
  * Class BearerTokenCredential
@@ -44,10 +45,14 @@ public function __toString()
     }
 
     /**
-     * @return BearerTokenSignature
+     * @inheritDoc
      */
-    public function getSignature()
+    public function getCredential()
     {
-        return new BearerTokenSignature();
+        return new CredentialModel([
+            'bearerToken' => $this->bearerToken,
+            'type' => 'bearer',
+        ]);
     }
+
 }