UPDATE: configurable auth provider (#934)

* Configurable shop model

* Configurable shop model (factory & shopify app provider)

* Configurable shop model (revert middleware configuration)

* Update ShopFactory.php

* Configurable auth guard (necessary if custom shop model is used)

* Configurable auth guard: lint cleanup

Co-authored-by: Lucas Michot <lucas@semalead.com>

src/Http/Middleware/AuthProxy.php

@@ -82,6 +82,11 @@ public function handle(Request $request, Closure $next)
         // Login the shop
         $shop = $this->shopQuery->getByDomain($shop);
         if ($shop) {
+            // Override auth guard
+            if (($guard = Util::getShopifyConfig('shop_auth_guard'))) {
+                $this->auth->setDefaultDriver($guard);
+            }
+
             $this->auth->login($shop);
         }
 

src/Http/Middleware/VerifyShopify.php

@@ -248,6 +248,11 @@ protected function loginShopFromToken(SessionToken $token, NullableSessionId $se
             return false;
         }
 
+        // Override auth guard
+        if (($guard = Util::getShopifyConfig('shop_auth_guard'))) {
+            $this->auth->setDefaultDriver($guard);
+        }
+
         // All is well, login the shop
         $this->auth->login($shop);
 

src/ShopifyAppProvider.php

@@ -290,7 +290,7 @@ private function bootJobs(): void
      */
     private function bootObservers(): void
     {
-        $model = $this->app['config']->get('auth.providers.users.model');
+        $model = Util::getShopifyConfig('user_model');
         $model::observe($this->app->make(ShopObserver::class));
     }
 

src/Util.php

@@ -164,10 +164,10 @@ public static function registerPackageRoute(string $routeToCheck, $routesToExclu
      */
     public static function getShopifyConfig(string $key, $shop = null)
     {
-        $config = array_merge(
-            Config::get('shopify-app', []),
-            ['user_model' => Config::get('auth.providers.users.model')]
-        );
+        $config = Config::get('shopify-app', []);
+
+        $config['user_model'] = Config::get("auth.providers.{$config['shop_auth_provider']}.model", Config::get('auth.providers.users.model'));
+
 
         if (Str::is('route_names.*', $key)) {
             // scope the Arr::get() call to the "route_names" array

src/resources/config/shopify-app.php

@@ -65,6 +65,27 @@
         'webhook'              => env('SHOPIFY_ROUTE_NAME_WEBHOOK', 'webhook'),
     ],
 
+    /*
+    |--------------------------------------------------------------------------
+    | Shop auth guard
+    |--------------------------------------------------------------------------
+    |
+    | This option allows you to override auth guard used by package middlewares
+    |
+    */
+    'shop_auth_guard' => env('SHOPIFY_SHOP_AUTH_GUARD', null),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Shop auth provider
+    |--------------------------------------------------------------------------
+    |
+    | This option allows you to override package's build-in auth model
+    | If you need to keep User model intact, add custom auth provider and route middlewares for it
+    |
+    */
+    'shop_auth_provider' => env('SHOPIFY_SHOP_AUTH_PROVIDER', 'users'),
+
     /*
     |--------------------------------------------------------------------------
     | Namespace

src/resources/database/factories/ShopFactory.php

@@ -1,9 +1,9 @@
 <?php
 
 use Faker\Generator as Faker;
-use Illuminate\Support\Facades\Config;
+use Osiset\ShopifyApp\Util;
 
-$model = Config::get('auth.providers.users.model');
+$model = Util::getShopifyConfig('user_model');
 
 $factory->define($model, function (Faker $faker) {
     return [