增加兼容开放平台的 web app等登录方式

Author: xutl

src/Wechat.php

@@ -7,7 +7,6 @@
 
 namespace xutl\wechat;
 
-
 use Yii;
 use yii\base\Component;
 use yii\base\InvalidConfigException;

src/oauth/OAuth.php

@@ -34,6 +34,11 @@ class OAuth extends OAuth2
      */
     public $apiBaseUrl = 'https://api.weixin.qq.com';
 
+    /**
+     * @var bool 是否使用openid
+     */
+    public $useOpenId = true;
+
     /**
      * 初始化组件
      */
@@ -47,6 +52,24 @@ public function init()
         }
     }
 
+    /**
+     * @inheritdoc
+     */
+    protected function defaultNormalizeUserAttributeMap()
+    {
+        if ($this->useOpenId) {
+            return [
+                'id' => 'openid',
+                'username' => 'nickname',
+            ];
+        } else {
+            return [
+                'id' => 'unionid',
+                'username' => 'nickname',
+            ];
+        }
+    }
+
     /**
      * Composes user authorization URL.
      * @param array $params additional auth GET params.