Merge branch '1.0.0-develop' into fix-127

Author: lenaorobei

Securitytxt/Model/Config/Signature.php

@@ -3,18 +3,40 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\Securitytxt\Model\Config;
 
 use Magento\Config\Model\Config\CommentInterface;
+use Magento\Framework\Escaper;
 
 /**
  * Signature field description
  */
 class Signature implements CommentInterface
 {
+    /**
+     * @var string
+     */
+    private $instructionLink;
+
+    /**
+     * @var Escaper
+     */
+    private $escaper;
+
+    /**
+     * @param Escaper $escaper
+     * @param string $instructionLink
+     */
+    public function __construct(
+        Escaper $escaper,
+        string $instructionLink = ''
+    ) {
+        $this->escaper = $escaper;
+        $this->instructionLink = $instructionLink;
+    }
+
     /**
      * Get comment for signature field of security txt extension.
      *
@@ -24,8 +46,13 @@ class Signature implements CommentInterface
      */
     public function getCommentText($elementValue): string
     {
-        return "<a href='https://devdocs.magento.com/' target='_blank'>
-                    Read instructions on how to generate signature
-                </a>";
+        if ($this->instructionLink === '') {
+            return '';
+        }
+        return sprintf(
+            "<a href='%s' target='_blank'>%s</a>",
+            $this->escaper->escapeUrl($this->instructionLink),
+            __('Read instructions on how to generate signature')
+        );
     }
 }

Securitytxt/etc/di.xml

@@ -22,4 +22,11 @@
             <argument name="resultPageFactory" xsi:type="object">securitytxtResultPageFactory</argument>
         </arguments>
     </type>
-</config>
+    <type name="Magento\Securitytxt\Model\Config\Signature">
+        <arguments>
+            <argument name="instructionLink" xsi:type="string">
+                https://github.com/magento/security-package/blob/1.0-develop/Securitytxt/README.md
+            </argument>
+        </arguments>
+    </type>
+</config>

Securitytxt/i18n/en_US.csv

@@ -26,4 +26,5 @@ Hiring,Hiring
 "Example: https://example.com/jobs.html","Example: https://example.com/jobs.html"
 Policy,Policy
 "Example: https://example.com/security-policy.html","Example: https://example.com/security-policy.html"
-Signature,Signature
+Signature,Signature
+"Read instructions on how to generate signature","Read instructions on how to generate signature"

TwoFactorAuth/Api/AdminTokenServiceInterface.php

@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\TwoFactorAuth\Api;
+
+use Magento\Integration\Api\AdminTokenServiceInterface as OriginalTokenServiceInterface;
+
+/**
+ * Obtain basic information about the user required to setup or use 2fa
+ */
+interface AdminTokenServiceInterface extends OriginalTokenServiceInterface
+{
+
+}

TwoFactorAuth/Api/AuthyAuthenticateInterface.php

@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\TwoFactorAuth\Api;
+
+/**
+ * Represents the authy provider authentication
+ */
+interface AuthyAuthenticateInterface
+{
+    /**
+     * Get an admin token using authy 2fa
+     *
+     * @param string $username
+     * @param string $password
+     * @param string $otp
+     * @return string $otp
+     */
+    public function createAdminAccessTokenWithCredentials(
+        string $username,
+        string $password,
+        string $otp
+    ): string;
+
+    /**
+     * Send a one time password to a device using authy
+     *
+     * @param string $username
+     * @param string $password
+     * @param string $via
+     * @return void
+     */
+    public function sendToken(
+        string $username,
+        string $password,
+        string $via
+    ): void;
+
+    /**
+     * Authenticate using the present one touch response and get an admin token
+     *
+     * @param string $username
+     * @param string $password
+     * @return string
+     */
+    public function creatAdminAccessTokenWithOneTouch(
+        string $username,
+        string $password
+    ): string;
+}

