Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-01 02:54:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for react redirector

Browse Source
This commit is contained in:
David Bomba 2023-05-29 12:54:41 +10:00
parent 6e44503724
commit 6c00933c04
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Auth/LoginController.php
View File

@ -696,7 +696,7 @@ class LoginController extends BaseController
$redirect_url = '/#/'; $redirect_url = '/#/';
$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";

32
app/Libraries/OAuth/OAuth.php
View File

@ -71,21 +71,21 @@ class OAuth
public static function providerToString(int $social_provider): string public static function providerToString(int $social_provider): string
{ {
switch ($social_provider) { switch ($social_provider) {
case SOCIAL_GOOGLE: case self::SOCIAL_GOOGLE:
return 'google'; return 'google';
case SOCIAL_FACEBOOK: case self::SOCIAL_FACEBOOK:
return 'facebook'; return 'facebook';
case SOCIAL_GITHUB: case self::SOCIAL_GITHUB:
return 'github'; return 'github';
case SOCIAL_LINKEDIN: case self::SOCIAL_LINKEDIN:
return 'linkedin'; return 'linkedin';
case SOCIAL_TWITTER: case self::SOCIAL_TWITTER:
return 'twitter'; return 'twitter';
case SOCIAL_BITBUCKET: case self::SOCIAL_BITBUCKET:
return 'bitbucket'; return 'bitbucket';
case SOCIAL_MICROSOFT: case self::SOCIAL_MICROSOFT:
return 'microsoft'; return 'microsoft';
case SOCIAL_APPLE: case self::SOCIAL_APPLE:
return 'apple'; return 'apple';
} }
} }
@ -94,21 +94,21 @@ class OAuth
{ {
switch ($social_provider) { switch ($social_provider) {
case 'google': case 'google':
return SOCIAL_GOOGLE; return self::SOCIAL_GOOGLE;
case 'facebook': case 'facebook':
return SOCIAL_FACEBOOK; return self::SOCIAL_FACEBOOK;
case 'github': case 'github':
return SOCIAL_GITHUB; return self::SOCIAL_GITHUB;
case 'linkedin': case 'linkedin':
return SOCIAL_LINKEDIN; return self::SOCIAL_LINKEDIN;
case 'twitter': case 'twitter':
return SOCIAL_TWITTER; return self::SOCIAL_TWITTER;
case 'bitbucket': case 'bitbucket':
return SOCIAL_BITBUCKET; return self::SOCIAL_BITBUCKET;
case 'microsoft': case 'microsoft':
return SOCIAL_MICROSOFT; return self::SOCIAL_MICROSOFT;
case 'apple': case 'apple':
return SOCIAL_APPLE; return self::SOCIAL_APPLE;
} }
} }