Skip to content

Commit 6b7ee85

Browse files
committed
added return url redirect for authentications
1 parent 3b78f64 commit 6b7ee85

File tree

4 files changed

+32
-4
lines changed

4 files changed

+32
-4
lines changed

src/Darryldecode/Backend/Base/Middleware/Authenticate.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@ public function handle($request, Closure $next)
3838
if ($request->ajax()) {
3939
return response('Unauthorized.', 401);
4040
} else {
41-
return Helpers::redirectLogin();
41+
42+
$returnURL = array('ru'=>$request->path());
43+
44+
return Helpers::redirectLogin($returnURL);
4245
}
4346
}
4447

src/Darryldecode/Backend/Components/Auth/Controllers/AuthController.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,13 @@ public function postLogin(Request $request)
3636
{
3737
$credentials = $request->only('email', 'password');
3838

39-
if (Auth::attempt($credentials, $request->has('remember'))) {
39+
if (Auth::attempt($credentials, $request->has('remember')))
40+
{
41+
if( $request->get('ru') != '' )
42+
{
43+
return redirect()->intended($request->get('ru'));
44+
}
45+
4046
return redirect()->intended(Helpers::getDashboardRoute());
4147
}
4248

src/Darryldecode/Backend/Components/Auth/Views/login.blade.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
<input type="checkbox" name="remember"> Remember Me
5555
</div>
5656
<div class="form-group">
57+
<input class="form-control" type="hidden" name="ru" value="{{(isset($_GET['ru']) ? $_GET['ru'] : '')}}">
5758
<button class="btn btn-default" type="submit">Login</button>
5859
</div>
5960
</form>

src/Darryldecode/Backend/Utility/Helpers.php

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,19 @@ public static function monthToString($month)
167167
if($month ==12) return 'December';
168168
}
169169

170+
/**
171+
* redirect to dashboard
172+
*
173+
* @param string $url
174+
* @return \Illuminate\Http\RedirectResponse
175+
*/
176+
public static function redirectBackend($url = null)
177+
{
178+
if( is_null($url) ) self::redirectDashboard();
179+
180+
return redirect()->intended(config('backend.backend.base_url').'/'.trim($url,'/'));
181+
}
182+
170183
/**
171184
* redirect to dashboard
172185
*
@@ -180,11 +193,16 @@ public static function redirectDashboard()
180193
/**
181194
* redirect to login page
182195
*
196+
* @param null|array $queryString
183197
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
184198
*/
185-
public static function redirectLogin()
199+
public static function redirectLogin($queryString = null)
186200
{
187-
return redirect(config('backend.backend.base_url').'/'.config('backend.backend.login_route'));
201+
if( is_null($queryString) ) return redirect(config('backend.backend.base_url').'/'.config('backend.backend.login_route'));
202+
203+
$queryString = http_build_query($queryString);
204+
205+
return redirect(config('backend.backend.base_url').'/'.config('backend.backend.login_route').'?'.$queryString);
188206
}
189207

190208
/**

0 commit comments

Comments
 (0)