From 70c0ab9cf62d5f6e91e6eb01b675937c252c2bcf Mon Sep 17 00:00:00 2001
From: Enrique Figueroa <elder.e.figueroa@gmail.com>
Date: Fri, 11 Nov 2022 15:10:47 -0800
Subject: [PATCH] Replaces deprecated formatAttributes function with AWS
 Marshaler
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1) The DynomoDbClient::formatAttributes function has been deprecated and suggested fix is to use the function marshalItem from AWS DynomoDb’s Marshaler class.
2) When upgrading to AWS SKD PHP V3, it forces to update guzzle, which in turn will use AWS Result class that now returns two items in its array: item and @metadata. Thus, fixed DynamoDb::ClientCredentials() to not use $result->count() == 1 anymore.

Signed-off-by: Enrique Figueroa <elder.e.figueroa@gmail.com>
---
 src/OAuth2/Storage/DynamoDB.php | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/OAuth2/Storage/DynamoDB.php b/src/OAuth2/Storage/DynamoDB.php
index a54cb3712..831233b7f 100644
--- a/src/OAuth2/Storage/DynamoDB.php
+++ b/src/OAuth2/Storage/DynamoDB.php
@@ -3,6 +3,7 @@
 namespace OAuth2\Storage;
 
 use Aws\DynamoDb\DynamoDbClient;
+use Aws\DynamoDb\Marshaler;
 
 use OAuth2\OpenID\Storage\UserClaimsInterface;
 use OAuth2\OpenID\Storage\AuthorizationCodeInterface as OpenIDAuthorizationCodeInterface;
@@ -45,6 +46,7 @@ class DynamoDB implements
 {
     protected $client;
     protected $config;
+    protected $marshaler;
 
     public function __construct($connection, $config = array())
     {
@@ -74,6 +76,8 @@ public function __construct($connection, $config = array())
             'scope_table'  => 'oauth_scopes',
             'public_key_table'  => 'oauth_public_keys',
         ), $config);
+
+        $this->marshaler = new Marshaler();
     }
 
     /* OAuth2\Storage\ClientCredentialsInterface */
@@ -84,7 +88,7 @@ public function checkClientCredentials($client_id, $client_secret = null)
             "Key" => array('client_id'   => array('S' => $client_id))
         ));
 
-        return  $result->count()==1 && $result["Item"]["client_secret"]["S"] == $client_secret;
+        return  $result->hasKey('Item') && $result["Item"]["client_secret"]["S"] == $client_secret;
     }
 
     public function isPublicClient($client_id)
@@ -128,7 +132,7 @@ public function setClientDetails($client_id, $client_secret = null, $redirect_ur
 
         $result = $this->client->putItem(array(
             'TableName' =>  $this->config['client_table'],
-            'Item' => $this->client->formatAttributes($clientData)
+            'Item' => $this->marshaler->marshalItem($clientData)
         ));
 
         return true;
@@ -175,7 +179,7 @@ public function setAccessToken($access_token, $client_id, $user_id, $expires, $s
 
         $result = $this->client->putItem(array(
             'TableName' =>  $this->config['access_token_table'],
-            'Item' => $this->client->formatAttributes($clientData)
+            'Item' => $this->marshaler->marshalItem($clientData)
         ));
 
         return true;
@@ -186,7 +190,7 @@ public function unsetAccessToken($access_token)
     {
         $result = $this->client->deleteItem(array(
             'TableName' =>  $this->config['access_token_table'],
-            'Key' => $this->client->formatAttributes(array("access_token" => $access_token)),
+            'Key' => $this->marshaler->marshalItem(array("access_token" => $access_token)),
             'ReturnValues' => 'ALL_OLD',
         ));
 
@@ -223,7 +227,7 @@ public function setAuthorizationCode($authorization_code, $client_id, $user_id,
 
         $result = $this->client->putItem(array(
             'TableName' =>  $this->config['code_table'],
-            'Item' => $this->client->formatAttributes($clientData)
+            'Item' => $this->marshaler->marshalItem($clientData)
         ));
 
         return true;
@@ -234,7 +238,7 @@ public function expireAuthorizationCode($code)
 
         $result = $this->client->deleteItem(array(
             'TableName' =>  $this->config['code_table'],
-            'Key' => $this->client->formatAttributes(array("authorization_code" => $code))
+            'Key' => $this->marshaler->marshalItem(array("authorization_code" => $code))
         ));
 
         return true;
@@ -324,7 +328,7 @@ public function setRefreshToken($refresh_token, $client_id, $user_id, $expires,
 
         $result = $this->client->putItem(array(
             'TableName' =>  $this->config['refresh_token_table'],
-            'Item' => $this->client->formatAttributes($clientData)
+            'Item' => $this->marshaler->marshalItem($clientData)
         ));
 
         return true;
@@ -334,7 +338,7 @@ public function unsetRefreshToken($refresh_token)
     {
         $result = $this->client->deleteItem(array(
             'TableName' =>  $this->config['refresh_token_table'],
-            'Key' => $this->client->formatAttributes(array("refresh_token" => $refresh_token))
+            'Key' => $this->marshaler->marshalItem(array("refresh_token" => $refresh_token))
         ));
 
         return true;
@@ -377,7 +381,7 @@ public function setUser($username, $password, $first_name = null, $last_name = n
 
         $result = $this->client->putItem(array(
             'TableName' =>  $this->config['user_table'],
-            'Item' => $this->client->formatAttributes($clientData)
+            'Item' => $this->marshaler->marshalItem($clientData)
         ));
 
         return true;