Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-08 20:22:42 +01:00
Code Issues Releases Activity

Support OAuth login on iPhone

Browse Source
This commit is contained in:
Hillel Coren 2016-10-06 15:46:27 +03:00
parent ddea0b9cc2
commit d046679dab
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/Http/Controllers/AccountApiController.php
View File

@ -6,6 +6,7 @@ use Response;
use Cache;
use Socialite;
use Exception;
use App\Services\AuthService;
use App\Models\Account;
use App\Ninja\Repositories\AccountRepository;
use Illuminate\Http\Request;
@ -184,17 +185,29 @@ class AccountApiController extends BaseAPIController
}
public function validateOauthToken(Request $request)
public function oauthLogin(Request $request)
{
$user = false;
$token = $request->input('token');
$provider = $request->input('provider');
try {
$user = Socialite::driver($provider)->userFromToken($token);
} catch (Exception $exception) {
return $this->response($exception->getMessage());
return $this->errorResponse(['message' => $exception->getMessage()], 401);
}
return $user ? RESULT_SUCCESS : RESULT_FAILURE;
if ($user) {
$providerId = AuthService::getProviderId($provider);
$user = $this->accountRepo->findUserByOauth($providerId, $user->id);
}
if ($user) {
Auth::login($user);
return $this->processLogin($request);
} else {
sleep(ERROR_DELAY);
return $this->errorResponse(['message' => 'Invalid credentials'], 401);
}
}
}

4
app/Http/Middleware/ApiCheck.php
View File

@ -23,7 +23,9 @@ class ApiCheck {
*/
public function handle($request, Closure $next)
{
$loggingIn = $request->is('api/v1/login') || $request->is('api/v1/register');
$loggingIn = $request->is('api/v1/login')
|| $request->is('api/v1/register')
|| $request->is('api/v1/oauth_login');
$headers = Utils::getApiHeaders();
$hasApiSecret = false;

2
app/Http/routes.php
View File

@ -284,6 +284,7 @@ Route::group(['middleware' => 'api', 'prefix' => 'api/v1'], function()
{
Route::get('ping', 'AccountApiController@ping');
Route::post('login', 'AccountApiController@login');
Route::post('oauth_login', 'AccountApiController@oauthLogin');
Route::post('register', 'AccountApiController@register');
Route::get('static', 'AccountApiController@getStaticData');
Route::get('accounts', 'AccountApiController@show');
@ -308,7 +309,6 @@ Route::group(['middleware' => 'api', 'prefix' => 'api/v1'], function()
Route::post('update_notifications', 'AccountApiController@updatePushNotifications');
Route::get('dashboard', 'DashboardApiController@index');
Route::resource('documents', 'DocumentAPIController');
Route::post('validate_outh_token', 'AccountApiController@validateOauthToken');
// Vendor
Route::resource('vendors', 'VendorApiController');