Merge pull request #10 from valeryan/patch-handle-token-exceptions

handle invalid token exception internally
junaidnasir · Aug 15, 2017 · edc44c1 · edc44c1
2 parents 1ee6f25 + 6fd0a1d
commit edc44c1
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 6 deletions.
diff --git a/src/InvitationInterface.php b/src/InvitationInterface.php
@@ -43,6 +43,13 @@ public function consume();
      */
     public function cancel();
 
+    /**
+     * check if a code exist
+     *
+     * @return boolean true if code found | false if not
+     */
+    public function isExisting();
+
     /**
      * check if invitation is valid
      * @return boolean

diff --git a/src/LaraInvite.php b/src/LaraInvite.php
@@ -10,7 +10,8 @@
 *   Laravel Invitation class
 */
 class LaraInvite implements InvitationInterface
-{  
+{
+
     /**
      * Email address to invite
      * @var string
@@ -23,6 +24,12 @@ class LaraInvite implements InvitationInterface
      */
     private $code = null;
 
+    /**
+     * Status of code existing in DB
+     * @var bool
+     */
+    private $exist = false;
+
     /**
      * integer ID of referral
      * @var [type]
@@ -58,7 +65,12 @@ public function invite($email, $referral, $expires, $beforeSave = null)
     public function setCode($code)
     {
         $this->code = $code;
-        $this->getModelInstance(false);
+        try {
+            $this->getModelInstance(false);
+        } catch (InvalidTokenException $exception) {
+            // handle invalid codes
+            $this->exist = false;
+        }
         return $this;
     }
 
@@ -70,12 +82,15 @@ public function get()
         return $this->instance;
     }
 
-        /**
+    /**
      * {@inheritdoc}
      */
     public function status()
     {
-        return $this->instance->status;
+        if ($this->isValid()) {
+            return $this->instance->status;
+        }
+        return 'Invalid';
     }
 
     /**
@@ -105,6 +120,14 @@ public function cancel()
         }
         return false;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isExisting()
+    {
+        return $this->exist;
+    }
 
     /**
      * {@inheritdoc}
@@ -119,6 +142,9 @@ public function isValid()
      */
     public function isExpired()
     {
+        if (!$this->isExisting()) {
+            return true;
+        }
         if (strtotime($this->instance->valid_till) >= time()) {
             return false;
         }
@@ -133,6 +159,9 @@ public function isExpired()
      */
     public function isPending()
     {
+        if (!$this->isExisting()) {
+            return false;
+        }
         return ($this->instance->status == 'pending') ? true : false;
     }
 
@@ -141,7 +170,7 @@ public function isPending()
      */
     public function isAllowed($email)
     {
-        return (($this->instance->email == $email) && $this->isValid());
+        return ($this->isValid() && ($this->instance->email == $email));
     }
 
     /**
@@ -180,13 +209,14 @@ private function save($code, $beforeSave = null)
         if (!is_null($beforeSave)) {
             if ($beforeSave instanceof Closure) {
                 $beforeSave->call($this->instance);
-            } else if (is_callable($beforeSave)) {
+            } elseif (is_callable($beforeSave)) {
                 call_user_func($beforeSave, $this->instance);
             }
         }
         $this->instance->save();
 
         $this->code = $code;
+        $this->exist = true;
         return $this;
     }
 
@@ -205,6 +235,7 @@ private function getModelInstance($allowNew = true)
         }
         try {
             $this->instance = (new $model)->where('code', $this->code)->firstOrFail();
+            $this->exist = true;
             return $this;
         } catch (ModelNotFoundException $e) {
             throw new InvalidTokenException("Invalid Token {$this->code}", 401);