mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
separate API logic
This commit is contained in:
parent
45eed7479c
commit
09ccb88784
@ -75,6 +75,12 @@ class AuthController extends Controller {
|
|||||||
|
|
||||||
public function postLoginWrapper(Request $request)
|
public function postLoginWrapper(Request $request)
|
||||||
{
|
{
|
||||||
|
/** If request is from API*/
|
||||||
|
if($request->api_secret)
|
||||||
|
{
|
||||||
|
return $this->postLoginWrapperAPI($request);
|
||||||
|
}
|
||||||
|
|
||||||
$userId = Auth::check() ? Auth::user()->id : null;
|
$userId = Auth::check() ? Auth::user()->id : null;
|
||||||
$user = User::where('email', '=', $request->input('email'))->first();
|
$user = User::where('email', '=', $request->input('email'))->first();
|
||||||
|
|
||||||
@ -99,12 +105,7 @@ class AuthController extends Controller {
|
|||||||
}
|
}
|
||||||
Session::put(SESSION_USER_ACCOUNTS, $users);
|
Session::put(SESSION_USER_ACCOUNTS, $users);
|
||||||
|
|
||||||
if ($request->create_token) {
|
|
||||||
if ( ! env(API_SECRET) || $request->api_secret !== env(API_SECRET)) {
|
|
||||||
return 'Invalid secret';
|
|
||||||
}
|
|
||||||
return $this->accountRepo->createToken($request->token_name);
|
|
||||||
}
|
|
||||||
} elseif ($user) {
|
} elseif ($user) {
|
||||||
$user->failed_logins = $user->failed_logins + 1;
|
$user->failed_logins = $user->failed_logins + 1;
|
||||||
$user->save();
|
$user->save();
|
||||||
@ -113,6 +114,26 @@ class AuthController extends Controller {
|
|||||||
return $response;
|
return $response;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function postLoginWrapperAPI(Request $request)
|
||||||
|
{
|
||||||
|
/**Auth check*/
|
||||||
|
|
||||||
|
/**Success*/
|
||||||
|
/* send back user object along with account token if it exists,
|
||||||
|
create token only if it does not exist*/
|
||||||
|
|
||||||
|
/**Failure*/
|
||||||
|
/* return json with failure message */
|
||||||
|
|
||||||
|
if ($request->create_token) {
|
||||||
|
if ( ! env(API_SECRET) || $request->api_secret !== env(API_SECRET)) {
|
||||||
|
return 'Invalid secret';
|
||||||
|
}
|
||||||
|
return $this->accountRepo->createToken($request->token_name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public function getLogoutWrapper()
|
public function getLogoutWrapper()
|
||||||
{
|
{
|
||||||
if (Auth::check() && !Auth::user()->registered) {
|
if (Auth::check() && !Auth::user()->registered) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user