Merge pull request #99 from silinternational/develop

Release 2.1.3
silinternational · Dec 14, 2017 · 4de5ee0 · 4de5ee0
2 parents 476d3d6 + 36c8f9d
commit 4de5ee0
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 82 deletions.
diff --git a/application/common/models/Reset.php b/application/common/models/Reset.php
@@ -556,10 +556,10 @@ public function setType($type, $methodUid = null)
             throw new BadRequestHttpException('Unknown reset type requested', 1462989489);
         }
 
-        /*
-         * Generate new verification code
-         */
-        $this->code = Utils::getRandomDigits(\Yii::$app->params['reset']['codeLength']);
+        // NOTE: We stopped changing the code here so that, if someone requests
+        // a subsequent reset while an existing one is not yet expired, the same
+        // code will be used. That way, clicking the link in the first email
+        // will still work.
 
         /*
          * Save changes

diff --git a/application/composer.lock b/application/composer.lock
diff --git a/application/tests/_support/_generated/ApiTesterActions.php b/application/tests/_support/_generated/ApiTesterActions.php
@@ -1,14 +1,10 @@
-<?php  //[STAMP] bca877e1309147c04002b65821624fed
+<?php  //[STAMP] 5ec1759ef9caafbbd5cc955a624687f7
 namespace _generated;
 
 // This class was automatically generated by build task
 // You should not change it manually as it will be overwritten on next build
 // @codingStandardsIgnoreFile
 
-use Codeception\Module\ApiHelper;
-use tests\api\FixtureHelper;
-use Codeception\Module\REST;
-
 trait ApiTesterActions
 {
     /**
@@ -280,6 +276,37 @@ public function amNTLMAuthenticated($username, $password) {
     }
 
 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Allows to send REST request using AWS Authorization
+     * Only works with PhpBrowser
+     * Example
+     * Config -
+     *
+     * modules:
+     *      enabled:
+     *          - REST:
+     *              aws:
+     *                  key: accessKey
+     *                  secret: accessSecret
+     *                  service: awsService
+     *                  region: awsRegion
+     *
+     * ```php
+     * <?php
+     * $I->amAWSAuthenticated();
+     * ?>
+     * ```
+     * @param array $additionalAWSConfig
+     * @throws ModuleException
+     * @see \Codeception\Module\REST::amAWSAuthenticated()
+     */
+    public function amAWSAuthenticated($additionalAWSConfig = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amAWSAuthenticated', func_get_args()));
+    }
+
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *

diff --git a/application/tests/_support/_generated/UnitTesterActions.php b/application/tests/_support/_generated/UnitTesterActions.php
@@ -1,13 +1,10 @@
-<?php  //[STAMP] 80ce94e9efbbf283f3835876b1f4a99a
+<?php  //[STAMP] 824eb518b44c5d969a137840e3e7ba17
 namespace _generated;
 
 // This class was automatically generated by build task
 // You should not change it manually as it will be overwritten on next build
 // @codingStandardsIgnoreFile
 
-use Codeception\Module\Asserts;
-use Codeception\Module\UnitHelper;
-
 trait UnitTesterActions
 {
     /**