Multiple fixes.

- Use 'Bearer' as token type.
- Fix set expires_at token field.
- Fix repo - delete token.

database/migrations/2018_03_20_000001_create_mtn_momo_tokens_table.php

@@ -15,7 +15,7 @@ public function up()
             $table->increments('id');
             $table->text('access_token');
             $table->text('refresh_token')->nullable();
-            $table->string('token_type')->default('access_token');
+            $table->string('token_type')->default('Bearer');
             $table->timestamps();
             $table->timestamp('expires_at')->nullable();
             $table->timestamp('deleted_at')->nullable();

src/Products/Collection.php

@@ -155,7 +155,7 @@ public function transact($external_id, $party_id, $amount, $payer_message = '',
             $this->client->request('POST', $resource, [
                 'headers' => [
                     'X-Reference-Id' => $payment_ref,
-                    'X-Callback-Url' => $this->getClientRedirectUri(),
+                    // 'X-Callback-Url' => $this->getClientRedirectUri(),
                     'X-Target-Environment' => $this->getEnvironment(),
                 ],
                 'json' => [
@@ -173,7 +173,7 @@ public function transact($external_id, $party_id, $amount, $payer_message = '',
 
             return $payment_ref;
         } catch (RequestException $ex) {
-            throw new CollectionRequestException('Unable to transact (request pay).', 0, $ex);
+            throw new CollectionRequestException('Request to pay transaction - unsuccessful.', 0, $ex);
         }
     }
 

src/Repositories/TokenRepository.php

@@ -5,6 +5,7 @@
 
 namespace Bmatovu\MtnMomo\Repositories;
 
+use Carbon\Carbon;
 use Bmatovu\MtnMomo\Models\Token;
 use Bmatovu\OAuthNegotiator\Repositories\TokenRepositoryInterface;
 
@@ -26,6 +27,9 @@ public function __constructor()
      */
     public function create(array $attributes)
     {
+        $attributes['token_type'] = 'Bearer';
+        $attributes['expires_at'] = Carbon::now()->addSeconds($attributes['expires_in']);
+
         return Token::create($attributes);
     }
 
@@ -62,6 +66,6 @@ public function update($access_token, array $attributes)
      */
     public function delete($access_token)
     {
-        Token::destory($access_token);
+        Token::where('access_token', $access_token)->delete();
     }
 }

src/Traits/TokenUtilTrait.php

@@ -61,10 +61,6 @@ public function isExpired()
             return false;
         }
 
-        if ($this->expires_at->isFuture()) {
-            return false;
-        }
-
-        return true;
+        return $this->expires_at->isPast();
     }
 }