Merge pull request #112 from RonasIT/167-implement-base-resource-class

#167: Implement BaseResource class in helpers

Author: DenTray

app/Http/Resources/BaseJsonResource.php

@@ -2,9 +2,8 @@
 
 namespace App\Http\Resources;
 
-use Illuminate\Http\Resources\Json\JsonResource;
+use RonasIT\Support\BaseResource;
 
-class BaseJsonResource extends JsonResource
+class BaseJsonResource extends BaseResource
 {
-    public static $wrap = null;
 }

composer.lock

@@ -102,7 +102,7 @@ public function testLoginAsAuthorizedUser()
 
     public function testRegisterAuthorizedUser()
     {
-        $this->mockBcryptHasher();
+        $this->mockBcryptHasher('666999');
 
         $data = $this->getJsonFixture('new_user.json');
 
@@ -115,7 +115,7 @@ public function testRegisterAuthorizedUser()
 
     public function testRegisterFromGuestUser()
     {
-        $this->mockBcryptHasher();
+        $this->mockBcryptHasher('666999');
 
         $data = $this->getJsonFixture('new_user.json');
 
@@ -290,7 +290,7 @@ public function testForgotPasswordThrottled()
 
     public function testRestorePassword()
     {
-        $this->mockBcryptHasher();
+        $this->mockBcryptHasher('new_password');
 
         $data = $this->getJsonFixture('restore_password.json');
 

tests/AuthTest.php

@@ -3,6 +3,7 @@
 namespace App\Tests\Support;
 
 use App\Services\UserService;
+use Illuminate\Support\Str;
 use RonasIT\Support\Traits\MockTrait;
 
 trait AuthTestTrait
@@ -11,19 +12,25 @@ trait AuthTestTrait
 
     public function mockOpensslRandomPseudoBytes(): void
     {
+        config(['app.key' => 'some_app_key']);
+
+        Str::createRandomStringsUsing(fn () => 'value');
+
         $this->mockNativeFunction('Illuminate\Auth\Passwords', [
             $this->functionCall(
                 name: 'hash_hmac',
-                result: '5qw6rdsyd4sa65d4zxfc65ds4fc',
+                arguments: ['sha256', 'value', 'some_app_key'],
+                result: 'some_reset_password_token',
             ),
         ]);
     }
 
-    public function mockBcryptHasher(): void
+    public function mockBcryptHasher(string $password): void
     {
         $this->mockNativeFunction('Illuminate\Hashing', [
             $this->functionCall(
                 name: 'password_hash',
+                arguments: [$password, PASSWORD_DEFAULT, ['cost' => 12]],
                 result: '$2y$12$p9Bub8AaSl7EHfoGMgaXReK7Cs50kjHswxzNPTB5B4mcoRWfHnv7u',
             ),
         ]);

tests/Support/AuthTestTrait.php

@@ -28,7 +28,7 @@ public function setUp(): void
 
     public function testCreate()
     {
-        $this->mockBcryptHasher();
+        $this->mockBcryptHasher('123123');
 
         $data = $this->getJsonFixture('create_user.json');
 

tests/UserTest.php

@@ -61,7 +61,7 @@ <h1 style="font-family: Avenir, Helvetica, sans-serif; box-sizing: border-box; c
                                                style="font-family: Avenir, Helvetica, sans-serif; box-sizing: border-box;">
                                             <tr>
                                                 <td style="font-family: Avenir, Helvetica, sans-serif; box-sizing: border-box;">
-                                                    <a href="http://localhost/enter-new-password/5qw6rdsyd4sa65d4zxfc65ds4fc"
+                                                    <a href="http://localhost/enter-new-password/some_reset_password_token"
                                                        class="button button-blue" target="_blank"
                                                        style="font-family: Avenir, Helvetica, sans-serif; box-sizing: border-box; border-radius: 3px; box-shadow: 0 2px 3px rgba(0, 0, 0, 0.16); color: #FFF; display: inline-block; text-decoration: none; -webkit-text-size-adjust: none; background-color: #3097D1; border-top: 10px solid #3097D1; border-right: 18px solid #3097D1; border-bottom: 10px solid #3097D1; border-left: 18px solid #3097D1;">Reset
                                                         Password</a>
@@ -85,8 +85,8 @@ <h1 style="font-family: Avenir, Helvetica, sans-serif; box-sizing: border-box; c
                             <p style="font-family: Avenir, Helvetica, sans-serif; box-sizing: border-box; color: #74787E; line-height: 1.5em; margin-top: 0; text-align: left; font-size: 12px;">
                                 If you’re having trouble clicking the "Reset Password" button, copy and paste the URL
                                 below into your web browser:
-                                <a href="http://localhost/enter-new-password/5qw6rdsyd4sa65d4zxfc65ds4fc" style="font-family: Avenir, Helvetica, sans-serif; box-sizing: border-box; color: #3869D4;">
-                                    http://localhost/enter-new-password/5qw6rdsyd4sa65d4zxfc65ds4fc
+                                <a href="http://localhost/enter-new-password/some_reset_password_token" style="font-family: Avenir, Helvetica, sans-serif; box-sizing: border-box; color: #3869D4;">
+                                    http://localhost/enter-new-password/some_reset_password_token
                                 </a>
                             </p>
                         </td>