mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-05-24 02:14:21 -04:00
Apple OAuth
This commit is contained in:
David Bomba
parent
09d5b7c38f
commit
0ae322798d
@ -334,11 +334,12 @@ class LoginController extends BaseController
|
||||
} elseif (request()->input('provider') == 'microsoft') {
|
||||
return $this->handleMicrosoftOauth();
|
||||
} elseif (request()->input('provider') == 'apple') {
|
||||
// if (request()->has('token')) {
|
||||
// return $this->handleSocialiteLogin('apple', request()->get('token'));
|
||||
// } else {
|
||||
// $message = 'Token is missing for the apple login';
|
||||
// }
|
||||
if (request()->has('token') || request()->has('auth_code')) {
|
||||
$token = request()->has('token') ? request()->input('token') : request()->input('auth_code');
|
||||
return $this->handleSocialiteLogin('apple', $token);
|
||||
} else {
|
||||
$message = 'Token is missing for the apple login';
|
||||
}
|
||||
}
|
||||
|
||||
return response()
|
||||
@ -355,6 +356,7 @@ class LoginController extends BaseController
|
||||
private function handleSocialiteLogin($provider, $token)
|
||||
{
|
||||
$user = $this->getSocialiteUser($provider, $token);
|
||||
nlog($user);
|
||||
if ($user) {
|
||||
return $this->loginOrCreateFromSocialite($user, $provider);
|
||||
}
|
||||
|
||||
61
composer.lock
generated
61
composer.lock
generated
@ -434,16 +434,16 @@
|
||||
},
|
||||
{
|
||||
"name": "aws/aws-sdk-php",
|
||||
"version": "3.230.0",
|
||||
"version": "3.231.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/aws/aws-sdk-php.git",
|
||||
"reference": "474f351aff22cc7a61016c1de79d7d2fe6c80d2b"
|
||||
"reference": "9a7c2a8c4b7f95074749e1a7b575e6b4486bdcab"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/474f351aff22cc7a61016c1de79d7d2fe6c80d2b",
|
||||
"reference": "474f351aff22cc7a61016c1de79d7d2fe6c80d2b",
|
||||
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/9a7c2a8c4b7f95074749e1a7b575e6b4486bdcab",
|
||||
"reference": "9a7c2a8c4b7f95074749e1a7b575e6b4486bdcab",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -461,6 +461,7 @@
|
||||
"andrewsville/php-token-reflection": "^1.4",
|
||||
"aws/aws-php-sns-message-validator": "~1.0",
|
||||
"behat/behat": "~3.0",
|
||||
"composer/composer": "^1.10.22",
|
||||
"doctrine/cache": "~1.4",
|
||||
"ext-dom": "*",
|
||||
"ext-openssl": "*",
|
||||
@ -519,9 +520,9 @@
|
||||
"support": {
|
||||
"forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
|
||||
"issues": "https://github.com/aws/aws-sdk-php/issues",
|
||||
"source": "https://github.com/aws/aws-sdk-php/tree/3.230.0"
|
||||
"source": "https://github.com/aws/aws-sdk-php/tree/3.231.2"
|
||||
},
|
||||
"time": "2022-07-05T18:19:42+00:00"
|
||||
"time": "2022-07-08T18:16:11+00:00"
|
||||
},
|
||||
{
|
||||
"name": "bacon/bacon-qr-code",
|
||||
@ -2244,16 +2245,16 @@
|
||||
},
|
||||
{
|
||||
"name": "gocardless/gocardless-pro",
|
||||
"version": "4.17.0",
|
||||
"version": "4.18.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/gocardless/gocardless-pro-php.git",
|
||||
"reference": "59ccdcbfbbf1a18b55c749ed121137dce6d6f3ae"
|
||||
"reference": "dee046abbb7a37ef0a60bb03e2a467afc79a92a5"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/gocardless/gocardless-pro-php/zipball/59ccdcbfbbf1a18b55c749ed121137dce6d6f3ae",
|
||||
"reference": "59ccdcbfbbf1a18b55c749ed121137dce6d6f3ae",
|
||||
"url": "https://api.github.com/repos/gocardless/gocardless-pro-php/zipball/dee046abbb7a37ef0a60bb03e2a467afc79a92a5",
|
||||
"reference": "dee046abbb7a37ef0a60bb03e2a467afc79a92a5",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -2293,9 +2294,9 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/gocardless/gocardless-pro-php/issues",
|
||||
"source": "https://github.com/gocardless/gocardless-pro-php/tree/v4.17.0"
|
||||
"source": "https://github.com/gocardless/gocardless-pro-php/tree/v4.18.0"
|
||||
},
|
||||
"time": "2022-06-29T12:55:58+00:00"
|
||||
"time": "2022-07-08T14:38:42+00:00"
|
||||
},
|
||||
{
|
||||
"name": "google/apiclient",
|
||||
@ -2369,16 +2370,16 @@
|
||||
},
|
||||
{
|
||||
"name": "google/apiclient-services",
|
||||
"version": "v0.256.0",
|
||||
"version": "v0.257.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/googleapis/google-api-php-client-services.git",
|
||||
"reference": "122e51021eb19b53f831904918460671d1e7259d"
|
||||
"reference": "ae109202ee831a1fb70ba824181852e6179c848b"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/122e51021eb19b53f831904918460671d1e7259d",
|
||||
"reference": "122e51021eb19b53f831904918460671d1e7259d",
|
||||
"url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/ae109202ee831a1fb70ba824181852e6179c848b",
|
||||
"reference": "ae109202ee831a1fb70ba824181852e6179c848b",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -2407,9 +2408,9 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/googleapis/google-api-php-client-services/issues",
|
||||
"source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.256.0"
|
||||
"source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.257.0"
|
||||
},
|
||||
"time": "2022-07-04T01:10:37+00:00"
|
||||
"time": "2022-07-08T01:28:13+00:00"
|
||||
},
|
||||
{
|
||||
"name": "google/auth",
|
||||
@ -5123,16 +5124,16 @@
|
||||
},
|
||||
{
|
||||
"name": "microsoft/microsoft-graph",
|
||||
"version": "1.70.0",
|
||||
"version": "1.71.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/microsoftgraph/msgraph-sdk-php.git",
|
||||
"reference": "7d85293be037c4a2891a03cb953eb204bf68387e"
|
||||
"reference": "f17ae778614d6ebf326d33292d09519d39b017a8"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/microsoftgraph/msgraph-sdk-php/zipball/7d85293be037c4a2891a03cb953eb204bf68387e",
|
||||
"reference": "7d85293be037c4a2891a03cb953eb204bf68387e",
|
||||
"url": "https://api.github.com/repos/microsoftgraph/msgraph-sdk-php/zipball/f17ae778614d6ebf326d33292d09519d39b017a8",
|
||||
"reference": "f17ae778614d6ebf326d33292d09519d39b017a8",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -5168,9 +5169,9 @@
|
||||
"homepage": "https://developer.microsoft.com/en-us/graph",
|
||||
"support": {
|
||||
"issues": "https://github.com/microsoftgraph/msgraph-sdk-php/issues",
|
||||
"source": "https://github.com/microsoftgraph/msgraph-sdk-php/tree/1.70.0"
|
||||
"source": "https://github.com/microsoftgraph/msgraph-sdk-php/tree/1.71.0"
|
||||
},
|
||||
"time": "2022-06-21T13:37:02+00:00"
|
||||
"time": "2022-07-07T10:04:08+00:00"
|
||||
},
|
||||
{
|
||||
"name": "mollie/mollie-api-php",
|
||||
@ -7659,16 +7660,16 @@
|
||||
},
|
||||
{
|
||||
"name": "psy/psysh",
|
||||
"version": "v0.11.6",
|
||||
"version": "v0.11.7",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/bobthecow/psysh.git",
|
||||
"reference": "3f5b5f8aaa979fbd0d1783173f4c82ad529fe621"
|
||||
"reference": "77fc7270031fbc28f9a7bea31385da5c4855cb7a"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/3f5b5f8aaa979fbd0d1783173f4c82ad529fe621",
|
||||
"reference": "3f5b5f8aaa979fbd0d1783173f4c82ad529fe621",
|
||||
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/77fc7270031fbc28f9a7bea31385da5c4855cb7a",
|
||||
"reference": "77fc7270031fbc28f9a7bea31385da5c4855cb7a",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -7729,9 +7730,9 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/bobthecow/psysh/issues",
|
||||
"source": "https://github.com/bobthecow/psysh/tree/v0.11.6"
|
||||
"source": "https://github.com/bobthecow/psysh/tree/v0.11.7"
|
||||
},
|
||||
"time": "2022-07-03T16:40:23+00:00"
|
||||
"time": "2022-07-07T13:49:11+00:00"
|
||||
},
|
||||
{
|
||||
"name": "ralouphie/getallheaders",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user