Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use id_token for apple when deleting companies

Browse Source
This commit is contained in:
David Bomba 2022-12-19 21:07:38 +11:00
parent db89751ebf
commit e29b08824a
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/CompanyController.php
View File

@ -521,7 +521,7 @@ class CompanyController extends BaseController
$nmo->company = $other_company;
$nmo->settings = $other_company->settings;
$nmo->to_user = auth()->user();
NinjaMailerJob::dispatch($nmo, true);
(new NinjaMailerJob($nmo, true))->handle();
$company->delete();

12
app/Http/Middleware/PasswordProtection.php
View File

@ -18,6 +18,7 @@ use Illuminate\Http\Request;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Str;
use Laravel\Socialite\Facades\Socialite;
use stdClass;
class PasswordProtection
@ -111,7 +112,18 @@ class PasswordProtection
return $next($request);
}
}
elseif(auth()->user()->oauth_provider_id == 'apple')
{
$user = Socialite::driver('apple')->userFromToken($request->header('X-API-OAUTH-PASSWORD'));
if($user && ($user->email == auth()->user()->email)){
Cache::put(auth()->user()->hashed_id.'_'.auth()->user()->account_id.'_logged_in', Str::random(64), $timeout);
return $next($request);
}
}
return response()->json($error, 412);