Merge pull request #176 from XueSiLf/2.x

up:1.fix contentSecurity api of miniProgram. 2.add private interface …

Author: XueSiLf

src/MiniProgram/Application.php

@@ -81,6 +81,7 @@ class Application extends ServiceContainer
         Auth\ServiceProvider::class,
         Base\ServiceProvider::class,
         Broadcast\ServiceProvider::class,
+        ContentSecurity\ServiceProvider::class,
         CustomerService\ServiceProvider::class,
         DataCube\ServiceProvider::class,
         Express\ServiceProvider::class,

src/OpenPlatform/Authorizer/MiniProgram/Application.php

@@ -13,6 +13,7 @@
  * @property Domain\Client $domain
  * @property Material\Client $material
  * @property PrivacyConfig\Client $privacyConfig
+ * @property PrivacyInterface\Client $privacyInterface
  * @property QrCodeJump\Client $qrCodeJump
  * @property Setting\Client $setting
  * @property Tester\Client $tester
@@ -26,6 +27,7 @@ class Application extends MiniProgram
     const Material = 'material';
     const OpenAuth = 'openAuth';
     const PrivacyConfig = 'privacyConfig';
+    const PrivacyInterface = 'privacyInterface';
     const QrCodeJump = 'qrCodeJump';
     const Setting = 'setting';
     const Tester = 'tester';
@@ -40,6 +42,7 @@ public function __construct(array $config = null, string $name = null, array $va
             Domain\ServiceProvider::class,
             Material\ServiceProvider::class,
             PrivacyConfig\ServiceProvider::class,
+            PrivacyInterface\ServiceProvider::class,
             QrCodeJump\ServiceProvider::class,
             Setting\ServiceProvider::class,
             Tester\ServiceProvider::class

src/OpenPlatform/Authorizer/MiniProgram/PrivacyConfig/Client.php

@@ -1,11 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: XueSi <[email protected]>
- * Date: 2022/5/16
- * Time: 11:56 下午
- */
-declare(strict_types=1);
 
 namespace EasySwoole\WeChat\OpenPlatform\Authorizer\MiniProgram\PrivacyConfig;
 
@@ -38,7 +31,7 @@ public function setPrivacySetting(
         }
 
         $params = [
-            'privacy_ver' => $privacyVer,
+            'privacy_ver'   => $privacyVer,
             'owner_setting' => $ownerSetting,
         ];
         if ($privacyVer === 2) {
@@ -53,6 +46,7 @@ public function setPrivacySetting(
 
         $response = $this->getClient()
             ->setMethod("POST")
+            ->setHeaders(['content-type' => 'application/json'])
             ->setBody($this->jsonDataToStream($params))
             ->send($this->buildUrl(
                 "/cgi-bin/component/setprivacysetting",
@@ -83,6 +77,7 @@ public function getPrivacySetting(int $privacyVer = 2)
 
         $response = $this->getClient()
             ->setMethod("POST")
+            ->setHeaders(['content-type' => 'application/json'])
             ->setBody($this->jsonDataToStream($params))
             ->send($this->buildUrl(
                 "/cgi-bin/component/getprivacysetting",

src/OpenPlatform/Authorizer/MiniProgram/PrivacyConfig/ServiceProvider.php

@@ -1,11 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: XueSi <[email protected]>
- * Date: 2022/5/16
- * Time: 11:56 下午
- */
-declare(strict_types=1);
 
 namespace EasySwoole\WeChat\OpenPlatform\Authorizer\MiniProgram\PrivacyConfig;
 

tests/MiniProgram/ApplicationTest.php

@@ -36,6 +36,8 @@ public function testProperties()
 
         $this->assertInstanceOf(\EasySwoole\WeChat\OfficialAccount\CustomerService\Client::class, $app->customerService);
 
+        $this->assertInstanceOf(\EasySwoole\WeChat\MiniProgram\ContentSecurity\Client::class, $app->contentSecurity);
+
         $this->assertInstanceOf(\EasySwoole\WeChat\MiniProgram\DataCube\Client::class, $app->dataCube);
 
         $this->assertInstanceOf(\EasySwoole\WeChat\MiniProgram\Express\Client::class, $app->express);

tests/OpenPlatform/Authorizer/MiniProgram/ApplicationTest.php

@@ -28,6 +28,8 @@ public function testProperties()
 
         $this->assertInstanceOf(\EasySwoole\WeChat\OpenPlatform\Authorizer\MiniProgram\PrivacyConfig\Client::class, $miniProgram->privacyConfig);
 
+        $this->assertInstanceOf(\EasySwoole\WeChat\OpenPlatform\Authorizer\MiniProgram\PrivacyInterface\Client::class, $miniProgram->privacyInterface);
+
         $this->assertInstanceOf(\EasySwoole\WeChat\OpenPlatform\Authorizer\MiniProgram\QrCodeJump\Client::class, $miniProgram->qrCodeJump);
 
         $this->assertInstanceOf(\EasySwoole\WeChat\OpenPlatform\Authorizer\MiniProgram\Setting\Client::class, $miniProgram->setting);