From f4c6bcade1429c874df1d2f023cbebe6e035353d Mon Sep 17 00:00:00 2001
From: saeid <saeidkhakbazan@gmail.com>
Date: Sun, 21 Jan 2024 17:16:26 +0330
Subject: [PATCH] gix

---
 src/Http/Controllers/Test/Test.php  |  4 ++--
 src/SubscriptionServiceProvider.php | 19 +++++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/Http/Controllers/Test/Test.php b/src/Http/Controllers/Test/Test.php
index bd0fb91..32d70a2 100644
--- a/src/Http/Controllers/Test/Test.php
+++ b/src/Http/Controllers/Test/Test.php
@@ -2,7 +2,6 @@
 
 namespace IICN\Subscription\Http\Controllers\Test;
 
-use App\Models\User;
 use IICN\Subscription\Http\Controllers\Controller;
 use IICN\Subscription\Subscription;
 use Illuminate\Support\Facades\Auth;
@@ -11,7 +10,8 @@ class Test extends Controller
 {
     public function __invoke()
     {
-        $user = User::query()->with('subscriptions')->find(1);
+        Auth::loginUsingId(1);
+        return Subscription::canUse('Istikhara');
         return $user->useSubscription("Istikhara");
         $user->newSubscription(1);
     }
diff --git a/src/SubscriptionServiceProvider.php b/src/SubscriptionServiceProvider.php
index c7f489d..da3a4fd 100644
--- a/src/SubscriptionServiceProvider.php
+++ b/src/SubscriptionServiceProvider.php
@@ -2,7 +2,7 @@
 
 namespace IICN\Subscription;
 
-use App\Models\User;
+use IICN\Subscription\Http\Middleware\ValidateSubscription;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\ServiceProvider;
 
@@ -22,6 +22,13 @@ class SubscriptionServiceProvider extends ServiceProvider
         $this->runningInConsole();
 
         $this->publish();
+
+        $this->app->bind('subscription', function () {
+            $loggedInUser = Auth::user();
+            if ($loggedInUser instanceof HasSubscription) {
+                return new \IICN\Subscription\Services\Subscription($loggedInUser);
+            }
+        });
     }
 
     /**
@@ -35,15 +42,7 @@ class SubscriptionServiceProvider extends ServiceProvider
             __DIR__.'/../config/subscription.php', 'subscription'
         );
 
-//        $this->app->bind('subscription',function() {
-//            if (Auth::guard(config('subscription.guard'))->check() and
-//                Auth::guard(config('subscription.guard'))->hasUser() and
-//                Auth::guard(config('subscription.guard'))->user() instanceof HasSubscription
-//            ) {
-//                return new \IICN\Subscription\Services\Subscription(Auth::guard(config('subscription.guard'))->user());
-//            }
-//        });
-
+        app('router')->aliasMiddleware('validate.subscription', ValidateSubscription::class);
     }
 
     /**