Skip to content

Commit ee93076

Browse files
committed
Here goes nothing
1 parent 6f5b706 commit ee93076

File tree

11 files changed

+21609
-2380
lines changed

11 files changed

+21609
-2380
lines changed

.env.example

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ QUEUE_DRIVER=sync
2020

2121
GITHUB_CLIENT_ID=
2222
GITHUB_CLIENT_SECRET=
23-
GITHUB_CLIENT_CALLBACK_URL=
23+
GITHUB_CLIENT_CALLBACK_URL=https://astral.test/auth/github/callback

.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.15.1
1+
18.20.4

app/Http/Controllers/AuthController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function handleProviderCallback(Request $request)
3030
return redirect('/auth?error=true');
3131
}
3232

33-
$githubUser = Socialite::driver('github')->stateless()->user();
33+
$githubUser = Socialite::driver('github')->user();
3434
$id = $githubUser->getId();
3535
$user = User::where('github_id', $id)->first();
3636
// If no user is found, create a new one

app/Http/Middleware/TrustProxies.php

+7-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Astral\Http\Middleware;
44

5-
use Fideloper\Proxy\TrustProxies as Middleware;
5+
use Illuminate\Http\Middleware\TrustProxies as Middleware;
66
use Illuminate\Http\Request;
77

88
class TrustProxies extends Middleware
@@ -19,5 +19,10 @@ class TrustProxies extends Middleware
1919
*
2020
* @var array
2121
*/
22-
protected $headers = Request::HEADER_X_FORWARDED_ALL;
22+
protected $headers =
23+
Request::HEADER_X_FORWARDED_FOR |
24+
Request::HEADER_X_FORWARDED_HOST |
25+
Request::HEADER_X_FORWARDED_PORT |
26+
Request::HEADER_X_FORWARDED_PROTO |
27+
Request::HEADER_X_FORWARDED_AWS_ELB;
2328
}

composer.json

+11-11
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,21 @@
1010
"license": "BSD-3-Clause",
1111
"type": "project",
1212
"require": {
13-
"php": "^7.2",
14-
"doctrine/dbal": "^2.9",
15-
"fideloper/proxy": "^4.0",
16-
"guzzlehttp/guzzle": "^6.5",
17-
"laravel/framework": "^7.0",
18-
"laravel/socialite": "^4.3.2",
13+
"php": "^8.2",
14+
"doctrine/dbal": "^3.0",
15+
"guzzlehttp/guzzle": "^7.0.1",
16+
"laravel/framework": "^10.0",
17+
"laravel/socialite": "^5.6",
1918
"laravel/tinker": "^2.0",
20-
"predis/predis": "^1.1"
19+
"laravel/legacy-factories": "^1.4.0"
2120
},
2221
"require-dev": {
23-
"facade/ignition": "^2.0",
22+
"spatie/laravel-ignition": "^2.0",
2423
"filp/whoops": "~2.0",
2524
"fzaninotto/faker": "^1.4",
2625
"mockery/mockery": "~1.0",
27-
"phpunit/phpunit": "^8.5",
28-
"nunomaduro/collision": "^4.1",
26+
"phpunit/phpunit": "^10.0",
27+
"nunomaduro/collision": "^7.0",
2928
"sempro/phpunit-pretty-print": "^1.1.11"
3029
},
3130
"autoload": {
@@ -66,5 +65,6 @@
6665
"preferred-install": "dist",
6766
"sort-packages": true,
6867
"optimize-autoloader": true
69-
}
68+
},
69+
"minimum-stability": "stable"
7070
}

0 commit comments

Comments
 (0)