Merge pull request #110 from sensereen/master

Api 1.2, gzip and api-token support, saleschannel entity
tooyz · Jun 7, 2024 · f9e26cc · f9e26cc
2 parents abab694 + 41ff402
commit f9e26cc
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 10 deletions.
diff --git a/src/Components/Http/MoySkladHttpClient.php b/src/Components/Http/MoySkladHttpClient.php
@@ -108,13 +108,22 @@ public function delete($method, $payload = [], $options = null){
      */
     public function getRaw($link, $options) {
         if (empty($options['headers']['Authorization'])) {
-            $options['headers']['Authorization'] = "Basic " . base64_encode($this->login . ':' . $this->password);
+            $options['headers']['Authorization'] = $this->getAuthorizationHeader();
         }
 
         $client = new Client();
         return $client->get($link, $options);
     }
 
+    private function getAuthorizationHeader() {
+        if (is_null($this->password)) {
+            $authorizationHeader = 'Bearer '.$this->login;
+        } else {
+            $authorizationHeader = "Basic " . base64_encode($this->login . ':' . $this->password);
+        }
+        return $authorizationHeader;
+    }
+
     public function getLastRequest(){
         return RequestLog::getLast();
     }
@@ -157,8 +166,8 @@ private function makeRequest(
         }
 
         $headers = [
-            "Content-Encoding" => "gzip",
-            "Authorization" => "Basic " . base64_encode($this->login . ':' . $password)
+            "Accept-Encoding" => "gzip",
+            "Authorization" => $this->getAuthorizationHeader()
         ];
         $config = [
             "base_uri" => $endpoint,

diff --git a/src/Components/Specs/QuerySpecs/QuerySpecs.php b/src/Components/Specs/QuerySpecs/QuerySpecs.php
@@ -7,7 +7,7 @@
 
 class QuerySpecs extends AbstractSpecs {
     protected static $cachedDefaultSpecs = null;
-    const MAX_LIST_LIMIT = 100;
+    const MAX_LIST_LIMIT = 1000;
 
     /**
      * Get possible variables for spec, will be sent as query string

diff --git a/src/Entities/Saleschannel.php b/src/Entities/Saleschannel.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace MoySklad\Entities;
+
+use MoySklad\Entities\AbstractEntity;
+
+class Saleschannel extends AbstractEntity
+{
+    public static
+        $entityName = 'saleschannel';
+}
diff --git a/src/MoySklad.php b/src/MoySklad.php
@@ -22,7 +22,7 @@ class MoySklad{
      */
     private static $instances = [];
 
-    private function __construct($login, $password, $posToken, $hashCode, $subdomain = "online")
+    private function __construct($login, $password, $posToken, $hashCode, $subdomain = "api")
     {
         $this->client = new MoySkladHttpClient($login, $password, $posToken, $subdomain);
         $this->hashCode = $hashCode;
@@ -40,16 +40,20 @@ private static function makeHash($login, $password){
 
     /**
      * Use it instead of constructor
-     * @param $login
+     * @param $loginOrToken
      * @param $password
      * @param string $subdomain
      * @param $posToken
      * @return MoySklad
      */
-    public static function getInstance($login, $password, $subdomain = "online", $posToken = null){
-        $hash = static::makeHash($login, $password);
+    public static function getInstance($loginOrToken, $password = null, $subdomain = "api", $posToken = null){
+        if (is_null($password)) {
+            $hash = $loginOrToken;
+        } else {
+            $hash = static::makeHash($loginOrToken, $password);
+        }
         if ( empty(static::$instances[$hash]) ){
-            static::$instances[$hash] = new static($login, $password, $posToken, $hash, $subdomain);
+            static::$instances[$hash] = new static($loginOrToken, $password, $posToken, $hash, $subdomain);
             EntityRegistry::instance()->bootEntities();
         }
         return static::$instances[$hash];

diff --git a/src/Registers/EntityRegistry.php b/src/Registers/EntityRegistry.php
@@ -90,6 +90,7 @@
 use MoySklad\Entities\Products\Variant;
 use MoySklad\Entities\Project;
 use MoySklad\Entities\RetailStore;
+use MoySklad\Entities\Saleschannel;
 use MoySklad\Entities\Store;
 use MoySklad\Entities\Uom;
 use MoySklad\Entities\Bonustransaction;
@@ -195,7 +196,8 @@ class EntityRegistry extends AbstractSingleton{
         ProcessingProduct::class,
         ProcessingMaterial::class,
         Bonustransaction::class,
-        Bonusprogram::class
+        Bonusprogram::class,
+        Saleschannel::class
     ];
     public $entityNames = [];