ENGCOM-4654: Fixed inactive admin user token #20772

Author: sivaschenko

app/code/Magento/Integration/Model/AdminTokenService.php

@@ -72,7 +72,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function createAdminAccessToken($username, $password)
     {
@@ -110,7 +110,7 @@ public function revokeAdminAccessToken($adminId)
     {
         $tokenCollection = $this->tokenModelCollectionFactory->create()->addFilterByAdminId($adminId);
         if ($tokenCollection->getSize() == 0) {
-            throw new LocalizedException(__('This user has no tokens.'));
+            return true;
         }
         try {
             foreach ($tokenCollection as $token) {

app/code/Magento/Integration/Test/Unit/Model/AdminTokenServiceTest.php

@@ -8,6 +8,9 @@
 
 use Magento\Integration\Model\Oauth\Token;
 
+/**
+ * Test for Magento\Integration\Model\AdminTokenService class.
+ */
 class AdminTokenServiceTest extends \PHPUnit\Framework\TestCase
 {
     /** \Magento\Integration\Model\AdminTokenService */
@@ -99,10 +102,6 @@ public function testRevokeAdminAccessToken()
         $this->assertTrue($this->_tokenService->revokeAdminAccessToken($adminId));
     }
 
-    /**
-     * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage This user has no tokens.
-     */
     public function testRevokeAdminAccessTokenWithoutAdminId()
     {
         $this->_tokenModelCollectionMock->expects($this->once())

dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertAccessTokensErrorRevokeMessage.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\User\Test\Constraint;
+
+use Magento\User\Test\Page\Adminhtml\UserEdit;
+use Magento\Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Assert that success message appears after click on 'Force Sing-In' button.
+ */
+class AssertAccessTokensSuccessfullyRevoked extends AbstractConstraint
+{
+    /**
+     * User revoke tokens success message.
+     */
+    const SUCCESS_MESSAGE = 'You have revoked the user\'s tokens.';
+
+    /**
+     * Assert that success message appears after click on 'Force Sing-In' button.
+     *
+     * @param UserEdit $userEdit
+     * @return void
+     */
+    public function processAssert(UserEdit $userEdit): void
+    {
+        \PHPUnit\Framework\Assert::assertEquals(
+            self::SUCCESS_MESSAGE,
+            $userEdit->getMessagesBlock()->getSuccessMessage()
+        );
+    }
+
+    /**
+     * Return string representation of object
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return self::SUCCESS_MESSAGE . ' message is present on UserEdit page.';
+    }
+}

dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertAccessTokensSuccessfullyRevoked.php

@@ -9,7 +9,7 @@
     <testCase name="Magento\User\Test\TestCase\RevokeAllAccessTokensForAdminWithoutTokensTest" summary="Revoke All Access Tokens for Admin without Tokens" ticketId="MAGETWO-29675">
         <variation name="RevokeAllAccessTokensForAdminWithoutTokensTestVariation1">
             <data name="user/dataset" xsi:type="string">custom_admin</data>
-            <constraint name="Magento\User\Test\Constraint\AssertAccessTokensErrorRevokeMessage" />
+            <constraint name="Magento\User\Test\Constraint\AssertAccessTokensSuccessfullyRevoked" />
         </variation>
     </testCase>
 </config>

dev/tests/functional/tests/app/Magento/User/Test/TestCase/RevokeAllAccessTokensForAdminWithoutTokensTest.xml

@@ -89,10 +89,6 @@ public function testInvalidateTokenNoTokens()
         // invalidate token
         $this->getRequest()->setParam('user_id', $adminUserId);
         $this->dispatch('backend/admin/user/invalidateToken');
-        $this->assertSessionMessages(
-            $this->equalTo(['This user has no tokens.']),
-            MessageInterface::TYPE_ERROR
-        );
     }
 
     public function testInvalidateTokenNoUser()
@@ -110,9 +106,5 @@ public function testInvalidateTokenInvalidUser()
         // invalidate token
         $this->getRequest()->setParam('user_id', $adminUserId);
         $this->dispatch('backend/admin/user/invalidateToken');
-        $this->assertSessionMessages(
-            $this->equalTo(['This user has no tokens.']),
-            MessageInterface::TYPE_ERROR
-        );
     }
 }