Merge pull request #164 from bytehead/feature/configurabe-delay

Make the challenge delay configurable
pgrimaud · Nov 15, 2020 · d008401 · d008401
2 parents ffbece3 + 8a35f10
commit d008401
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 10 deletions.
diff --git a/src/Instagram/Api.php b/src/Instagram/Api.php
@@ -60,14 +60,21 @@ class Api
      */
     protected $session = null;
 
+    /**
+     * @var int|null
+     */
+    protected $challengeDelay;
+
     /**
      * @param CacheItemPoolInterface $cachePool
      * @param ClientInterface|null $client
+     * @param int|null $challengeDelay
      */
-    public function __construct(CacheItemPoolInterface $cachePool, ClientInterface $client = null)
+    public function __construct(CacheItemPoolInterface $cachePool, ClientInterface $client = null, ?int $challengeDelay = null)
     {
-        $this->cachePool = $cachePool;
-        $this->client    = $client ?: new Client();
+        $this->cachePool      = $cachePool;
+        $this->client         = $client ?: new Client();
+        $this->challengeDelay = $challengeDelay;
     }
 
     /**
@@ -81,7 +88,7 @@ public function __construct(CacheItemPoolInterface $cachePool, ClientInterface $
      */
     public function login(string $username, string $password, ?ImapClient $imapClient = null): void
     {
-        $login = new Login($this->client, $username, $password, $imapClient);
+        $login = new Login($this->client, $username, $password, $imapClient, $this->challengeDelay);
 
         // fetch previous session an re-use it
         $sessionData = $this->cachePool->getItem(Session::SESSION_KEY . '.' . CacheHelper::sanitizeUsername($username));

diff --git a/src/Instagram/Auth/Login.php b/src/Instagram/Auth/Login.php
@@ -32,18 +32,25 @@ class Login
      */
     private $imapClient;
 
+    /**
+     * @var int|null
+     */
+    private $challengeDelay;
+
     /**
      * @param ClientInterface $client
      * @param string $login
      * @param string $password
      * @param ImapClient|null $imapClient
+     * @param int|null $challengeDelay
      */
-    public function __construct(ClientInterface $client, string $login, string $password, ?ImapClient $imapClient = null)
+    public function __construct(ClientInterface $client, string $login, string $password, ?ImapClient $imapClient = null, ?int $challengeDelay = null)
     {
-        $this->client     = $client;
-        $this->login      = $login;
-        $this->password   = $password;
-        $this->imapClient = $imapClient;
+        $this->client         = $client;
+        $this->login          = $login;
+        $this->password       = $password;
+        $this->imapClient     = $imapClient;
+        $this->challengeDelay = $challengeDelay;
     }
 
     /**
@@ -124,7 +131,7 @@ private function checkpointChallenge(CookieJar $cookieJar, \StdClass $data): Coo
             throw new InstagramAuthException('Checkpoint required, please provide IMAP credentials to process authentication.');
         }
 
-        $challenge = new Challenge($this->client, $cookieJar, $data->checkpoint_url);
+        $challenge = new Challenge($this->client, $cookieJar, $data->checkpoint_url, $this->challengeDelay);
 
         $challengeContent = $challenge->fetchChallengeContent();