Move code for oauth tokens in standalone package swissup/module-oauth…

…2-client
swissup · Jul 11, 2024 · df19c6c · df19c6c
1 parent d8b224d
commit df19c6c
Show file tree

Hide file tree

Showing 12 changed files with 71 additions and 277 deletions.
diff --git a/Api/Data/ServiceInterface.php b/Api/Data/ServiceInterface.php
@@ -16,7 +16,7 @@ interface ServiceInterface
     const PORT     = 'port';
     const SECURE   = 'secure';
     const AUTH     = 'auth';
-    const TOKEN    = 'token';
+    const TOKEN_ID = 'token_id';
     const KEY      = 'key';
     const REMOVE   = 'remove';
 
@@ -120,7 +120,7 @@ public function getAuth();
     /**
      * @return mixed
      */
-    public function getToken();
+    public function getTokenId();
 
     /**
      * Get key
@@ -225,10 +225,10 @@ public function setSecure($secure);
     public function setAuth($auth);
 
     /**
-     * @param string $token
+     * @param int $tokenId
      * @return \Swissup\Email\Api\Data\ServiceInterface
      */
-    public function setToken($token);
+    public function setTokenId($tokenId);
 
     /**
      * Set key

diff --git a/Controller/Adminhtml/Email/Service/Save.php b/Controller/Adminhtml/Email/Service/Save.php
@@ -76,8 +76,8 @@ public function execute()
                 $this->session->setFormData(false);
 
                 if ($model->hasData('callback_url')) {
-                     $flowUrl = $model->getData('callback_url');
-                     return $resultRedirect->setUrl($flowUrl);
+                     $callbackUrl = $model->getData('callback_url');
+                     return $resultRedirect->setUrl($callbackUrl);
                 }
 
                 if ($this->getRequest()->getParam('back')) {

diff --git a/Controller/Gmail/GetOAuth2Token.php b/Controller/Gmail/GetOAuth2Token.php
diff --git a/Mail/Transport/GmailOAuth2.php b/Mail/Transport/GmailOAuth2.php
@@ -24,8 +24,8 @@ public function __construct(
         SmtpOptions $options = null
     ) {
         if (! $options instanceof SmtpOptions) {
-            $host = 'smtp.gmail.com';
-            $port = 587;
+            $host = isset($config['host']) ? $config['host'] : 'smtp.gmail.com';
+            $port = isset($config['port']) ? (int) $config['port'] : 587;
 
             if (!isset($config['token']) || !isset($config['token']['access_token'])) {
                 $phrase = new \Magento\Framework\Phrase('token is broken');

diff --git a/Model/Service.php b/Model/Service.php
@@ -161,11 +161,11 @@ public function getAuth()
     }
 
     /**
-     * @return string
+     * @return int
      */
-    public function getToken()
+    public function getTokenId()
     {
-        return $this->getData(self::TOKEN);
+        return $this->getData(self::TOKEN_ID);
     }
 
     /**
@@ -309,9 +309,9 @@ public function setAuth($auth)
         return $this->setData(self::AUTH, $auth);
     }
 
-    public function setToken($token)
+    public function setTokenId($tokenId)
     {
-        return $this->setData(self::TOKEN, $token);
+        return $this->setData(self::TOKEN_ID, $tokenId);
     }
 
     /**

diff --git a/Model/Service/Encryptor.php b/Model/Service/Encryptor.php
@@ -13,43 +13,20 @@ class Encryptor implements ServiceEncryptorInterface
      */
     private $encryptor;
 
-    /**
-     * @var SerializerInterface
-     */
-    private $serializer;
-
     /**
      * @param EncryptorInterface $encryptor
      */
-    public function __construct(EncryptorInterface $encryptor, SerializerInterface $serializer)
+    public function __construct(EncryptorInterface $encryptor)
     {
         $this->encryptor = $encryptor;
-        $this->serializer = $serializer;
     }
 
     /**
      * @return string[]
      */
     private function getAttributes()
     {
-        return ['password', 'token'];
-    }
-
-    /**
-     * @return string[]
-     */
-    private function getSerializableAttributes()
-    {
-        return ['token'];
-    }
-
-    /**
-     * @param $attribute
-     * @return bool
-     */
-    private function isSerializableAttribute($attribute)
-    {
-        return in_array($attribute, $this->getSerializableAttributes());
+        return ['password'];
     }
 
     /**
@@ -60,9 +37,6 @@ public function encrypt(ServiceInterface $object): void
     {
         foreach ($this->getAttributes() as $attributeCode) {
             $value = $object->getData($attributeCode);
-            if ($this->isSerializableAttribute($attributeCode)) {
-                $value = $this->serializer->serialize($value);
-            }
             if ($value) {
                 $object->setData($attributeCode, $this->encryptor->encrypt($value));
             }
@@ -80,9 +54,6 @@ public function decrypt(ServiceInterface $object): void
             if ($value) {
                 try {
                     $value = $this->encryptor->decrypt($value);
-                    if ($this->isSerializableAttribute($attributeCode)) {
-                        $value = $this->serializer->unserialize($value);
-                    }
                     $object->setData($attributeCode, $value);
                 } catch (\Exception $e) {
                     // value is not encrypted or something wrong with encrypted data