move fortify stuff to blog

resources/tailwind.config.js

@@ -227,7 +227,6 @@ module.exports = {
     content: [
         "./resources/views/**/*.blade.php",
         "./vendor/arkecosystem/foundation/resources/views/**/*.blade.php",
-        "./vendor/arkecosystem/fortify/resources/views/**/*.blade.php",
         "./vendor/arkecosystem/hermes/resources/views/**/*.blade.php",
         "./resources/js/**/*.js",
         "./resources/js/**/*.vue",

src/Blog/Components/Concerns/InteractsWithUser.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ARKEcosystem\Foundation\Blog\Components\Concerns;
+
+use Illuminate\Contracts\Auth\Authenticatable;
+use Illuminate\Support\Facades\Auth;
+
+/**
+ * @property ?Authenticatable $user
+ */
+trait InteractsWithUser
+{
+    public function getUserProperty(): ?Authenticatable
+    {
+        return Auth::user();
+    }
+}

src/Blog/Contracts/UserRole.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ARKEcosystem\Foundation\Blog\Contracts;
+
+interface UserRole
+{
+    public static function toArray(): array;
+}

src/Blog/Http/Middleware/EnforceTwoFactorAuthentication.php

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ARKEcosystem\Foundation\Blog\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+
+final class EnforceTwoFactorAuthentication
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param Request     $request
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        $user = $request->user();
+
+        if (config('web.2fa_enabled') === false) {
+            return $next($request);
+        }
+
+        if ($user === null) {
+            return $next($request);
+        }
+
+        if ($user->two_factor_secret) {
+            return $next($request);
+        }
+
+        return redirect()->route('kiosk');
+    }
+}

src/Blog/Models/Concerns/HasLocalizedTimestamps.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ARKEcosystem\Foundation\Blog\Models\Concerns;
+
+use Carbon\Carbon;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Config;
+
+trait HasLocalizedTimestamps
+{
+    public function getCreatedAtLocalAttribute(): Carbon
+    {
+        $timezone = Auth::check() ? Auth::user()->timezone : Config::get('app.timezone');
+
+        return Carbon::parse($this->created_at)->timezone($timezone);
+    }
+
+    public function getUpdatedAtLocalAttribute(): Carbon
+    {
+        $timezone = Auth::check() ? Auth::user()->timezone : Config::get('app.timezone');
+
+        return Carbon::parse($this->updated_at)->timezone($timezone);
+    }
+}

src/Blog/Models/User.php

@@ -4,24 +4,49 @@
 
 namespace ARKEcosystem\Foundation\Blog\Models;
 
+use ARKEcosystem\Foundation\Blog\Models\Concerns\HasLocalizedTimestamps;
 use ARKEcosystem\Foundation\Blog\Models\Factories\UserFactory;
-use ARKEcosystem\Foundation\Fortify\Models\User as BaseUser;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
+use Illuminate\Support\Str;
+use Laravel\Fortify\TwoFactorAuthenticatable;
 use Spatie\MediaLibrary\HasMedia;
 use Spatie\MediaLibrary\InteractsWithMedia;
+use Spatie\PersonalDataExport\PersonalDataSelection;
 use Spatie\Sluggable\HasSlug;
 use Spatie\Sluggable\SlugOptions;
 