TwoFactorAuth/Api/AuthyConfigureInterface.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\TwoFactorAuth\Api;
+
+use Magento\TwoFactorAuth\Api\Data\AuthyDeviceInterface;
+use Magento\TwoFactorAuth\Api\Data\AuthyRegistrationPromptResponseInterface as ResponseInterface;
+
+/**
+ * Represents the authy provider
+ */
+interface AuthyConfigureInterface
+{
+    /**
+     * Get the information required to configure google
+     *
+     * @param string $tfaToken
+     * @param AuthyDeviceInterface $deviceData
+     * @return \Magento\TwoFactorAuth\Api\Data\AuthyRegistrationPromptResponseInterface
+     */
+    public function sendDeviceRegistrationPrompt(
+        string $tfaToken,
+        AuthyDeviceInterface $deviceData
+    ): ResponseInterface;
+
+    /**
+     * Activate the provider and get an admin token
+     *
+     * @param string $tfaToken
+     * @param string $otp
+     * @return void
+     */
+    public function activate(string $tfaToken, string $otp): void;
+}

TwoFactorAuth/Api/CountryRepositoryInterface.php

@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TwoFactorAuth\Api;
+
+use Magento\Framework\Api\SearchCriteriaInterface;
+use Magento\Framework\Api\SearchResultsInterface;
+use Magento\TwoFactorAuth\Api\Data\CountryInterface;
+use Magento\TwoFactorAuth\Api\Data\CountrySearchResultsInterface;
+
+/**
+ * Countries repository
+ *
+ * @SuppressWarnings(PHPMD.ShortVariable)
+ */
+interface CountryRepositoryInterface
+{
+    /**
+     * Save object
+     *
+     * @param CountryInterface $object
+     * @return CountryInterface
+     */
+    public function save(CountryInterface $object): CountryInterface;
+
+    /**
+     * Get object by id
+     *
+     * @param int $id
+     * @return CountryInterface
+     */
+    public function getById(int $id): CountryInterface;
+
+    /**
+     * Get by Code value
+     *
+     * @param string $value
+     * @return CountryInterface
+     */
+    public function getByCode(string $value): CountryInterface;
+
+    /**
+     * Delete object
+     *
+     * @param CountryInterface $object
+     * @return void
+     */
+    public function delete(CountryInterface $object): void;
+
+    /**
+     * Get a list of object
+     *
+     * @param SearchCriteriaInterface $searchCriteria
+     * @return CountrySearchResultsInterface
+     */
+    public function getList(SearchCriteriaInterface $searchCriteria): SearchResultsInterface;
+}

TwoFactorAuth/Api/Data/AdminTokenResponseInterface.php

@@ -0,0 +1,96 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\TwoFactorAuth\Api\Data;
+
+use Magento\Framework\Api\ExtensibleDataInterface;
+
+/**
+ * Represents the response to the new admin token response
+ */
+interface AdminTokenResponseInterface extends ExtensibleDataInterface
+{
+    /**
+     * User id field
+     */
+    const USER_ID = 'user_id';
+
+    /**
+     * Message field
+     */
+    const MESSAGE = 'message';
+
+    /**
+     * Providers field
+     */
+    const ACTIVE_PROVIDERS = 'active_providers';
+
+    /**
+     * Get the id of the authenticated user
+     *
+     * @return string
+     */
+    public function getUserId(): string;
+
+    /**
+     * Set the id of the authenticated user
+     *
+     * @param int $value
+     * @return void
+     */
+    public function setUserId(int $value): void;
+
+    /**
+     * Get the message from the response
+     *
+     * @return string
+     */
+    public function getMessage(): string;
+
+    /**
+     * Set the id of the message
+     *
+     * @param string $value
+     * @return void
+     */
+    public function setMessage(string $value): void;
+
+    /**
+     * Get the providers
+     *
+     * @return \Magento\TwoFactorAuth\Api\ProviderInterface[]
+     */
+    public function getActiveProviders(): array;
+
+    /**
+     * Set the providers
+     *
+     * @param \Magento\TwoFactorAuth\Api\ProviderInterface[] $value
+     * @return void
+     */
+    public function setActiveProviders(array $value): void;
+
+    /**
+     * Retrieve existing extension attributes object or create a new one
+     *
+     * Used fully qualified namespaces in annotations for proper work of extension interface/class code generation
+     *
+     * @return \Magento\TwoFactorAuth\Api\Data\AdminTokenResponseExtensionInterface|null
+     */
+    public function getExtensionAttributes(): ?AdminTokenResponseExtensionInterface;
+
+    /**
+     * Set an extension attributes object
+     *
+     * @param \Magento\TwoFactorAuth\Api\Data\AdminTokenResponseExtensionInterface $extensionAttributes
+     * @return void
+     */
+    public function setExtensionAttributes(
+        AdminTokenResponseExtensionInterface $extensionAttributes
+    ): void;
+}