|
@@ -5,6 +5,7 @@ namespace App\Http\Middleware;
|
|
use App\Modules\User\Services\QappUserService;
|
|
use App\Modules\User\Services\QappUserService;
|
|
use App\Modules\User\Services\UserService;
|
|
use App\Modules\User\Services\UserService;
|
|
use Closure;
|
|
use Closure;
|
|
|
|
+use Exception;
|
|
use Illuminate\Http\Request;
|
|
use Illuminate\Http\Request;
|
|
use Tymon\JWTAuth\Exceptions\JWTException;
|
|
use Tymon\JWTAuth\Exceptions\JWTException;
|
|
use Tymon\JWTAuth\Exceptions\TokenExpiredException;
|
|
use Tymon\JWTAuth\Exceptions\TokenExpiredException;
|
|
@@ -22,7 +23,7 @@ class QuickAppGetUserFromToken extends BaseMiddleware
|
|
public function handle(Request $request, Closure $next)
|
|
public function handle(Request $request, Closure $next)
|
|
{
|
|
{
|
|
$version = $request->header('X-Version', '');
|
|
$version = $request->header('X-Version', '');
|
|
- myLog('test')->info($version);
|
|
|
|
|
|
+ myLog('test')->info('version: ' . $version);
|
|
if (!$token = $this->auth->setRequest($request)->getToken()) {
|
|
if (!$token = $this->auth->setRequest($request)->getToken()) {
|
|
return response()->error('QAPP_NOT_LOGIN');
|
|
return response()->error('QAPP_NOT_LOGIN');
|
|
}
|
|
}
|
|
@@ -30,6 +31,7 @@ class QuickAppGetUserFromToken extends BaseMiddleware
|
|
$user = $this->auth->authenticate($token);
|
|
$user = $this->auth->authenticate($token);
|
|
$send_order_id = $request->header('send-order-id', 0);
|
|
$send_order_id = $request->header('send-order-id', 0);
|
|
if ($send_order_id) {
|
|
if ($send_order_id) {
|
|
|
|
+ myLog('test')->info('send_order_id: ' . $send_order_id);
|
|
UserService::setUserSendOrderStatic($user->id, $send_order_id);
|
|
UserService::setUserSendOrderStatic($user->id, $send_order_id);
|
|
}
|
|
}
|
|
QappUserService::setGolableUserStatic($user->id);
|
|
QappUserService::setGolableUserStatic($user->id);
|
|
@@ -37,11 +39,9 @@ class QuickAppGetUserFromToken extends BaseMiddleware
|
|
return response()->error('QAPP_TOKEN_ERROR');
|
|
return response()->error('QAPP_TOKEN_ERROR');
|
|
} catch (JWTException $e) {
|
|
} catch (JWTException $e) {
|
|
return response()->error('QAPP_TOKEN_ERROR');
|
|
return response()->error('QAPP_TOKEN_ERROR');
|
|
- }
|
|
|
|
- if (!$user) {
|
|
|
|
|
|
+ } catch (Exception $e) {
|
|
return response()->error('QAPP_NOT_LOGIN');
|
|
return response()->error('QAPP_NOT_LOGIN');
|
|
}
|
|
}
|
|
- $this->events->fire('tymon.jwt.valid', $user);
|
|
|
|
return $next($request);
|
|
return $next($request);
|
|
}
|
|
}
|
|
}
|
|
}
|