Validating Mobile Number

Author: luizeof

README.md

@@ -34,6 +34,8 @@ Add your Utalk token on `app/services.php` file. You can get your API Token [her
 ],
 ```
 
+**You need to create a `UTALK_TOKEN` on your `.env` file.**
+
 ## Usage
 
 Now you can use the channel in your `via()` method inside the notification:
@@ -45,11 +47,24 @@ use Illuminate\Notifications\Notification;
 
 class TeamCreated extends Notification
 {
+
+    /**
+     * Get the notification's delivery channels.
+     *
+     * @param  mixed  $notifiable
+     * @return array
+     */
     public function via($notifiable)
     {
         return [UtalkChannel::class];
     }
 
+    /**
+     * Get the UTalk representation of the notification.
+     *
+     * @param  mixed  $notifiable
+     * @return \Powertic\Utalk\UtalkMessage
+     */
     public function toUtalk($notifiable)
     {
         return UtalkMessage::create()
@@ -60,9 +75,14 @@ class TeamCreated extends Notification
 
 In order to let your Notification know which number should receive the message, add the `routeNotificationForUtalk` method to your Notifiable model.
 
-This method needs to return the mobile number where the notification will be sent.
+**This method expects a [valid E.164 mobile number](https://en.wikipedia.org/wiki/E.164) where the notification will be sent.**
 
 ```php
+/**
+ * Route notifications for the Utalk channel.
+ *
+ * @return string
+*/
 public function routeNotificationForUtalk()
 {
     return $this->mobile;

composer.json

@@ -19,7 +19,8 @@
         "php": "^7.2.5 || ^8.0",
         "guzzlehttp/guzzle": "^6.2 || ^7.0",
         "illuminate/notifications": "^6.0 || ^7.0 || ^8.0",
-        "illuminate/support": "^6.0 || ^7.0 || ^8.0"
+        "illuminate/support": "^6.0 || ^7.0 || ^8.0",
+        "propaganistas/laravel-phone": "^4.2"
     },
     "require-dev": {
         "mockery/mockery": "^1.3",

src/UtalkChannel.php

@@ -7,6 +7,7 @@
 use Illuminate\Notifications\Notification;
 use Powertic\Utalk\Exceptions\CouldNotSendNotification;
 use Powertic\Utalk\Exceptions\InvalidConfiguration;
+use Propaganistas\LaravelPhone\PhoneNumber;
 
 class UtalkChannel
 {
@@ -21,6 +22,19 @@ public function __construct(Utalk $utalk)
         $this->utalk = $utalk;
     }
 
+    /**
+     * Transform Mobile Number to Utalk Format
+     *
+     * @param [string] $mobile
+     * @return string
+     */
+    private function transformMobileNumber($mobile)
+    {
+        $transformed = PhoneNumber::make($mobile)->formatE164();
+        $transformed = str_replace('+', '', $transformed);
+        return "{$transformed}@c.us";
+    }
+
     /**
      * Send the given notification.
      *
@@ -35,10 +49,12 @@ public function __construct(Utalk $utalk)
     public function send($notifiable, Notification $notification)
     {
         // Exit if $notifiable doesn't have a route
-        if (!$to = $notifiable->routeNotificationFor('utalk')) {
+        if (!$mobile = $notifiable->routeNotificationFor('utalk')) {
             return;
         }
 
+        $to = $this->transformMobileNumber($mobile);
+
         // Exit if token not found
         if (!$token = $this->utalk->getToken()) {
             throw new InvalidConfiguration();