Merge pull request #8 from progammer-rkt/fix/Make-Sure-Customer-Token…

…-Always-Created-Fresh

Make Sure Existing Token Is Removed Prior to Create a New Token

src/CustomerData/CustomerPlugin.php

@@ -31,17 +31,17 @@ class CustomerPlugin
      * @var TokenModelFactory
      */
     private $tokenModelFactory;
-    
+
     /**
      * @var OauthHelper
      */
     private $oauthHelper;
-    
+
     /**
      * @var DateTime
      */
     private $dateTime;
-    
+
     /**
      * @var Date
      */
@@ -108,6 +108,13 @@ public function afterGetSectionData(Customer $subject, array $result)
         $token = $tokenModel->loadByCustomerId($customerId);
 
         if (!$token->getId() || $token->getRevoked() || $this->isTokenExpired($token)) {
+            // if there exist an entry in oauth_token table for the customer, then
+            // remove it before attempting createCustomerToken
+            if ($token->getId()) {
+                $token->delete();
+                $tokenModel = $this->tokenModelFactory->create();
+            }
+
             $token = $tokenModel->createCustomerToken($customerId);
         }