Merge remote-tracking branch 'origin/email-verification'

# Conflicts:
#	composer.lock
#	public/mix-manifest.json
#	tests/TestCase.php

tests/Feature/Accounts/AuthTest.php

@@ -5,6 +5,7 @@ namespace Tests\Feature\Accounts;
 use App\Models\Setting;
 use App\Models\User;
 use App\Notifications\ResetPassword;
+use Illuminate\Auth\Notifications\VerifyEmail;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Illuminate\Support\Facades\Password;
 use Laravel\Sanctum\Sanctum;
@@ -42,6 +43,8 @@ class AuthTest extends TestCase
      */
     public function it_register_user()
     {
+        Notification::fake();
+
         collect([
             [
                 'name'  => 'storage_default',
@@ -51,6 +54,10 @@ class AuthTest extends TestCase
                 'name'  => 'registration',
                 'value' => 1,
             ],
+            [
+                'name'  => 'user_verification',
+                'value' => 1,
+            ]
         ])->each(function ($setting) {
             Setting::create([
                 'name'  => $setting['name'],
@@ -58,7 +65,7 @@ class AuthTest extends TestCase
             ]);
         });
 
-        $this->postJson('/register', [
+        $this->postJson('api/register', [
             'email'                 => 'john@doe.com',
             'password'              => 'SecretPassword',
             'password_confirmation' => 'SecretPassword',
@@ -67,6 +74,7 @@ class AuthTest extends TestCase
 
         $this->assertDatabaseHas('users', [
             'email' => 'john@doe.com',
+            'email_verified_at' => null,
         ]);
 
         $this->assertDatabaseHas('user_settings', [
@@ -76,6 +84,8 @@ class AuthTest extends TestCase
 
         Storage::disk('local')
             ->assertExists('files/' . User::first()->id);
+
+        Notification::assertTimesSent(1, VerifyEmail::class);
     }
 
     /**

tests/Feature/Accounts/UserAccountTest.php

@@ -6,11 +6,15 @@ use App\Models\User;
 use App\Services\SetupService;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Auth\Notifications\VerifyEmail;
 use Illuminate\Foundation\Testing\WithFaker;
 use Illuminate\Http\UploadedFile;
 use Laravel\Sanctum\Sanctum;
 use Storage;
+use Notification;
 use Tests\TestCase;
+use App\Models\Folder;
+use Illuminate\Support\Facades\URL;
 
 class UserAccountTest extends TestCase
 {
@@ -151,4 +155,154 @@ class UserAccountTest extends TestCase
                 ],
             ]);
     }
+
+     /**
+     * @test
+     */
+    public function it_create_user_token()
+    {
+        $user = User::factory(User::class)
+            ->create();
+
+        Sanctum::actingAs($user);
+
+        $this->postJson('/api/user/token/create', [
+            'name' => 'token'
+        ])->assertStatus(201);
+
+        $this->assertDatabaseHas('personal_access_tokens', [
+            'tokenable_id' => $user->id,
+            'name' => 'token'
+        ]);
+    }
+
+     /**
+     * @test
+     */
+    public function it_revoke_user_token()
+    {
+        $user = User::factory(User::class)
+            ->create();
+
+        Sanctum::actingAs($user);
+            
+        $user->createToken('token');
+
+        $token_id = $user->tokens()->first()->id;
+
+        $this->deleteJson("/api/user/token/revoke/$token_id")
+            ->assertStatus(204);
+
+        $this->assertDatabaseMissing('personal_access_tokens', [
+            'id' => $token_id
+        ]);
+    }
+
+    /**
+     * @test
+     */
+    public function it_get_user_tokens()
+    {
+        $user = User::factory(User::class)
+            ->create();
+
+        Sanctum::actingAs($user);
+
+        $user->createToken('token');
+
+        $token = $user->tokens()->first();
+
+        $this->getJson('/api/user/tokens')
+            ->assertStatus(200)
+            ->assertJsonFragment([
+                "id"             => $token->id,        
+                "tokenable_type" => $token->tokenable_type,  
+                "tokenable_id"   => $user->id,     
+                "name"           => $token->name,
+                "abilities"      => $token->abilities
+            ]);
+    }
+
+    /**
+     * @test
+     */
+    public function it_use_user_token_to_request()
+    {
+        $user = User::factory(User::class)
+            ->create();
+        
+        $folder = Folder::factory(Folder::class)
+            ->create([
+                'user_id' => $user->id,
+            ]);
+        
+        $token = $user->createToken('token')->plainTextToken;
+
+        $this->assertDatabaseHas('personal_access_tokens', [
+            'tokenable_id' => $user->id
+        ]);
+
+        $this->assertDatabaseHas('folders', [
+            'id' => $folder->id,
+            'user_id' => $user->id
+        ]);
+
+        $response = $this->call('GET', "api/browse/folders/$folder->id", 
+            [], [], [], [
+                'Content-type' => 'application/json',
+                'Accept' => 'application/json',
+                'Authorization' => 'Bearer ' .$token,    
+            ]);
+
+    
+        // $response->assertJsonFragment([
+        //     'id' => $folder->id,
+        //     'user_id' => $user->id,
+        // ]);
+
+        // dd($response);
+    }
+
+    /**
+     * @test
+     */
+    public function it_verify_user_email()
+    {
+        $user = User::factory(User::class)
+            ->create([
+                'email_verified_at' => null
+            ]);
+
+        $verificationUrl = URL::temporarySignedRoute(
+            'verification.verify',
+            now()->addMinutes(60),
+            ['id' => $user->id, 'hash' => sha1($user->email)]
+        );
+        
+        $this
+            ->getJson($verificationUrl)
+            ->assertRedirect('successfully-verified');
+
+        $this->assertNotNull(User::find($user->id)->get('email_verified_at'));
+    }
+
+    /**
+     * @test
+     */
+    public function it_resend_user_verify_email()
+    {
+        Notification::fake();
+        
+        $user = User::factory(User::class)
+            ->create([
+                'email_verified_at' => null
+            ]);
+                  
+        $this->postJson('/api/user/email/resend/verify', [
+                'email' => $user->email,
+            ])
+            ->assertStatus(200);
+        
+        Notification::assertTimesSent(1, VerifyEmail::class);
+    }
 }

tests/Feature/Admin/AdminTest.php

@@ -308,6 +308,9 @@ class AdminTest extends TestCase
             'email' => 'john@doe.com'
         ]);
 
+        $this->assertNotNull(User::whereEmail('john@doe.com')
+            ->get('email_verified_at'));
+
         $this->assertDatabaseHas('user_settings', [
             'name' => 'John Doe'
         ]);

tests/Feature/App/SchedulerTest.php

@@ -2,12 +2,11 @@
 
 namespace Tests\Feature\App;
 
-use App\Models\File;
 use App\Models\Share;
+use App\Models\User;
 use App\Models\Zip;
 use App\Services\SchedulerService;
 use App\Services\SetupService;
-use Carbon\Carbon;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Illuminate\Http\UploadedFile;
 use Storage;
@@ -20,8 +19,8 @@ class SchedulerTest extends TestCase
     public function __construct()
     {
         parent::__construct();
-        $this->setup = app()->make(SetupService::class);
-        $this->scheduler = app()->make(SchedulerService::class);
+        $this->setup = resolve(SetupService::class);
+        $this->scheduler = resolve(SchedulerService::class);
     }
 
     /**
@@ -99,4 +98,42 @@ class SchedulerTest extends TestCase
             });
 
     }
+
+    /**
+     * @test
+     */
+    public function it_delete_non_verified_users_after_30_days()
+    {
+        $expiredUser = User::factory(User::class)
+            ->create([
+                'email_verified_at' => null,
+                'created_at'        => now()->subDays(31)
+            ]);
+
+        $nonExpiredUser = User::factory(User::class)
+            ->create([
+                'email_verified_at' => null,
+                'created_at'        => now()->subDays(14)
+            ]);
+
+        $verifiedUser = User::factory(User::class)
+            ->create([
+                'email_verified_at' => now()->subDays(15),
+                'created_at'        => now()->subDays(31)
+            ]);
+
+        $this->scheduler->delete_unverified_users();
+
+        $this->assertDatabaseMissing('users', [
+            'id' => $expiredUser->id,
+        ]);
+
+        $this->assertDatabaseHas('users', [
+            'id' => $nonExpiredUser->id,
+        ]);
+
+        $this->assertDatabaseHas('users', [
+            'id' => $verifiedUser->id,
+        ]);
+    }
 }

tests/TestCase.php

@@ -2,7 +2,9 @@
 
 namespace Tests;
 
+use Carbon\Carbon;
 use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
+use Illuminate\Support\Facades\Notification;
 
 abstract class TestCase extends BaseTestCase
 {
@@ -11,5 +13,11 @@ abstract class TestCase extends BaseTestCase
     public function setUp(): void
     {
         parent::setUp();
+
+        Carbon::setTestNow('1. January 2021');
+
+        Notification::fake();
+
+        $this->withoutExceptionHandling();
     }
 }