Make middle-ware compatible with wechat work service. (overtrue#307)

* Make middle-ware compatible with wechat work service.

add type parameter and make it

* StyleCI

StyleCI

Author: ac1982

src/Middleware/OAuthAuthenticate.php

@@ -14,11 +14,10 @@
 use Closure;
 use http\Env\Request;
 use Illuminate\Support\Arr;
-use Illuminate\Support\Str;
 use Overtrue\LaravelWeChat\Events\WeChatUserAuthorized;
 
 /**
- * Class OAuthAuthenticate.
+ * Class OAuthAuthenticate: 微信公众号, 企业微信的网页应用。
  */
 class OAuthAuthenticate
 {
@@ -27,26 +26,24 @@ class OAuthAuthenticate
      *
      * @param \Illuminate\Http\Request $request
      * @param \Closure                 $next
-     * @param string|null              $scopes
+     * @param string|null              $scope
+     * @param string|null              $type    : service(服务号), subscription(订阅号), work(企业微信)
      *
      * @return mixed
      */
-    public function handle($request, Closure $next, $account = 'default', $scopes = null)
+    public function handle($request, Closure $next, $account = 'default', $scope = 'snsapi_base', $type = 'service')
     {
-        // $account 与 $scopes 写反的情况
-        if (is_array($scopes) || (\is_string($account) && Str::is('snsapi_*', $account))) {
-            list($account, $scopes) = [$scopes, $account];
-            $account || $account = 'default';
-        }
-
         $isNewSession = false;
-        $sessionKey = \sprintf('wechat.oauth_user.%s', $account);
-        $config = config(\sprintf('wechat.official_account.%s', $account), []);
-        $officialAccount = app(\sprintf('wechat.official_account.%s', $account));
-        $scopes = $scopes ?: Arr::get($config, 'oauth.scopes', ['snsapi_base']);
-
-        if (is_string($scopes)) {
-            $scopes = array_map('trim', explode(',', $scopes));
+        //保证兼容性
+        $class = ('work' !== $type) ? 'wechat' : 'work';
+        $prefix = ('work' !== $type) ? 'official_account' : 'work';
+        $sessionKey = \sprintf($class.'.oauth_user.%s', $account);
+        $config = config(\sprintf('wechat.'.$prefix.'.%s', $account), []);
+        $officialAccount = app(\sprintf('wechat.'.$prefix.'.%s', $account));
+        $scope = $scope ?: Arr::get($config, 'oauth.scopes', ['snsapi_base']);
+
+        if (is_string($scope)) {
+            $scope = array_map('trim', explode(',', $scope));
         }
 
         $session = session($sessionKey, []);
@@ -63,7 +60,7 @@ public function handle($request, Closure $next, $account = 'default', $scopes =
 
             session()->forget($sessionKey);
 
-            return $officialAccount->oauth->scopes($scopes)->redirect($request->fullUrl());
+            return $officialAccount->oauth->scopes($scope)->redirect($request->fullUrl());
         }
 
         event(new WeChatUserAuthorized(session($sessionKey), $isNewSession, $account));