Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Github Action fix #2258

Merged
merged 16 commits into from
Aug 9, 2024
3 changes: 3 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ APP_KEY=base64:ilyL17PxJTnZXqNBVr+P36ARu9NF7HgqJ87ciGWvo5E=
APP_DEBUG=false
APP_TIMEZONE=UTC
APP_URL=http://localhost
VITE_APP_URL=http://localhost

APP_LOCALE=en
APP_FALLBACK_LOCALE=en
Expand Down Expand Up @@ -41,3 +42,5 @@ ADMIN_EMAIL=admin@codeweek.test
SESSION_ENCRYPT=false
SESSION_PATH=/
SESSION_DOMAIN=null

AUTH_MODEL=App\User
11 changes: 6 additions & 5 deletions .github/workflows/laravel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,15 @@ jobs:
- name: Copy composer.json
run: php -r "copy('composer-test.json', 'composer.json');"
- name: Install Dependencies
env:
NOVA_USERNAME: ${{ secrets.NOVA_USERNAME }}
NOVA_PASSWORD: ${{ secrets.NOVA_PASSWORD }}
run: |
php --version
composer config http-basic.nova.laravel.com ${{ secrets.NOVA_USERNAME }} ${{ secrets.NOVA_PASSWORD }}
composer config http-basic.nova.laravel.com $NOVA_USERNAME $NOVA_PASSWORD
composer install -n --prefer-dist
- name: Generate key
run: php artisan key:generate
- name: generate vue-i18n
run: php artisan vue-i18n:generate
- name: Directory Permissions
run: chmod -R 777 storage bootstrap/cache
- name: Create Database
Expand All @@ -41,8 +42,8 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 16
- run: npm install && npm run dev
node-version: 21
- run: npm install && npm run build
- name: Execute tests (Unit and Feature tests) via PHPUnit
env:
DB_CONNECTION: sqlite
Expand Down
11 changes: 5 additions & 6 deletions app/Http/Controllers/Auth/LoginController.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,13 @@ public function redirectToProvider($provider): RedirectResponse
*/
public function handleProviderCallback($provider): RedirectResponse
{
// if ('twitter' == $provider){
$socialUser = Socialite::driver($provider)->user();
// } else{
// $socialUser = Socialite::driver($provider)->stateless()->user();
// }
$allowed_providers = ['twitter', 'github', 'google', 'facebook'];

$this->loginUser($provider, $socialUser);
if (in_array($provider, $allowed_providers)) {
$socialUser = Socialite::driver($provider)->user();

$this->loginUser($provider, $socialUser);
}
return redirect()->intended('/');

}
Expand Down
3 changes: 1 addition & 2 deletions bootstrap/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
\Torann\GeoIP\GeoIPServiceProvider::class,
\MartinLindhe\VueInternationalizationGenerator\GeneratorProvider::class,
\willvincent\Feeds\FeedsServiceProvider::class,
\Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class,
\SocialiteProviders\Manager\ServiceProvider::class,
\Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class
])
->withRouting(
web: __DIR__.'/../routes/web.php',
Expand Down
54 changes: 27 additions & 27 deletions composer-test.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,49 +8,49 @@
"license": "MIT",
"type": "project",
"require": {
"php": "^8.1",
"php": "^8.2",
"ext-json": "*",
"ext-zip": "*",
"aws/aws-sdk-php": "^3.131",
"doctrine/dbal": "^3.5",
"guzzlehttp/guzzle": "^7.2",
"intervention/image": "^2.7",
"laravel-lang/lang": "^12.18",
"laravel/framework": "^10.48",
"laravel/helpers": "^1.6",
"laravel/framework": "^11.5",
"laravel/helpers": "^1.7",
"laravel/legacy-factories": "^1.4",
"laravel/sanctum": "^3.3",
"laravel/socialite": "^5.6",
"laravel/tinker": "^2.8",
"laravel/sanctum": "^4.0",
"laravel/socialite": "^5.11",
"laravel/tinker": "^2.9",
"laravel/ui": "^4.5",
"league/flysystem-aws-s3-v3": "^3.0",
"livewire/livewire": "^2.11",
"livewire/livewire": "^3.3",
"maatwebsite/excel": "^3.1",
"martinlindhe/laravel-vue-i18n-generator": "dev-l10",
"mediconesystems/livewire-datatables": "^0.10",
"predis/predis": "^2.2",
"rappasoft/laravel-livewire-tables": "^2.11",
"socialiteproviders/microsoft-azure": "^4.2",
"spatie/laravel-activitylog": "^4.7",
"spatie/laravel-cookie-consent": "^3.2",
"spatie/laravel-feed": "^4.2",
"spatie/laravel-ignition": "^2.0",
"spatie/laravel-markdown": "^2.2",
"spatie/laravel-permission": "^5.8",
"stevebauman/purify": "^5.1",
"rappasoft/laravel-livewire-tables": "^3.3",
"sentry/sentry-laravel": "^4.7",
"spatie/laravel-activitylog": "^4.8",
"spatie/laravel-cookie-consent": "^3.3",
"spatie/laravel-feed": "^4.4",
"spatie/laravel-honeypot": "^4.5",
"spatie/laravel-ignition": "^2.4",
"spatie/laravel-markdown": "^2.4",
"spatie/laravel-permission": "^6.2",
"stevebauman/purify": "^6.2",
"torann/geoip": "^3.0",
"willvincent/feeds": "^2.5"
"willvincent/feeds": "^2.6"

},
"require-dev": {
"barryvdh/laravel-debugbar": "^3.8",
"barryvdh/laravel-ide-helper": "^2.13",
"brianium/paratest": "^6.4",
"fakerphp/faker": "^1.9.1",
"laracasts/generators": "^2.0.1",
"laravel/sail": "^1.18",
"mockery/mockery": "^1.4.4",
"nunomaduro/collision": "^6.1",
"phpunit/phpunit": "^9.5.10"
"barryvdh/laravel-debugbar": "^3.10",
"barryvdh/laravel-ide-helper": "^3.0",
"brianium/paratest": "^7.0",
"fakerphp/faker": "^1.23",
"laravel/sail": "^1.26",
"mockery/mockery": "^1.6",
"nunomaduro/collision": "^8.0",
"phpunit/phpunit": "^10.5"
},
"autoload": {
"psr-4": {
Expand Down
1 change: 0 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
"predis/predis": "^2.2",
"rappasoft/laravel-livewire-tables": "^3.3",
"sentry/sentry-laravel": "^4.7",
"socialiteproviders/microsoft-azure": "^4.2",
"spatie/laravel-activitylog": "^4.8",
"spatie/laravel-cookie-consent": "^3.3",
"spatie/laravel-feed": "^4.4",
Expand Down
Loading
Loading