Skip to content

Commit 560b6bf

Browse files
committed
Bugfix for redirect url.
1 parent a808da2 commit 560b6bf

File tree

1 file changed

+15
-1
lines changed

1 file changed

+15
-1
lines changed

src/Middleware/OAuthAuthenticate.php

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,26 @@ public function handle($request, Closure $next, $guard = null)
2525
if ($request->has('state') && $request->has('code')) {
2626
session(['wechat.oauth_user' => $wechat->oauth->user()]);
2727

28-
return redirect()->to(url($request->url().'?'.array_except($request->query(), ['code', 'state'])));
28+
return redirect()->to($this->getTargetUrl($request));
2929
}
3030

3131
return $wechat->oauth->redirect($request->fullUrl());
3232
}
3333

3434
return $next($request);
3535
}
36+
37+
/**
38+
* Build the target business url.
39+
*
40+
* @param Request $request
41+
*
42+
* @return string
43+
*/
44+
public function getTargetUrl($request)
45+
{
46+
$queries = array_except($request->query(), ['code', 'state']);
47+
48+
return $request->url().(empty($queries) ? '' : '?'.http_build_query($queries));
49+
}
3650
}

0 commit comments

Comments
 (0)