Merge remote-tracking branch 'origin/main'

.github/workflows/run-tests.yml

@@ -48,7 +48,6 @@ jobs:
 
       -   name: Install dependencies
           run: |
-              composer config repositories.laravel-settings vcs https://github.com/Javaabu/laravel-settings.git
               composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:${{ matrix.carbon }}" --no-interaction --no-update
               composer update --${{ matrix.stability }} --prefer-dist --no-interaction
 

src/HelpersServiceProvider.php

@@ -8,6 +8,7 @@
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\ServiceProvider;
+use Javaabu\Helpers\Http\Middleware\AllowOnlySpecificUserType;
 use Javaabu\Helpers\Http\Middleware\JsonOnly;
 
 class HelpersServiceProvider extends ServiceProvider
@@ -217,5 +218,6 @@ public function register()
     public function registerMiddlewareAliases(): void
     {
         app('router')->aliasMiddleware('json', JsonOnly::class);
+        app('router')->aliasMiddleware('only', AllowOnlySpecificUserType::class);
     }
 }

src/Http/Middleware/AllowOnlySpecificUserType.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace Javaabu\Helpers\Http\Middleware;
+
+use Closure;
+use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Database\Eloquent\Model;
+
+class AllowOnlySpecificUserType
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @param  \Closure $next
+     * @param  string|null $authenticable
+     * @return mixed
+     * @throws AuthorizationException
+     */
+    public function handle($request, Closure $next, $authenticable = 'user')
+    {
+        $authenticable_class = Model::getActualClassNameForMorph($authenticable);
+
+        if (auth()->user() instanceof $authenticable_class) {
+            return $next($request);
+        }
+
+        if (expects_json($request)) {
+            throw new AuthorizationException('Disallowed user type');
+        } else {
+            $url = with(new $authenticable_class)->loginUrl();
+            return redirect()->to($url);
+        }
+    }
+
+}

src/Testing/TestCase.php

@@ -335,14 +335,18 @@ public function jsonApi($method, $uri, array $data = [], string $access_cookie =
      * @param mixed $email
      * @param array $scopes
      */
-    protected function actingAsApiUser($email, $scopes = ['read', 'write'])
+    protected function actingAsApiUser($email, $scopes = ['read', 'write'], $guard = null)
     {
         $this->seedDatabase();
 
         //find the user
         $user = is_object($email) ? $email : $this->getActiveAdminUser($email);
 
-        Passport::actingAs($user, $scopes);
+        if (! $guard) {
+            $guard = $user instanceof User ? 'api_admin' : 'api_' . ($user->getMorphClass());
+        }
+
+        Passport::actingAs($user, $scopes, $guard);
     }
 
     /**