Decouple Auth code from SMS provider adapter

app/controllers/api/account.php

@@ -2,7 +2,7 @@
 
 use Ahc\Jwt\JWT;
 use Appwrite\Auth\Auth;
-use Appwrite\Auth\SMS;
+use Appwrite\Auth\SMS\Mock;
 use Appwrite\Auth\Validator\Password;
 use Appwrite\Auth\Validator\Phone as ValidatorPhone;
 use Appwrite\Detector\Detector;
@@ -873,7 +873,7 @@ App::post('/v1/account/sessions/phone')
     ->inject('events')
     ->inject('messaging')
     ->inject('sms')
-    ->action(function (string $userId, string $phone, Request $request, Response $response, Document $project, Database $dbForProject, Audit $audits, Event $events, EventPhone $messaging, SMS $sms) {
+    ->action(function (string $userId, string $phone, Request $request, Response $response, Document $project, Database $dbForProject, Audit $audits, Event $events, EventPhone $messaging) {
         if (empty(App::getEnv('_APP_SMS_PROVIDER'))) {
             throw new Exception('Phone provider not configured', 503, Exception::GENERAL_PHONE_DISABLED);
         }
@@ -918,7 +918,7 @@ App::post('/v1/account/sessions/phone')
             ])));
         }
 
-        $secret = $sms->generateSecretDigits();
+        $secret = (App::getEnv('_APP_SMS_PROVIDER') === 'sms://mock') ? Mock::$defaultDigits : Auth::codeGenerator();
 
         $expire = \time() + Auth::TOKEN_EXPIRATION_PHONE;
 
@@ -2269,14 +2269,13 @@ App::post('/v1/account/verification/phone')
     ->label('abuse-key', 'userId:{userId}')
     ->inject('request')
     ->inject('response')
-    ->inject('phone')
     ->inject('user')
     ->inject('dbForProject')
     ->inject('audits')
     ->inject('events')
     ->inject('usage')
     ->inject('messaging')
-    ->action(function (Request $request, Response $response, Phone $phone, Document $user, Database $dbForProject, Audit $audits, Event $events, Stats $usage, EventPhone $messaging) {
+    ->action(function (Request $request, Response $response, Document $user, Database $dbForProject, Audit $audits, Event $events, Stats $usage, EventPhone $messaging) {
 
         if (empty(App::getEnv('_APP_SMS_PROVIDER'))) {
             throw new Exception('Phone provider not configured', 503, Exception::GENERAL_PHONE_DISABLED);
@@ -2292,7 +2291,7 @@ App::post('/v1/account/verification/phone')
 
         $verificationSecret = Auth::tokenGenerator();
 
-        $secret = $phone->generateSecretDigits();
+        $secret = (App::getEnv('_APP_SMS_PROVIDER') === 'sms://mock') ? Mock::$defaultDigits : Auth::codeGenerator();
         $expire = \time() + Auth::TOKEN_EXPIRATION_CONFIRM;
 
         $verification = new Document([

src/Appwrite/Auth/Auth.php

@@ -280,6 +280,22 @@ class Auth
         return \bin2hex(\random_bytes($length));
     }
 
+    /**
+     * Code Generator.
+     *
+     * Generate random code string
+     *
+     * @param int $length
+     *
+     * @return string
+     *
+     * @throws \Exception
+     */
+    public static function codeGenerator(int $length = 6): string
+    {
+        return substr(str_shuffle("0123456789"), 0, $length);
+    }
+
     /**
      * Verify token and check that its not expired.
      *

src/Appwrite/SMS/Adapter.php

@@ -25,6 +25,7 @@ abstract class Adapter
 
     /**
      * Send Message to phone.
+     * 
      * @param string $from
      * @param string $to
      * @param string $message
@@ -72,15 +73,4 @@ abstract class Adapter
 
         return $response;
     }
-
-    /**
-     * Generate 6 random digits for phone verification.
-     *
-     * @param int $digits
-     * @return string
-     */
-    public function generateSecretDigits(int $digits = 6): string
-    {
-        return substr(str_shuffle("0123456789"), 0, $digits);
-    }
 }

src/Appwrite/SMS/Adapter/Mock.php

@@ -9,7 +9,7 @@ class Mock extends Adapter
     /**
      * @var string
      */
-    public static string $defaultDigits = '123456';
+    public static string $digits = '123456';
 
     /**
      * @param string $from
@@ -21,13 +21,4 @@ class Mock extends Adapter
     {
         return;
     }
-
-    /**
-     * @param int $digits
-     * @return string
-     */
-    public function generateSecretDigits(int $digits = 6): string
-    {
-        return self::$defaultDigits;
-    }
 }

tests/e2e/Services/Account/AccountCustomClientTest.php

@@ -713,7 +713,7 @@ class AccountCustomClientTest extends Scope
 
         $this->assertEquals(400, $response['headers']['status-code']);
 
-        $data['token'] = Mock::$defaultDigits;
+        $data['token'] = Mock::$digits;
         $data['id'] = $userId;
         $data['number'] = $number;
 
@@ -949,7 +949,7 @@ class AccountCustomClientTest extends Scope
             'cookie' => 'a_session_' . $this->getProject()['$id'] . '=' . $session,
         ]), [
             'userId' => $id,
-            'secret' => Mock::$defaultDigits,
+            'secret' => Mock::$digits,
         ]);
 
         $this->assertEquals(200, $response['headers']['status-code']);
@@ -964,7 +964,7 @@ class AccountCustomClientTest extends Scope
             'cookie' => 'a_session_' . $this->getProject()['$id'] . '=' . $session,
         ]), [
             'userId' => 'ewewe',
-            'secret' => Mock::$defaultDigits,
+            'secret' => Mock::$digits,
         ]);
 
         $this->assertEquals(404, $response['headers']['status-code']);