-class User extends BaseUser implements HasMedia
+class User extends Authenticatable implements HasMedia
 {
     use HasSlug;
     use HasFactory;
+    use HasLocalizedTimestamps;
     use Notifiable;
     use InteractsWithMedia;
     use SoftDeletes;
+    use TwoFactorAuthenticatable;
+
+    /**
+     * The attributes that aren't mass assignable.
+     *
+     * @var array|bool
+     */
+    protected $guarded = false;
+
+    /**
+     * The attributes that should be hidden for arrays.
+     *
+     * @var array
+     */
+    protected $hidden = [
+        'password',
+        'remember_token',
+        'two_factor_recovery_codes',
+        'two_factor_secret',
+    ];
 
     /**
      * The attributes that should be cast to native types.
@@ -60,6 +85,25 @@ public function registerMediaCollections() : void
         $this->addMediaCollection('photo')->singleFile();
     }
 
+    /**
+     * @codeCoverageIgnore
+     */
+    public function selectPersonalData(PersonalDataSelection $personalData): void
+    {
+        $personalData->add('user.json', [
+            'name'  => $this->name,
+            'email' => $this->email,
+        ]);
+    }
+
+    /**
+     * @codeCoverageIgnore
+     */
+    public function personalDataExportName(): string
+    {
+        return 'personal-data-'.Str::slug($this->name).'.zip';
+    }
+
     /**
      * Create a new factory instance for the model.
      *

src/Hermes/Components/ManageNotifications.php

@@ -4,7 +4,7 @@
 
 namespace ARKEcosystem\Foundation\Hermes\Components;
 
-use ARKEcosystem\Foundation\Fortify\Components\Concerns\InteractsWithUser;
+use ARKEcosystem\Foundation\Blog\Components\Concerns\InteractsWithUser;
 use ARKEcosystem\Foundation\Hermes\Enums\NotificationFilterEnum;
 use Illuminate\Contracts\View\View;
 use Illuminate\Notifications\DatabaseNotification;

src/Hermes/Models/DatabaseNotification.php

@@ -4,7 +4,7 @@
 
 namespace ARKEcosystem\Foundation\Hermes\Models;
 
-use ARKEcosystem\Foundation\Fortify\Models\Concerns\HasLocalizedTimestamps;
+use ARKEcosystem\Foundation\Blog\Models\Concerns\HasLocalizedTimestamps;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Notifications\DatabaseNotification as BaseNotification;

tests/Blog/TestCase.php

@@ -5,7 +5,7 @@
 namespace Tests\Blog;
 
 use ARKEcosystem\Foundation\Blog\Enums\Category;
-use ARKEcosystem\Foundation\Fortify\Http\Middleware\EnforceTwoFactorAuthentication;
+use ARKEcosystem\Foundation\Blog\Http\Middleware\EnforceTwoFactorAuthentication;
 use ARKEcosystem\Foundation\Providers\BlogServiceProvider;
 use ARKEcosystem\Foundation\Providers\MarkdownServiceProvider;
 use ARKEcosystem\Foundation\Providers\UserInterfaceServiceProvider;

tests/Helpers.php

@@ -4,7 +4,7 @@
 
 namespace Tests;
 
-use ARKEcosystem\Foundation\Fortify\Models\User;
+use ARKEcosystem\Foundation\Blog\Models\User;
 use Carbon\Carbon;
 use Closure;
 use Illuminate\Support\Facades\DB;

tests/Pest.php

@@ -11,7 +11,6 @@
     'CommonMark',
     'DataBags',
     'Documentation',
-    'Fortify',
     'NumberFormatter',
     'Rules',
     'Support',

tests/Rules/UniqueCaseInsensitiveTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use ARKEcosystem\Foundation\Fortify\Models\User;
+use ARKEcosystem\Foundation\Blog\Models\User;
 use ARKEcosystem\Foundation\Rules\UniqueCaseInsensitive;
 
 beforeEach(function (): void {

tests/TestCase.php

@@ -4,16 +4,14 @@
 
 namespace Tests;
 
-use ARKEcosystem\Foundation\Providers\CommonMarkServiceProvider;
-use ARKEcosystem\Foundation\Providers\FortifyServiceProvider;
 use ARKEcosystem\Foundation\Providers\HermesServiceProvider;
 use ARKEcosystem\Foundation\Providers\MarkdownServiceProvider;
 use ARKEcosystem\Foundation\Providers\RulesServiceProvider;
 use ARKEcosystem\Foundation\Providers\UserInterfaceServiceProvider;
 use Illuminate\Foundation\Testing\Concerns\InteractsWithViews;
 use Illuminate\Support\Facades\View;
 use Illuminate\Testing\TestView;
-use Laravel\Fortify\FortifyServiceProvider as LaravelFortifyServiceProvider;
+use Laravel\Fortify\FortifyServiceProvider;
 use Livewire\LivewireServiceProvider;
 use Orchestra\Testbench\TestCase as Orchestra;
 use Spatie\Honeypot\HoneypotServiceProvider;
@@ -67,12 +65,11 @@ protected function getPackageProviders($app)
     {
         return [
             // Third-Party
-            LaravelFortifyServiceProvider::class,
+            FortifyServiceProvider::class,
             MarkdownServiceProvider::class,
             LivewireServiceProvider::class,
             HoneypotServiceProvider::class,
             // First-Party
-            FortifyServiceProvider::class,
             HermesServiceProvider::class,
             NewsletterServiceProvider::class,
             RulesServiceProvider::class,