namespace BookStack\Http\Controllers\Auth;
use Activity;
+use BookStack\Actions\ActivityType;
use BookStack\Auth\Access\SocialAuthService;
use BookStack\Exceptions\LoginAttemptEmailNeededException;
use BookStack\Exceptions\LoginAttemptException;
-use BookStack\Exceptions\UserRegistrationException;
use BookStack\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\AuthenticatesUsers;
use Illuminate\Http\Request;
$this->socialAuthService = $socialAuthService;
$this->redirectPath = url('/');
$this->redirectAfterLogout = url('/login');
- parent::__construct();
}
public function username()
]);
}
+ // Store the previous location for redirect after login
$previous = url()->previous('');
- if (setting('app-public') && $previous && $previous !== url('/login')) {
- redirect()->setIntendedUrl($previous);
+ if ($previous && $previous !== url('/login') && setting('app-public')) {
+ $isPreviousFromInstance = (strpos($previous, url('/')) === 0);
+ if ($isPreviousFromInstance) {
+ redirect()->setIntendedUrl($previous);
+ }
}
return view('auth.login', [
}
}
+ $this->logActivity(ActivityType::AUTH_LOGIN, $user);
return redirect()->intended($this->redirectPath());
}