Merge pull request #233 from seregazhuk/develop

fix: Receiving email after business registration

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [5.1.7] - 2016-12-31
+### Fixed:
+ - Receiving confirmation email after registering business account.
+
 ## [5.1.6] - 2016-12-25
 ### Fixed:
  - Feed pagination error

src/Api/Providers/Auth.php

@@ -4,11 +4,12 @@
 
 use seregazhuk\PinterestBot\Api\Response;
 use seregazhuk\PinterestBot\Helpers\UrlBuilder;
+use seregazhuk\PinterestBot\Api\Traits\BusinessAccount;
 use seregazhuk\PinterestBot\Api\Traits\SendsRegisterActions;
 
 class Auth extends Provider
 {
-    use SendsRegisterActions;
+    use SendsRegisterActions, BusinessAccount;
 
     /**
      * @var array
@@ -30,7 +31,7 @@ class Auth extends Provider
      */
     public function login($username, $password, $autoLogin = true)
     {
-        if ($this->request->isLoggedIn()) return true;
+        if ($this->isLoggedIn()) return true;
 
         $this->checkCredentials($username, $password);
 
@@ -86,23 +87,9 @@ public function register($email, $password, $name, $country = 'GB', $age = 18)
      */
     public function registerBusiness($email, $password, $businessName, $website = '')
     {
-        $data = [
-            "email"         => $email,
-            "password"      => $password,
-            "website_url"   => $website,
-            "account_type"  => self::ACCOUNT_TYPE_OTHER,
-            "business_name" => $businessName,
-        ];
+        $this->register($email, $password, $businessName);
 
-        return $this->makeBusinessRegisterCall($data);
-    }
-
-    /**
-     * @return bool
-     */
-    public function isLoggedIn()
-    {
-        return $this->request->isLoggedIn();
+        return $this->convertToBusiness($businessName, $website);
     }
 
     /**
@@ -162,24 +149,7 @@ protected function makeRegisterCall($data)
 
         if(!$this->execPostRequest($data, UrlBuilder::RESOURCE_CREATE_REGISTER)) return false;
 
-        if(!$this->sendPlainRegistrationActions()) return false;
-
-        return $this->completeRegistration();
-    }
-
-    /**
-     * @param array $data
-     * @return bool|mixed
-     */
-    protected function makeBusinessRegisterCall($data)
-    {
-        $this->visitPage('business/create/');
-
-        if(!$this->sendBusinessRegistrationInitActions()) return false;
-
-        if(!$this->execPostRequest($data, UrlBuilder::RESOURCE_CREATE_REGISTER)) return false;
-
-        if(!$this->sendBusinessRegistrationFinishActions()) return false;
+        if(!$this->sendRegistrationActions()) return false;
 
         return $this->completeRegistration();
     }
@@ -224,25 +194,4 @@ protected function getProfile()
     {
         return $this->execGetRequest([], UrlBuilder::RESOURCE_GET_USER_SETTINGS);
     }
-
-    /**
-     * @return bool
-     */
-    protected function sendRegisterActions()
-    {
-        $actions = [
-            ["name" => "multi_step_step_2_complete"],
-            ["name" => "signup_home_page"],
-            ["name" => "signup_referrer.other"],
-            ["name" => "signup_referrer_module.unauth_home_react_page"],
-            ["name" => "unauth.signup_step_2.completed"],
-            ["name" => "setting_new_window_location"],
-        ];
-
-        if(!$this->sendRegisterActionRequest($actions)) return false;
-
-        if(!$this->sendRegisterActionRequest()) return false;
-
-        return true;
-    }
 }

src/Api/Providers/Boards.php

@@ -10,7 +10,7 @@
 use seregazhuk\PinterestBot\Api\Traits\SendsMessages;
 use seregazhuk\PinterestBot\Api\Contracts\PaginatedResponse;
 
-class Boards extends Provider
+class Boards extends EntityProvider
 {
     use CanBeDeleted, Searchable, Followable, SendsMessages;
 

src/Api/Providers/EntityProvider.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace seregazhuk\PinterestBot\Api\Providers;
+
+class EntityProvider extends Provider
+{
+    /**
+     * @return string
+     */
+    public function getEntityIdName()
+    {
+        return property_exists($this, 'entityIdName') ? $this->entityIdName : '';
+    }
+}

src/Api/Providers/Password.php

@@ -37,7 +37,7 @@ public function sendResetLink($user)
     public function reset($link, $newPassword)
     {
         // Visit link to get current reset token, username and token expiration
-        $this->execGetRequest([], $link);
+        $this->visitPage($link);
         $this->request->clearToken();
 
         $urlData = $this->parseCurrentUrl();
@@ -77,7 +77,10 @@ public function change($oldPassword, $newPassword)
      */
     protected function parseCurrentUrl()
     {
-        $url = $this->request->getHttpClient()->getCurrentUrl();
+        $url = $this
+            ->request
+            ->getHttpClient()
+            ->getCurrentUrl();
 
         return parse_url($url);
     }

src/Api/Providers/Pinners.php

@@ -10,7 +10,7 @@
 use seregazhuk\PinterestBot\Api\Traits\Searchable;
 use seregazhuk\PinterestBot\Exceptions\WrongFollowingType;
 
-class Pinners extends Provider
+class Pinners extends EntityProvider
 {
     use Searchable, Followable;
 
@@ -52,7 +52,7 @@ public function info($username)
      * @param string $username
      * @param string $type
      * @param int $limit
-     * @return Iterator
+     * @return Pagination
      * @throws WrongFollowingType
      */
     public function following($username, $type = UrlBuilder::FOLLOWING_PEOPLE, $limit = Pagination::DEFAULT_LIMIT)
@@ -72,7 +72,7 @@ public function following($username, $type = UrlBuilder::FOLLOWING_PEOPLE, $limi
      *
      * @param string $username
      * @param int $limit
-     * @return Iterator
+     * @return Pagination
      */
     public function followingPeople($username, $limit = Pagination::DEFAULT_LIMIT)
     {
@@ -85,7 +85,7 @@ public function followingPeople($username, $limit = Pagination::DEFAULT_LIMIT)
      *
      * @param string $username
      * @param int $limit
-     * @return Iterator
+     * @return Pagination
      */
     public function followingBoards($username, $limit = Pagination::DEFAULT_LIMIT)
     {
@@ -112,7 +112,7 @@ public function followingInterests($username, $limit = Pagination::DEFAULT_LIMIT
      * @param string $username
      * @param int $limit
      *
-     * @return Iterator
+     * @return Pagination
      */
     public function pins($username, $limit = Pagination::DEFAULT_LIMIT)
     {
@@ -126,7 +126,7 @@ public function pins($username, $limit = Pagination::DEFAULT_LIMIT)
      *
      * @param string $username
      * @param int $limit
-     * @return Iterator
+     * @return Pagination
      */
     public function likes($username, $limit = Pagination::DEFAULT_LIMIT)
     {
@@ -165,7 +165,7 @@ public function blockById($userId)
      * @param string $url
      * @param int $limit
      *
-     * @return \Traversable
+     * @return Pagination
      */
     protected function paginate($username, $url, $limit)
     {

src/Api/Providers/Pins.php

@@ -12,7 +12,7 @@
 use seregazhuk\PinterestBot\Api\Traits\CanBeDeleted;
 use seregazhuk\PinterestBot\Api\Traits\UploadsImages;
 
-class Pins extends Provider
+class Pins extends EntityProvider
 {
     use Searchable, CanBeDeleted, UploadsImages, HasFeed, SendsMessages;
 
@@ -188,7 +188,7 @@ public function fromSource($source, $limit = Pagination::DEFAULT_LIMIT)
      *
      * @param string $pinId
      * @param int $limit
-     * @return Iterator|array
+     * @return Pagination
      */
     public function activity($pinId, $limit = Pagination::DEFAULT_LIMIT)
     {

src/Api/Providers/Provider.php

@@ -106,14 +106,6 @@ protected function execute($url, $postString = "")
         return $this;
     }
 
-    /**
-     * @return string
-     */
-    public function getEntityIdName()
-    {
-        return property_exists($this, 'entityIdName') ? $this->entityIdName : '';
-    }
-
     /**
      * Executes pagination GET request.
      *

src/Api/Providers/ProviderWrapper.php

@@ -10,7 +10,7 @@ class ProviderWrapper
     /**
      * @var Provider
      */
-    private $provider;
+    protected $provider;
 
     /**
      * @param Provider|object $provider

src/Api/Providers/Topics.php

@@ -8,7 +8,7 @@
 use seregazhuk\PinterestBot\Api\Traits\Followable;
 use seregazhuk\PinterestBot\Api\Traits\HasRelatedTopics;
 
-class Topics extends Provider
+class Topics extends EntityProvider
 {
     use Followable, HasRelatedTopics, HasFeed;
 

src/Api/Providers/User.php

@@ -22,9 +22,6 @@ class User extends Provider
         'convertToBusiness',
     ];
 
-    const ACCOUNT_TYPE_OTHER = 'other';
-    const REGISTRATION_COMPLETE_EXPERIENCE_ID = '11:10105';
-
     /**
      * Updates or returns user profile info. Gets associative array as a param. Available keys of array are:
      * 'last_name', 'first_name', 'username', 'about', 'location' and 'website_url'.
@@ -47,24 +44,6 @@ public function profile($userInfo = [])
         return $this->execPostRequest($userInfo, UrlBuilder::RESOURCE_UPDATE_USER_SETTINGS);
     }
 
-    /**
-     * Convert your account to a business one.
-     *
-     * @param string $businessName
-     * @param string $websiteUrl
-     * @return bool
-     */
-    public function convertToBusiness($businessName, $websiteUrl = '')
-    {
-        $data = [
-            'business_name' => $businessName,
-            'website_url'   => $websiteUrl,
-            'account_type'  => self::ACCOUNT_TYPE_OTHER,
-        ];
-
-        return $this->execPostRequest($data, UrlBuilder::RESOURCE_CONVERT_TO_BUSINESS);
-    }
-
     /**
      * Checks if current user is banned
      *

src/Api/Traits/BusinessAccount.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace seregazhuk\PinterestBot\Api\Traits;
+
+use seregazhuk\PinterestBot\Helpers\UrlBuilder;
+
+trait BusinessAccount
+{
+    use HandlesRequest;
+
+    /**
+     * Convert your account to a business one.
+     *
+     * @param string $businessName
+     * @param string $websiteUrl
+     * @return bool
+     */
+    public function convertToBusiness($businessName, $websiteUrl = '')
+    {
+        $data = [
+            'business_name' => $businessName,
+            'website_url'   => $websiteUrl,
+            'account_type'  => 'other',
+        ];
+
+        return $this->execPostRequest($data, UrlBuilder::RESOURCE_CONVERT_TO_BUSINESS);
+    }
+}

src/Api/Traits/Searchable.php

@@ -79,7 +79,7 @@ protected function createSearchQuery($query, $scope, $bookmarks = [])
      * @param string $query
      * @param int $limit
      *
-     * @return \Traversable
+     * @return Pagination
      */
     public function search($query, $limit = Pagination::DEFAULT_LIMIT)
     {