composer.json

@@ -14,5 +14,11 @@
     "require": {
         "illuminate/support": "^5.5",
         "paidian/json-rpc": "~1.1"
+    },
+    "repositories": {
+        "php-json-rpc": {
+            "type": "vcs",
+            "url": "git@git.int.haowumc.com:composer/php-json-rpc.git"
+        }
     }
 }

config/auth.php

@@ -34,9 +34,5 @@ return [
             'id' => '100005',
             'secret' => env('AUTH_XIAOKE_SECRET','123456'),
         ],
-        'finance' => [
-             'id' => '100003',
-            'secret' => env('AUTH_FINANCE_SECRET','123456'),
-        ],
     ],
 ];

src/Auth.php

@@ -102,15 +102,6 @@ class Auth
                 $this->id = $this->config['apps']['payment']['id'];
                 $this->secret = $this->config['apps']['payment']['secret'];
                 break;
-            case 'xiaoke':
-            case 'xiaoke_api':
-                $this->id = $this->config['apps']['xiaoke']['id'];
-                $this->secret = $this->config['apps']['xiaoke']['secret'];
-                break;
-            case 'finance':
-                $this->id = $this->config['apps']['finance']['id'];
-                $this->secret = $this->config['apps']['finance']['secret'];
-                break;
 
         }
         return $this;

src/Middleware/Authenticate.php

@@ -41,11 +41,8 @@ class Authenticate
     {
         //登录状态检测
         if ($this->auth->guard($guard)->guest()) {
-            $redirect = $request->input('redirect');
+            $redirect = $request->input('redirect', $request->header('referer'));
-            if ($request->isXmlHttpRequest()) {
+//            if ($request->isXmlHttpRequest()) {
-                if( $redirect == null ){
-                    $redirect = $request->header('referer');
-                }
                 return response()->json([
                     'code' => config('pdauth.code.unauthorized', 401),
                     'msg' => 'Unauthorized',
@@ -53,12 +50,9 @@ class Authenticate
                         'url' => app('pd.auth')->connect($redirect),
                     ],
                 ],401);
-            } else {
+//            } else {
-                if( $redirect == null ){
+//                return redirect(app('pd.auth')->connect($redirect));
-                    $redirect = $request->getSchemeAndHttpHost()."/api/auth/token.html";
+//            }
-                }
-                return redirect(app('pd.auth')->connect($redirect));
-            }
         }
 
         return $next($request);

src/PdAuthServiceProvider.php

@@ -3,7 +3,6 @@
 namespace PdAuth;
 
 use Illuminate\Contracts\Encryption\DecryptException;
-use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\ServiceProvider;
 use PdAuth\Middleware\Authenticate;
@@ -70,14 +69,6 @@ class PdAuthServiceProvider extends ServiceProvider
             ])->withCookie($cookie);
         });
 
-        $this->app['router']->get('api/auth/token.html', function (Request $request) {
-            $code = $request->input('pd_code');
-            $id = $request->input('app_id');
-            $token = app('pd.auth')->choose(null, $id)->getAccessToken($code);
-            $cookie = new Cookie(Authenticate::CookieName, $token['access_token'], strtotime($token['expired_at']));
-            return RedirectResponse::create('/')->withCookie($cookie);
-        });
-
         $this->app['router']->get('api/auth/logout', function (Request $request) {
             $cookie = new Cookie(Authenticate::CookieName, '', time());
             return response()->json([