Fix OpenPlatform component custom parameters. (overtrue#152)

Mbicyalylechaon · Mar 3, 2020 · 1e21413 · 1e21413
1 parent a18f195
commit 1e21413
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/Providers/WeChatProvider.php b/src/Providers/WeChatProvider.php
@@ -132,7 +132,7 @@ protected function buildAuthUrlFromBase($url, $state)
     protected function getCodeFields($state = null)
     {
         if ($this->component) {
-            $this->with(['component_appid' => $this->component->getAppId()]);
+            $this->with(array_merge($this->parameters, ['component_appid' => $this->component->getAppId()]));
         }
 
         return array_merge([

diff --git a/tests/WechatProviderTest.php b/tests/WechatProviderTest.php
@@ -70,6 +70,18 @@ public function testOpenPlatformComponent()
 
         $this->assertSame('https://api.weixin.qq.com/sns/oauth2/component/access_token', $provider->tokenUrl());
     }
+
+    public function testOpenPlatformComponentWithCustomParameters()
+    {
+        $provider = new WeChatProvider(Request::create('foo'), 'client_id', null, 'redirect-url');
+        $provider->component(new WeChatComponent());
+        $provider->with(['foo' => 'bar']);
+
+        $fields = $provider->codeFields('wechat-state');
+
+        $this->assertArrayHasKey('foo', $fields);
+        $this->assertSame('bar', $fields['foo']);
+    }
 }
 
 trait ProviderTrait