mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-05-31 04:24:33 -04:00
Updates for phpstan + stripe phone
This commit is contained in:
parent
772ede661d
commit
d21cc3f70d
@ -12,37 +12,37 @@
|
|||||||
|
|
||||||
namespace App\Http\Controllers\Auth;
|
namespace App\Http\Controllers\Auth;
|
||||||
|
|
||||||
use Google_Client;
|
|
||||||
use App\Models\User;
|
|
||||||
use App\Utils\Ninja;
|
|
||||||
use App\Models\Account;
|
|
||||||
use App\Libraries\MultiDB;
|
|
||||||
use App\Utils\TruthSource;
|
|
||||||
use Microsoft\Graph\Model;
|
|
||||||
use App\Models\CompanyUser;
|
|
||||||
use App\Models\CompanyToken;
|
|
||||||
use Illuminate\Http\Request;
|
|
||||||
use App\Libraries\OAuth\OAuth;
|
|
||||||
use App\Events\User\UserLoggedIn;
|
|
||||||
use Illuminate\Http\JsonResponse;
|
|
||||||
use PragmaRX\Google2FA\Google2FA;
|
|
||||||
use App\Jobs\Account\CreateAccount;
|
|
||||||
use Illuminate\Support\Facades\Auth;
|
|
||||||
use App\Utils\Traits\User\LoginCache;
|
|
||||||
use Illuminate\Support\Facades\Cache;
|
|
||||||
use Turbo124\Beacon\Facades\LightLogs;
|
|
||||||
use App\Http\Controllers\BaseController;
|
|
||||||
use App\Jobs\Company\CreateCompanyToken;
|
|
||||||
use Illuminate\Support\Facades\Response;
|
|
||||||
use Laravel\Socialite\Facades\Socialite;
|
|
||||||
use App\Http\Requests\Login\LoginRequest;
|
|
||||||
use App\Libraries\OAuth\Providers\Google;
|
|
||||||
use Illuminate\Database\Eloquent\Builder;
|
|
||||||
use App\DataMapper\Analytics\LoginFailure;
|
use App\DataMapper\Analytics\LoginFailure;
|
||||||
use App\DataMapper\Analytics\LoginSuccess;
|
use App\DataMapper\Analytics\LoginSuccess;
|
||||||
use App\Utils\Traits\UserSessionAttributes;
|
use App\Events\User\UserLoggedIn;
|
||||||
|
use App\Http\Controllers\BaseController;
|
||||||
|
use App\Http\Requests\Login\LoginRequest;
|
||||||
|
use App\Jobs\Account\CreateAccount;
|
||||||
|
use App\Jobs\Company\CreateCompanyToken;
|
||||||
|
use App\Libraries\MultiDB;
|
||||||
|
use App\Libraries\OAuth\OAuth;
|
||||||
|
use App\Libraries\OAuth\Providers\Google;
|
||||||
|
use App\Models\Account;
|
||||||
|
use App\Models\CompanyToken;
|
||||||
|
use App\Models\CompanyUser;
|
||||||
|
use App\Models\User;
|
||||||
use App\Transformers\CompanyUserTransformer;
|
use App\Transformers\CompanyUserTransformer;
|
||||||
|
use App\Utils\Ninja;
|
||||||
|
use App\Utils\Traits\User\LoginCache;
|
||||||
|
use App\Utils\Traits\UserSessionAttributes;
|
||||||
|
use App\Utils\TruthSource;
|
||||||
|
use Google_Client;
|
||||||
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
use Illuminate\Foundation\Auth\AuthenticatesUsers;
|
use Illuminate\Foundation\Auth\AuthenticatesUsers;
|
||||||
|
use Illuminate\Http\JsonResponse;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
use Illuminate\Support\Facades\Auth;
|
||||||
|
use Illuminate\Support\Facades\Cache;
|
||||||
|
use Illuminate\Support\Facades\Response;
|
||||||
|
use Laravel\Socialite\Facades\Socialite;
|
||||||
|
use Microsoft\Graph\Model;
|
||||||
|
use PragmaRX\Google2FA\Google2FA;
|
||||||
|
use Turbo124\Beacon\Facades\LightLogs;
|
||||||
|
|
||||||
class LoginController extends BaseController
|
class LoginController extends BaseController
|
||||||
{
|
{
|
||||||
@ -418,7 +418,7 @@ class LoginController extends BaseController
|
|||||||
->setReturnType(Model\User::class)
|
->setReturnType(Model\User::class)
|
||||||
->execute();
|
->execute();
|
||||||
|
|
||||||
nlog($user);
|
nlog($user);
|
||||||
|
|
||||||
if ($user) {
|
if ($user) {
|
||||||
$account = request()->input('account');
|
$account = request()->input('account');
|
||||||
@ -641,8 +641,9 @@ class LoginController extends BaseController
|
|||||||
$parameters = ['response_type' => 'code', 'redirect_uri' => config('ninja.app_url') . "/auth/microsoft"];
|
$parameters = ['response_type' => 'code', 'redirect_uri' => config('ninja.app_url') . "/auth/microsoft"];
|
||||||
}
|
}
|
||||||
|
|
||||||
if(request()->hasHeader('X-REACT') || request()->query('react'))
|
if(request()->hasHeader('X-REACT') || request()->query('react')) {
|
||||||
Cache::put("react_redir:".auth()->user()?->account->key, 'true', 300);
|
Cache::put("react_redir:".auth()->user()?->account->key, 'true', 300);
|
||||||
|
}
|
||||||
|
|
||||||
if (request()->has('code')) {
|
if (request()->has('code')) {
|
||||||
return $this->handleProviderCallback($provider);
|
return $this->handleProviderCallback($provider);
|
||||||
@ -699,7 +700,7 @@ class LoginController extends BaseController
|
|||||||
$request_from_react = Cache::pull("react_redir:".auth()->user()?->account?->key);
|
$request_from_react = Cache::pull("react_redir:".auth()->user()?->account?->key);
|
||||||
|
|
||||||
// if($request_from_react)
|
// if($request_from_react)
|
||||||
$redirect_url = config('ninja.react_url')."/#/settings/user_details/connect";
|
$redirect_url = config('ninja.react_url')."/#/settings/user_details/connect";
|
||||||
|
|
||||||
return redirect($redirect_url);
|
return redirect($redirect_url);
|
||||||
}
|
}
|
||||||
|
@ -307,6 +307,7 @@ class ACH
|
|||||||
|
|
||||||
switch ($e) {
|
switch ($e) {
|
||||||
case $e instanceof CardException:
|
case $e instanceof CardException:
|
||||||
|
/** @var CardException $e */
|
||||||
$data['status'] = $e->getHttpStatus();
|
$data['status'] = $e->getHttpStatus();
|
||||||
$data['error_type'] = $e->getError()->type;
|
$data['error_type'] = $e->getError()->type;
|
||||||
$data['error_code'] = $e->getError()->code;
|
$data['error_code'] = $e->getError()->code;
|
||||||
|
@ -87,7 +87,9 @@ class Alipay
|
|||||||
return $this->processSuccesfulRedirect($pi);
|
return $this->processSuccesfulRedirect($pi);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($pi->status == 'requires_source_action') {
|
/** @phpstan-ignore-next-line */
|
||||||
|
if ($pi->status == 'requires_source_action' && $pi->next_action->alipay_handle_redirect) {
|
||||||
|
/** @phpstan-ignore-next-line */
|
||||||
return redirect($pi->next_action->alipay_handle_redirect->url);
|
return redirect($pi->next_action->alipay_handle_redirect->url);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -112,7 +112,7 @@ class ImportCustomers
|
|||||||
$client->address2 = $customer->address->line2 ? $customer->address->line2 : '';
|
$client->address2 = $customer->address->line2 ? $customer->address->line2 : '';
|
||||||
$client->city = $customer->address->city ? $customer->address->city : '';
|
$client->city = $customer->address->city ? $customer->address->city : '';
|
||||||
$client->state = $customer->address->state ? $customer->address->state : '';
|
$client->state = $customer->address->state ? $customer->address->state : '';
|
||||||
$client->phone = $customer->address->phone ? $customer->phone : '';
|
$client->phone = $customer->phone ?? '';
|
||||||
|
|
||||||
if ($customer->address->country) {
|
if ($customer->address->country) {
|
||||||
$country = Country::query()->where('iso_3166_2', $customer->address->country)->first();
|
$country = Country::query()->where('iso_3166_2', $customer->address->country)->first();
|
||||||
|
@ -21,6 +21,7 @@ parameters:
|
|||||||
universalObjectCratesClasses:
|
universalObjectCratesClasses:
|
||||||
- App\DataMapper\Tax\RuleInterface
|
- App\DataMapper\Tax\RuleInterface
|
||||||
- App\DataMapper\FeesAndLimits
|
- App\DataMapper\FeesAndLimits
|
||||||
|
- \Postmark\Models\DynamicResponseModel
|
||||||
reportUnmatchedIgnoredErrors: false
|
reportUnmatchedIgnoredErrors: false
|
||||||
ignoreErrors:
|
ignoreErrors:
|
||||||
- '#Array has 2 duplicate keys with value#'
|
- '#Array has 2 duplicate keys with value#'
|
||||||
|
Loading…
x
Reference in New Issue
Block a user