Moved Authenication Exception to data()

Author: JamesFreeman

src/Oauth2CredentialManagers/AuthenticatedUserStore.php

@@ -3,21 +3,33 @@
 namespace Webfox\Xero\Oauth2CredentialManagers;
 
 use Illuminate\Support\Facades\Auth;
+use Webfox\Xero\Exceptions\XeroCredentialsNotFound;
 use Webfox\Xero\Exceptions\XeroUserNotAuthenticated;
+use Webfox\Xero\Xero;
 
 class AuthenticatedUserStore extends ModelStore
 {
+    public function __construct()
+    {
+        $auth = Auth::guard(Xero::getDefaultAuthGuard());
+
+        parent::__construct();
+
+        if($auth->check()) {
+            $this->model = $auth->user();
+        }
+    }
+
     /**
      * @throws XeroUserNotAuthenticated
+     * @throws XeroCredentialsNotFound
      */
-    public function __construct()
+    public function data(string $key = null)
     {
-        if (! Auth::check()) {
+        if (! Auth::guard(Xero::getDefaultAuthGuard())->check()) {
             throw XeroUserNotAuthenticated::make();
         }
 
-        parent::__construct();
-
-        $this->model = Auth::user();
+        return parent::data($key);
     }
 }

src/Oauth2CredentialManagers/BaseCredentialManager.php

@@ -3,6 +3,7 @@
 namespace Webfox\Xero\Oauth2CredentialManagers;
 
 use Illuminate\Session\Store;
+use League\OAuth2\Client\Token\AccessTokenInterface;
 use Webfox\Xero\Exceptions\XeroTenantNotFound;
 use Webfox\Xero\Oauth2Provider;
 use XeroAPI\XeroPHP\JWTClaims;
@@ -18,6 +19,10 @@ public function __construct()
         $this->oauthProvider = app(Oauth2Provider::class);
     }
 
+    abstract public function exists(): bool;
+
+    abstract protected function store(AccessTokenInterface $token, array $tenants = null): void;
+
     abstract protected function data(string $key = null);
 
     public function getAccessToken(): string

src/Oauth2CredentialManagers/ModelStore.php

@@ -14,14 +14,16 @@ class ModelStore extends BaseCredentialManager implements OauthCredentialManager
 
     public function __construct()
     {
-        $this->model = Xero::getModelStorage();
+        if ($model = Xero::getModelStorage()) {
+            $this->model = $model;
+        }
 
         parent::__construct();
     }
 
     public function exists(): bool
     {
-        return $this->model?->exists && is_array($this->model->{$this->getModelKey()});
+        return isset($this->model) && $this->model->exists && is_array($this->model->{$this->getModelKey()});
     }
 
     public function store(AccessTokenInterface $token, array $tenants = null): void

src/Xero.php

@@ -6,10 +6,12 @@
 
 class Xero
 {
-    public static Model $modelStorage;
+    public static ?Model $modelStorage = null;
 
     public static string $modelAttribute = 'xero_credentials';
 
+    public static string $defaultAuthGuard = 'web';
+
     public static function useModelStorage(Model $model): void
     {
         static::$modelStorage = $model;
@@ -20,7 +22,7 @@ public static function useAttributeOnModelStore(string $attribute): void
         static::$modelAttribute = $attribute;
     }
 
-    public static function getModelStorage(): Model
+    public static function getModelStorage(): ?Model
     {
         return static::$modelStorage;
     }
@@ -29,4 +31,15 @@ public static function getModelAttribute(): string
     {
         return static::$modelAttribute;
     }
+
+
+    public static function getDefaultAuthGuard(): string
+    {
+        return static::$defaultAuthGuard;
+    }
+
+    public static function setDefaultAuthGuard(string $guard): void
+    {
+        static::$defaultAuthGuard = $guard;
+    }
 }

tests/Unit/CredentialManagersTest.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Cache\Repository;
 use Illuminate\Foundation\Auth\User as Authenticatable;
+use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Session;
 use Illuminate\Support\Facades\Storage;
 use Mockery\MockInterface;
@@ -25,6 +26,15 @@
 
 class CredentialManagersTest extends TestCase
 {
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Xero::$modelStorage = null;
+        Xero::$modelAttribute = 'xero_credentials';
+        Xero::$defaultAuthGuard = 'web';
+    }
+
     #[DataProvider('credentialManagers')]
     public function test_you_can_get_credential_store_without_existing_data($sutClass, $setupFunction, $createExistingData)
     {
@@ -195,11 +205,6 @@ public function test_that_getting_a_non_existent_tenant_will_throw_an_exception(
         $this->assertThrows(fn () => $sut->getTenantId(1), XeroTenantNotFound::class, 'No such tenant exists');
     }
 
-    public function test_that_if_guest_it_will_throw_exception_for_authenticated_user_store()
-    {
-        $this->assertThrows(fn () => new AuthenticatedUserStore(), XeroUserNotAuthenticated::class, 'User is not authenticated');
-    }
-
     public function test_that_it_will_throw_exception_if_failed_to_write_file()
     {
         Storage::fake();
@@ -211,6 +216,42 @@ public function test_that_it_will_throw_exception_if_failed_to_write_file()
         $this->assertThrows(fn () => $sut->store(new MockAccessToken(), ['tenant' => 'tenant_id', 'expires' => 3600]), XeroFailedToWriteFile::class, 'Failed to write file: xero.json');
     }
 
+    public function test_that_it_will_throw_exception_if_not_authenticated()
+    {
+        $this->assertGuest();
+
+        $sut = new AuthenticatedUserStore();
+
+        $this->assertThrows(fn () => $sut->data(), XeroUserNotAuthenticated::class, 'User is not authenticated');
+        $this->assertThrows(fn () => $sut->getAccessToken(), XeroUserNotAuthenticated::class, 'User is not authenticated');
+        $this->assertThrows(fn () => $sut->getRefreshToken(), XeroUserNotAuthenticated::class, 'User is not authenticated');
+        $this->assertThrows(fn () => $sut->getTenants(), XeroUserNotAuthenticated::class, 'User is not authenticated');
+        $this->assertThrows(fn () => $sut->getTenantId(), XeroUserNotAuthenticated::class, 'User is not authenticated');
+        $this->assertThrows(fn () => $sut->getExpires(), XeroUserNotAuthenticated::class, 'User is not authenticated');
+        $this->assertThrows(fn () => $sut->getData(), XeroUserNotAuthenticated::class, 'User is not authenticated');
+        $this->assertFalse($sut->exists());
+        $this->assertThrows(fn () => $sut->isExpired(), XeroUserNotAuthenticated::class, 'User is not authenticated');
+        $this->assertNull($sut->getUser());
+    }
+
+    public function test_that_you_can_change_the_default_guard_for_users()
+    {
+        Config::set('auth.guards', array_merge(config('auth.guards'), [
+            'admin' => [
+                'driver' => 'session',
+                'provider' => 'users',
+            ],
+        ]));
+
+        auth()->guard('admin')->login(User::create(['xero_credentials' => ['token' => 'foo']]));
+
+        $this->assertThrows(fn () => (new AuthenticatedUserStore())->data(), XeroUserNotAuthenticated::class, 'User is not authenticated');
+
+        Xero::setDefaultAuthGuard('admin');
+
+        $this->assertIsArray((new AuthenticatedUserStore())->data());
+    }
+
     public static function credentialManagers(): array
     {
         return [
@@ -253,6 +294,10 @@ public static function credentialManagers(): array
 
 class User extends Authenticatable
 {
+    protected $casts = [
+        'xero_credentials' => 'array',
+    ];
+
     protected function casts()
     {
         return [