Merge pull request alaatv#15 from MohamadSH/master

mobile verification
roghaye-m · Sep 26, 2019 · 6a24688 · 6a24688
2 parents 5d5964f + 5d77e77
commit 6a24688
Show file tree

Hide file tree

Showing 5 changed files with 86 additions and 8 deletions.
diff --git a/app/Events/MobileVerificationCodeGenerated.php b/app/Events/MobileVerificationCodeGenerated.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Events;
+
+use App\User;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Broadcasting\InteractsWithSockets;
+
+class MobileVerificationCodeGenerated
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+    public $user;
+    public $generationTime;
+
+    /**
+     * Create a new event instance.
+     *
+     * @param User $user
+     * @param $generationTime
+     */
+    public function __construct(User $user , $generationTime=null)
+    {
+        $this->user = $user;
+        $this->generationTime = $generationTime;
+    }
+
+}
diff --git a/app/Events/MobileVerified.php b/app/Events/MobileVerified.php
@@ -3,11 +3,12 @@
 namespace App\Events;
 
 use App\Classes\Verification\MustVerifyMobileNumber;
+use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
 class MobileVerified
 {
-    use SerializesModels;
+    use Dispatchable, SerializesModels;
 
     /**
      * The verified user.

diff --git a/app/Listeners/MobileVerificationCodeGeneratedListener.php b/app/Listeners/MobileVerificationCodeGeneratedListener.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Listeners;
+
+use App\Events\MobileVerificationCodeGenerated;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Support\Facades\Log;
+
+class MobileVerificationCodeGeneratedListener
+{
+    use InteractsWithQueue;
+
+    /**
+     * Handle the event.
+     *
+     * @param  object  $event
+     * @return void
+     */
+    public function handle(MobileVerificationCodeGenerated $event)
+    {
+        $timeStamp = $event->generationTime;
+        $user = $event->user;
+//        Carbon::createFromTimestamp($timeStamp);
+        Log::info('MobileVerificationCodeGeneratedListener : '.$user->id.' - '.$timeStamp);
+    }
+}
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
@@ -3,8 +3,10 @@
 namespace App\Providers;
 
 use App\Events\CountOption;
+use App\Events\MobileVerificationCodeGenerated;
 use App\Events\MobileVerified;
 use App\Listeners\CountOptionListener;
+use App\Listeners\MobileVerificationCodeGeneratedListener;
 use App\Listeners\MobileVerifiedListener;
 use App\Listeners\SendMobileVerificationNotification;
 use Illuminate\Auth\Events\Registered;
@@ -28,8 +30,10 @@ class EventServiceProvider extends ServiceProvider
         ],
         CountOption::class => [
             CountOptionListener::class
+        ],
+        MobileVerificationCodeGenerated::class => [
+            MobileVerificationCodeGeneratedListener::class
         ]
-
     ];
 
     /**

diff --git a/app/Traits/MustVerifyMobileNumberTrait.php b/app/Traits/MustVerifyMobileNumberTrait.php
@@ -8,9 +8,11 @@
 
 namespace App\Traits;
 
+use App\Events\MobileVerificationCodeGenerated;
 use App\Notifications\MobileVerified;
 use App\Notifications\VerifyMobile;
-use Illuminate\Support\Facades\Cache;
+use Carbon\Carbon;
+use Illuminate\Support\Facades\Log;
 
 trait MustVerifyMobileNumberTrait
 {
@@ -21,7 +23,7 @@ trait MustVerifyMobileNumberTrait
      */
     public function hasVerifiedMobile()
     {
-        return $this->mobile_verified_at !== null;
+        return ! is_null($this->mobile_verified_at);
     }
 
     /**
@@ -44,10 +46,10 @@ public function markMobileAsVerified()
     public function sendMobileVerificationNotification()
     {
         if ($this->setMobileVerificationCode()) {
-            $this->notify(new VerifyMobile());
+//            $this->notify(new VerifyMobile());
         }
     }
-    
+
     /**
      * generate a verification code for given user
      *
@@ -56,11 +58,28 @@ public function sendMobileVerificationNotification()
      */
     public function setMobileVerificationCode(): bool
     {
-        $verificationCode = random_int(10000, 99999);
+        Log::info('before event');
+        event(new MobileVerificationCodeGenerated($this , Carbon::now('Asia/Tehran')));
+        return true;
 
-        return $this->forceFill([
+
+        $verificationCode = $this->getMobileVerificationCode();
+        if(isset($verificationCode)) {
+            return true;
+        }
+
+
+        $verificationCode = random_int(10000, 99999);
+        $result = $this->forceFill([
             'mobile_verified_code' => $verificationCode,
         ])->save();
+
+        if($result){
+            event(new MobileVerificationCodeGenerated($this , Carbon::now('Asia/Tehran')));
+
+            return true;
+        }
+        return false;
     }
 
     /**