From 0869395aabbc510134386c7ec9dbc3dc462a535f Mon Sep 17 00:00:00 2001 From: Adrian Hopek Date: Thu, 13 Jan 2022 14:19:11 +0100 Subject: [PATCH] #2 - authentication via google (#16) * #2 - wip * #2 - wip * #2 - ui fixes to login page * #2 - fix * #2 - fix * #2 - add title to login page * Apply suggestions from code review Co-authored-by: Krzysztof Rewak * #2 - cr fix * #2 - cr fix Co-authored-by: EwelinaLasowy Co-authored-by: Krzysztof Rewak --- .env.example | 4 + app/Http/Controllers/GoogleController.php | 41 +++ app/Http/Controllers/LogoutController.php | 22 ++ app/Http/Middleware/Authenticate.php | 6 +- app/Http/Middleware/HandleInertiaRequests.php | 11 +- .../Middleware/RedirectIfAuthenticated.php | 3 +- app/Http/Resources/UserResource.php | 21 ++ app/Models/User.php | 11 +- app/Providers/RouteServiceProvider.php | 2 - composer.json | 1 + composer.lock | 258 ++++++++++++++---- config/services.php | 8 +- database/factories/UserFactory.php | 3 - .../2014_10_12_000000_create_users_table.php | 2 - package-lock.json | 44 +-- package.json | 6 +- phpunit.xml | 2 +- public/img/logo-white.png | Bin 0 -> 6896 bytes public/img/logo.png | Bin 6896 -> 7045 bytes readme.md | 2 +- resources/js/Pages/Dashboard.vue | 4 +- resources/js/Pages/Login.vue | 85 ++++++ resources/js/Shared/Layout/AppLayout.vue | 19 ++ resources/js/Shared/Layout/GuestLayout.vue | 12 + resources/js/Shared/MainMenu.vue | 14 +- resources/js/app.js | 4 +- resources/lang/pl.json | 3 + routes/web.php | 15 +- tailwind.config.js | 1 + tests/Feature/AuthenticationTest.php | 43 +++ tests/Feature/InertiaTest.php | 9 +- 31 files changed, 534 insertions(+), 122 deletions(-) create mode 100644 app/Http/Controllers/GoogleController.php create mode 100644 app/Http/Controllers/LogoutController.php create mode 100644 app/Http/Resources/UserResource.php create mode 100644 public/img/logo-white.png create mode 100644 resources/js/Pages/Login.vue create mode 100644 resources/js/Shared/Layout/AppLayout.vue create mode 100644 resources/js/Shared/Layout/GuestLayout.vue create mode 100644 resources/lang/pl.json create mode 100644 tests/Feature/AuthenticationTest.php diff --git a/.env.example b/.env.example index 7a33236..30e2550 100644 --- a/.env.example +++ b/.env.example @@ -44,3 +44,7 @@ MAIL_FROM_ADDRESS=null MAIL_FROM_NAME="${APP_NAME}" DOCKER_INSTALL_XDEBUG=false + +GOOGLE_CLIENT_ID= +GOOGLE_CLIENT_SECRET= +GOOGLE_REDIRECT= diff --git a/app/Http/Controllers/GoogleController.php b/app/Http/Controllers/GoogleController.php new file mode 100644 index 0000000..5c050cf --- /dev/null +++ b/app/Http/Controllers/GoogleController.php @@ -0,0 +1,41 @@ +driver("google")->redirect(); + } + + public function callback(AuthFactory $auth, SocialiteManager $socialiteManager): RedirectResponse + { + $socialUser = $socialiteManager->driver("google")->user(); + + try { + /** @var User $user */ + $user = User::query() + ->where("email", $socialUser->getEmail()) + ->firstOrFail(); + } catch (ModelNotFoundException) { + return redirect() + ->route("login") + ->withErrors([ + "oauth" => __("User does not exist."), + ]); + } + + $auth->guard()->login($user, true); + + return redirect()->route("dashboard"); + } +} diff --git a/app/Http/Controllers/LogoutController.php b/app/Http/Controllers/LogoutController.php new file mode 100644 index 0000000..f7519b7 --- /dev/null +++ b/app/Http/Controllers/LogoutController.php @@ -0,0 +1,22 @@ +session()->invalidate(); + $request->session()->regenerateToken(); + + return redirect()->route("login"); + } +} diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index eaeb6c6..8fa8185 100644 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -8,10 +8,8 @@ use Illuminate\Auth\Middleware\Authenticate as Middleware; class Authenticate extends Middleware { - protected function redirectTo($request) + protected function redirectTo($request): string { - if (!$request->expectsJson()) { - return route("login"); - } + return route("login"); } } diff --git a/app/Http/Middleware/HandleInertiaRequests.php b/app/Http/Middleware/HandleInertiaRequests.php index f24215c..48117f8 100644 --- a/app/Http/Middleware/HandleInertiaRequests.php +++ b/app/Http/Middleware/HandleInertiaRequests.php @@ -6,20 +6,17 @@ namespace Toby\Http\Middleware; use Illuminate\Http\Request; use Inertia\Middleware; +use Toby\Http\Resources\UserResource; class HandleInertiaRequests extends Middleware { public function share(Request $request): array { + $user = $request->user(); + return array_merge(parent::share($request), [ "auth" => fn() => [ - "user" => [ - "name" => "Chelsea Hagon", - "email" => "chelseahagon@example.com", - "role" => "Human Resources Manager", - "imageUrl" => - "https://images.unsplash.com/photo-1550525811-e5869dd03032?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80", - ], + "user" => $user ? new UserResource($user) : null, ], "flash" => fn() => [ "success" => $request->session()->get("success"), diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php index 73c3d10..84f0ae8 100644 --- a/app/Http/Middleware/RedirectIfAuthenticated.php +++ b/app/Http/Middleware/RedirectIfAuthenticated.php @@ -8,7 +8,6 @@ use Closure; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; use Symfony\Component\HttpFoundation\Response; -use Toby\Providers\RouteServiceProvider; class RedirectIfAuthenticated { @@ -18,7 +17,7 @@ class RedirectIfAuthenticated foreach ($guards as $guard) { if (Auth::guard($guard)->check()) { - return redirect(RouteServiceProvider::HOME); + return redirect()->route("dashboard"); } } diff --git a/app/Http/Resources/UserResource.php b/app/Http/Resources/UserResource.php new file mode 100644 index 0000000..b3e03f0 --- /dev/null +++ b/app/Http/Resources/UserResource.php @@ -0,0 +1,21 @@ + $this->id, + "name" => $this->name, + "email" => $this->email, + "role" => "Human Resources Manager", + "avatar" => "https://images.unsplash.com/photo-1550525811-e5869dd03032?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80", + ]; + } +} diff --git a/app/Models/User.php b/app/Models/User.php index 880eb84..660b8f7 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -8,6 +8,11 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Notifications\Notifiable; +/** + * @property int $id + * @property string $name + * @property string $email + */ class User extends Authenticatable { use HasFactory; @@ -16,15 +21,9 @@ class User extends Authenticatable protected $fillable = [ "name", "email", - "password", ]; protected $hidden = [ - "password", "remember_token", ]; - - protected $casts = [ - "email_verified_at" => "datetime", - ]; } diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 2b6a7cb..d3c423c 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -12,8 +12,6 @@ use Illuminate\Support\Facades\Route; class RouteServiceProvider extends ServiceProvider { - public const HOME = "/home"; - public function boot(): void { $this->configureRateLimiting(); diff --git a/composer.json b/composer.json index fcf7c40..83abbee 100644 --- a/composer.json +++ b/composer.json @@ -11,6 +11,7 @@ "guzzlehttp/guzzle": "^7.0.1", "inertiajs/inertia-laravel": "^0.5.1", "laravel/framework": "^8.75", + "laravel/socialite": "^5.2", "laravel/telescope": "^4.6", "laravel/tinker": "^2.5" }, diff --git a/composer.lock b/composer.lock index cea7dcd..e9f029f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "1f888e8a9e8764750ed43fbb8697721e", + "content-hash": "6c0c7586f9003a71d9299165b3d5030d", "packages": [ { "name": "asm89/stack-cors", @@ -366,16 +366,16 @@ }, { "name": "dragonmantank/cron-expression", - "version": "v3.2.3", + "version": "v3.2.4", "source": { "type": "git", "url": "https://github.com/dragonmantank/cron-expression.git", - "reference": "47c53bbb260d3c398fba9bfa9683dcf67add2579" + "reference": "9545dea2a1d92b60c8b3d06f02025c83e999bde0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/47c53bbb260d3c398fba9bfa9683dcf67add2579", - "reference": "47c53bbb260d3c398fba9bfa9683dcf67add2579", + "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/9545dea2a1d92b60c8b3d06f02025c83e999bde0", + "reference": "9545dea2a1d92b60c8b3d06f02025c83e999bde0", "shasum": "" }, "require": { @@ -415,7 +415,7 @@ ], "support": { "issues": "https://github.com/dragonmantank/cron-expression/issues", - "source": "https://github.com/dragonmantank/cron-expression/tree/v3.2.3" + "source": "https://github.com/dragonmantank/cron-expression/tree/v3.2.4" }, "funding": [ { @@ -423,7 +423,7 @@ "type": "github" } ], - "time": "2022-01-06T05:35:07+00:00" + "time": "2022-01-13T04:09:37+00:00" }, { "name": "egulias/email-validator", @@ -961,26 +961,26 @@ }, { "name": "inertiajs/inertia-laravel", - "version": "v0.5.1", + "version": "v0.5.2", "source": { "type": "git", "url": "https://github.com/inertiajs/inertia-laravel.git", - "reference": "1b2d57abcffc087f07d2d892f0197af559d23802" + "reference": "9c8c4201435aa0c11cb832242cf4c1b01bd8ef32" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/inertiajs/inertia-laravel/zipball/1b2d57abcffc087f07d2d892f0197af559d23802", - "reference": "1b2d57abcffc087f07d2d892f0197af559d23802", + "url": "https://api.github.com/repos/inertiajs/inertia-laravel/zipball/9c8c4201435aa0c11cb832242cf4c1b01bd8ef32", + "reference": "9c8c4201435aa0c11cb832242cf4c1b01bd8ef32", "shasum": "" }, "require": { "ext-json": "*", - "laravel/framework": "^6.0|^7.0|^8.74", + "laravel/framework": "^6.0|^7.0|^8.74|^9.0", "php": "^7.2|~8.0.0|~8.1.0" }, "require-dev": { "mockery/mockery": "^1.3.3", - "orchestra/testbench": "^4.0|^5.0|^6.4", + "orchestra/testbench": "^4.0|^5.0|^6.4|^7.0", "phpunit/phpunit": "^8.0|^9.5.8", "roave/security-advisories": "dev-master" }, @@ -1018,7 +1018,7 @@ ], "support": { "issues": "https://github.com/inertiajs/inertia-laravel/issues", - "source": "https://github.com/inertiajs/inertia-laravel/tree/v0.5.1" + "source": "https://github.com/inertiajs/inertia-laravel/tree/v0.5.2" }, "funding": [ { @@ -1026,20 +1026,20 @@ "type": "github" } ], - "time": "2022-01-07T18:18:00+00:00" + "time": "2022-01-12T16:18:26+00:00" }, { "name": "laravel/framework", - "version": "v8.78.1", + "version": "v8.79.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "16359b5ebafba6579b397d7505b082a6d1bb2e31" + "reference": "8091f07558ff4a890435ff9d25fa9aca0189ad63" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/16359b5ebafba6579b397d7505b082a6d1bb2e31", - "reference": "16359b5ebafba6579b397d7505b082a6d1bb2e31", + "url": "https://api.github.com/repos/laravel/framework/zipball/8091f07558ff4a890435ff9d25fa9aca0189ad63", + "reference": "8091f07558ff4a890435ff9d25fa9aca0189ad63", "shasum": "" }, "require": { @@ -1071,7 +1071,7 @@ "symfony/routing": "^5.4", "symfony/var-dumper": "^5.4", "tijsverkoyen/css-to-inline-styles": "^2.2.2", - "vlucas/phpdotenv": "^5.2", + "vlucas/phpdotenv": "^5.4.1", "voku/portable-ascii": "^1.4.8" }, "conflict": { @@ -1128,6 +1128,7 @@ "symfony/cache": "^5.4" }, "suggest": { + "ably/ably-php": "Required to use the Ably broadcast driver (^1.0).", "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.198.1).", "brianium/paratest": "Required to run tests in parallel (^6.0).", "doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.13.3|^3.1.4).", @@ -1198,7 +1199,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2022-01-05T14:52:50+00:00" + "time": "2022-01-12T16:12:41+00:00" }, { "name": "laravel/serializable-closure", @@ -1260,28 +1261,97 @@ "time": "2021-11-30T15:53:04+00:00" }, { - "name": "laravel/telescope", - "version": "v4.6.10", + "name": "laravel/socialite", + "version": "v5.3.0", "source": { "type": "git", - "url": "https://github.com/laravel/telescope.git", - "reference": "65f9fdfd978dd999b5c496cd5a8398abdf9056a2" + "url": "https://github.com/laravel/socialite.git", + "reference": "4e6f7e40de9a54ad641de5b8e29cdf1e73842e10" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/telescope/zipball/65f9fdfd978dd999b5c496cd5a8398abdf9056a2", - "reference": "65f9fdfd978dd999b5c496cd5a8398abdf9056a2", + "url": "https://api.github.com/repos/laravel/socialite/zipball/4e6f7e40de9a54ad641de5b8e29cdf1e73842e10", + "reference": "4e6f7e40de9a54ad641de5b8e29cdf1e73842e10", "shasum": "" }, "require": { "ext-json": "*", - "laravel/framework": "^8.29", + "guzzlehttp/guzzle": "^6.0|^7.0", + "illuminate/http": "^6.0|^7.0|^8.0|^9.0", + "illuminate/support": "^6.0|^7.0|^8.0|^9.0", + "league/oauth1-client": "^1.0", + "php": "^7.2|^8.0" + }, + "require-dev": { + "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0", + "mockery/mockery": "^1.0", + "orchestra/testbench": "^4.0|^5.0|^6.0|^7.0", + "phpunit/phpunit": "^8.0|^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.x-dev" + }, + "laravel": { + "providers": [ + "Laravel\\Socialite\\SocialiteServiceProvider" + ], + "aliases": { + "Socialite": "Laravel\\Socialite\\Facades\\Socialite" + } + } + }, + "autoload": { + "psr-4": { + "Laravel\\Socialite\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "Laravel wrapper around OAuth 1 & OAuth 2 libraries.", + "homepage": "https://laravel.com", + "keywords": [ + "laravel", + "oauth" + ], + "support": { + "issues": "https://github.com/laravel/socialite/issues", + "source": "https://github.com/laravel/socialite" + }, + "time": "2022-01-12T18:05:39+00:00" + }, + { + "name": "laravel/telescope", + "version": "v4.7.0", + "source": { + "type": "git", + "url": "https://github.com/laravel/telescope.git", + "reference": "4c7f170e20c2303321fa857bc3acceb69a588563" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laravel/telescope/zipball/4c7f170e20c2303321fa857bc3acceb69a588563", + "reference": "4c7f170e20c2303321fa857bc3acceb69a588563", + "shasum": "" + }, + "require": { + "ext-json": "*", + "laravel/framework": "^8.29|^9.0", "php": "^7.3|^8.0", - "symfony/var-dumper": "^5.0" + "symfony/var-dumper": "^5.0|^6.0" }, "require-dev": { "ext-gd": "*", - "orchestra/testbench": "^6.0" + "orchestra/testbench": "^6.0|^7.0" }, "type": "library", "extra": { @@ -1322,38 +1392,38 @@ ], "support": { "issues": "https://github.com/laravel/telescope/issues", - "source": "https://github.com/laravel/telescope/tree/v4.6.10" + "source": "https://github.com/laravel/telescope/tree/v4.7.0" }, - "time": "2022-01-03T13:08:00+00:00" + "time": "2022-01-12T17:03:58+00:00" }, { "name": "laravel/tinker", - "version": "v2.6.3", + "version": "v2.7.0", "source": { "type": "git", "url": "https://github.com/laravel/tinker.git", - "reference": "a9ddee4761ec8453c584e393b393caff189a3e42" + "reference": "5f2f9815b7631b9f586a3de7933c25f9327d4073" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/tinker/zipball/a9ddee4761ec8453c584e393b393caff189a3e42", - "reference": "a9ddee4761ec8453c584e393b393caff189a3e42", + "url": "https://api.github.com/repos/laravel/tinker/zipball/5f2f9815b7631b9f586a3de7933c25f9327d4073", + "reference": "5f2f9815b7631b9f586a3de7933c25f9327d4073", "shasum": "" }, "require": { - "illuminate/console": "^6.0|^7.0|^8.0", - "illuminate/contracts": "^6.0|^7.0|^8.0", - "illuminate/support": "^6.0|^7.0|^8.0", + "illuminate/console": "^6.0|^7.0|^8.0|^9.0", + "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0", + "illuminate/support": "^6.0|^7.0|^8.0|^9.0", "php": "^7.2.5|^8.0", - "psy/psysh": "^0.10.4", - "symfony/var-dumper": "^4.3.4|^5.0" + "psy/psysh": "^0.10.4|^0.11.1", + "symfony/var-dumper": "^4.3.4|^5.0|^6.0" }, "require-dev": { "mockery/mockery": "~1.3.3|^1.4.2", "phpunit/phpunit": "^8.5.8|^9.3.3" }, "suggest": { - "illuminate/database": "The Illuminate Database package (^6.0|^7.0|^8.0)." + "illuminate/database": "The Illuminate Database package (^6.0|^7.0|^8.0|^9.0)." }, "type": "library", "extra": { @@ -1390,9 +1460,9 @@ ], "support": { "issues": "https://github.com/laravel/tinker/issues", - "source": "https://github.com/laravel/tinker/tree/v2.6.3" + "source": "https://github.com/laravel/tinker/tree/v2.7.0" }, - "time": "2021-12-07T16:41:42+00:00" + "time": "2022-01-10T08:52:49+00:00" }, { "name": "league/commonmark", @@ -1729,6 +1799,82 @@ ], "time": "2021-11-21T11:48:40+00:00" }, + { + "name": "league/oauth1-client", + "version": "v1.10.0", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/oauth1-client.git", + "reference": "88dd16b0cff68eb9167bfc849707d2c40ad91ddc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/oauth1-client/zipball/88dd16b0cff68eb9167bfc849707d2c40ad91ddc", + "reference": "88dd16b0cff68eb9167bfc849707d2c40ad91ddc", + "shasum": "" + }, + "require": { + "ext-json": "*", + "ext-openssl": "*", + "guzzlehttp/guzzle": "^6.0|^7.0", + "guzzlehttp/psr7": "^1.7|^2.0", + "php": ">=7.1||>=8.0" + }, + "require-dev": { + "ext-simplexml": "*", + "friendsofphp/php-cs-fixer": "^2.17", + "mockery/mockery": "^1.3.3", + "phpstan/phpstan": "^0.12.42", + "phpunit/phpunit": "^7.5||9.5" + }, + "suggest": { + "ext-simplexml": "For decoding XML-based responses." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev", + "dev-develop": "2.0-dev" + } + }, + "autoload": { + "psr-4": { + "League\\OAuth1\\Client\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ben Corlett", + "email": "bencorlett@me.com", + "homepage": "http://www.webcomm.com.au", + "role": "Developer" + } + ], + "description": "OAuth 1.0 Client Library", + "keywords": [ + "Authentication", + "SSO", + "authorization", + "bitbucket", + "identity", + "idp", + "oauth", + "oauth1", + "single sign on", + "trello", + "tumblr", + "twitter" + ], + "support": { + "issues": "https://github.com/thephpleague/oauth1-client/issues", + "source": "https://github.com/thephpleague/oauth1-client/tree/v1.10.0" + }, + "time": "2021-08-15T23:05:49+00:00" + }, { "name": "monolog/monolog", "version": "2.3.5", @@ -2624,29 +2770,29 @@ }, { "name": "psy/psysh", - "version": "v0.10.12", + "version": "v0.11.1", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "a0d9981aa07ecfcbea28e4bfa868031cca121e7d" + "reference": "570292577277f06f590635381a7f761a6cf4f026" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/a0d9981aa07ecfcbea28e4bfa868031cca121e7d", - "reference": "a0d9981aa07ecfcbea28e4bfa868031cca121e7d", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/570292577277f06f590635381a7f761a6cf4f026", + "reference": "570292577277f06f590635381a7f761a6cf4f026", "shasum": "" }, "require": { "ext-json": "*", "ext-tokenizer": "*", - "nikic/php-parser": "~4.0|~3.0|~2.0|~1.3", - "php": "^8.0 || ^7.0 || ^5.5.9", - "symfony/console": "~5.0|~4.0|~3.0|^2.4.2|~2.3.10", - "symfony/var-dumper": "~5.0|~4.0|~3.0|~2.7" + "nikic/php-parser": "^4.0 || ^3.1", + "php": "^8.0 || ^7.0.8", + "symfony/console": "^6.0 || ^5.0 || ^4.0 || ^3.4", + "symfony/var-dumper": "^6.0 || ^5.0 || ^4.0 || ^3.4" }, "require-dev": { "bamarni/composer-bin-plugin": "^1.2", - "hoa/console": "3.17.*" + "hoa/console": "3.17.05.02" }, "suggest": { "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)", @@ -2661,7 +2807,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "0.10.x-dev" + "dev-main": "0.11.x-dev" } }, "autoload": { @@ -2693,9 +2839,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.10.12" + "source": "https://github.com/bobthecow/psysh/tree/v0.11.1" }, - "time": "2021-11-30T14:05:36+00:00" + "time": "2022-01-03T13:58:38+00:00" }, { "name": "ralouphie/getallheaders", diff --git a/config/services.php b/config/services.php index 0dae23d..e535c9e 100644 --- a/config/services.php +++ b/config/services.php @@ -2,4 +2,10 @@ declare(strict_types=1); -return []; +return [ + "google" => [ + "client_id" => env("GOOGLE_CLIENT_ID"), + "client_secret" => env("GOOGLE_CLIENT_SECRET"), + "redirect" => env("GOOGLE_REDIRECT"), + ], +]; diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php index 52145f4..4ddc304 100644 --- a/database/factories/UserFactory.php +++ b/database/factories/UserFactory.php @@ -5,7 +5,6 @@ declare(strict_types=1); namespace Database\Factories; use Illuminate\Database\Eloquent\Factories\Factory; -use Illuminate\Support\Facades\Hash; use Illuminate\Support\Str; class UserFactory extends Factory @@ -15,8 +14,6 @@ class UserFactory extends Factory return [ "name" => $this->faker->name(), "email" => $this->faker->unique()->safeEmail(), - "email_verified_at" => now(), - "password" => Hash::make("secret123"), "remember_token" => Str::random(10), ]; } diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php index 4ceb0bd..d1943d9 100644 --- a/database/migrations/2014_10_12_000000_create_users_table.php +++ b/database/migrations/2014_10_12_000000_create_users_table.php @@ -13,8 +13,6 @@ return new class() extends Migration { $table->id(); $table->string("name"); $table->string("email")->unique(); - $table->timestamp("email_verified_at")->nullable(); - $table->string("password"); $table->rememberToken(); $table->timestamps(); }); diff --git a/package-lock.json b/package-lock.json index 35166cf..f5d5036 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "application", + "name": "toby", "lockfileVersion": 2, "requires": true, "packages": { @@ -11,15 +11,15 @@ "@inertiajs/inertia-vue3": "^0.6.0", "@inertiajs/progress": "^0.2.7", "@tailwindcss/forms": "^0.4.0", - "@tailwindcss/line-clamp": "^0.3.0", + "@tailwindcss/line-clamp": "^0.3.1", "@tailwindcss/typography": "^0.5.0", "@vue/compiler-sfc": "^3.2.26", "autoprefixer": "^10.4.2", "laravel-mix": "^6.0.6", "postcss": "^8.4.5", - "tailwindcss": "^3.0.12", + "tailwindcss": "^3.0.13", "vue": "^3.2.26", - "vue-loader": "^16.8.3" + "vue-loader": "^17.0.0" }, "devDependencies": { "eslint": "^8.6.0", @@ -1782,9 +1782,9 @@ } }, "node_modules/@tailwindcss/line-clamp": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@tailwindcss/line-clamp/-/line-clamp-0.3.0.tgz", - "integrity": "sha512-ffDDclrqr3sy8cpChCozedDUAN8enxqAiWeH8d4dGQ2hcXlxf51+7KleveFi/n/TxEuRVApoL7hICeDOdYPKpg==", + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@tailwindcss/line-clamp/-/line-clamp-0.3.1.tgz", + "integrity": "sha512-pNr0T8LAc3TUx/gxCfQZRe9NB2dPEo/cedPHzUGIPxqDMhgjwNm6jYxww4W5l0zAsAddxr+XfZcqttGiFDgrGg==", "peerDependencies": { "tailwindcss": ">=2.0.0 || >=3.0.0 || >=3.0.0-alpha.1" } @@ -4166,9 +4166,9 @@ } }, "node_modules/eslint-plugin-vue": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-8.2.0.tgz", - "integrity": "sha512-cLIdTuOAMXyHeQ4drYKcZfoyzdwdBpH279X8/N0DgmotEI9yFKb5O/cAgoie/CkQZCH/MOmh0xw/KEfS90zY2A==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-8.3.0.tgz", + "integrity": "sha512-IIuLHw4vQxGlHcoP2dG6t/2OVdQf2qoyAzEGAxreU1afZOHGA7y3TWq8I+r3ZA6Wjs6xpeUWGHlT31QGr9Rb5g==", "dev": true, "dependencies": { "eslint-utils": "^3.0.0", @@ -8893,9 +8893,9 @@ } }, "node_modules/vue-loader": { - "version": "16.8.3", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz", - "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==", + "version": "17.0.0", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-17.0.0.tgz", + "integrity": "sha512-OWSXjrzIvbF2LtOUmxT3HYgwwubbfFelN8PAP9R9dwpIkj48TVioHhWWSx7W7fk+iF5cgg3CBJRxwTdtLU4Ecg==", "dependencies": { "chalk": "^4.1.0", "hash-sum": "^2.0.0", @@ -10639,9 +10639,9 @@ } }, "@tailwindcss/line-clamp": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@tailwindcss/line-clamp/-/line-clamp-0.3.0.tgz", - "integrity": "sha512-ffDDclrqr3sy8cpChCozedDUAN8enxqAiWeH8d4dGQ2hcXlxf51+7KleveFi/n/TxEuRVApoL7hICeDOdYPKpg==", + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@tailwindcss/line-clamp/-/line-clamp-0.3.1.tgz", + "integrity": "sha512-pNr0T8LAc3TUx/gxCfQZRe9NB2dPEo/cedPHzUGIPxqDMhgjwNm6jYxww4W5l0zAsAddxr+XfZcqttGiFDgrGg==", "requires": {} }, "@tailwindcss/typography": { @@ -12614,9 +12614,9 @@ } }, "eslint-plugin-vue": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-8.2.0.tgz", - "integrity": "sha512-cLIdTuOAMXyHeQ4drYKcZfoyzdwdBpH279X8/N0DgmotEI9yFKb5O/cAgoie/CkQZCH/MOmh0xw/KEfS90zY2A==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-8.3.0.tgz", + "integrity": "sha512-IIuLHw4vQxGlHcoP2dG6t/2OVdQf2qoyAzEGAxreU1afZOHGA7y3TWq8I+r3ZA6Wjs6xpeUWGHlT31QGr9Rb5g==", "dev": true, "requires": { "eslint-utils": "^3.0.0", @@ -15971,9 +15971,9 @@ } }, "vue-loader": { - "version": "16.8.3", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz", - "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==", + "version": "17.0.0", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-17.0.0.tgz", + "integrity": "sha512-OWSXjrzIvbF2LtOUmxT3HYgwwubbfFelN8PAP9R9dwpIkj48TVioHhWWSx7W7fk+iF5cgg3CBJRxwTdtLU4Ecg==", "requires": { "chalk": "^4.1.0", "hash-sum": "^2.0.0", diff --git a/package.json b/package.json index 7c19be4..4ac8b9c 100644 --- a/package.json +++ b/package.json @@ -18,15 +18,15 @@ "@inertiajs/inertia-vue3": "^0.6.0", "@inertiajs/progress": "^0.2.7", "@tailwindcss/forms": "^0.4.0", - "@tailwindcss/line-clamp": "^0.3.0", + "@tailwindcss/line-clamp": "^0.3.1", "@tailwindcss/typography": "^0.5.0", "@vue/compiler-sfc": "^3.2.26", "autoprefixer": "^10.4.2", "laravel-mix": "^6.0.6", "postcss": "^8.4.5", - "tailwindcss": "^3.0.12", + "tailwindcss": "^3.0.13", "vue": "^3.2.26", - "vue-loader": "^16.8.3" + "vue-loader": "^17.0.0" }, "devDependencies": { "eslint": "^8.6.0", diff --git a/phpunit.xml b/phpunit.xml index 0994cf1..c4a1bad 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -22,7 +22,7 @@ - + diff --git a/public/img/logo-white.png b/public/img/logo-white.png new file mode 100644 index 0000000000000000000000000000000000000000..853f4e3246748a95fbccdacd0182ed1f985d60d5 GIT binary patch literal 6896 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 literal 0 HcmV?d00001 diff --git a/public/img/logo.png b/public/img/logo.png index 853f4e3246748a95fbccdacd0182ed1f985d60d5..89b800d7316bad3bcdc02b19e97133b85a481131 100644 GIT binary patch literal 7045 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 literal 6896 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 diff --git a/readme.md b/readme.md index 93d67ea..a45dbc4 100644 --- a/readme.md +++ b/readme.md @@ -62,7 +62,7 @@ If xDebug is installed, set environment variable **XDEBUG_MODE=off** to improve dcr php php vendor/bin/ecs check --fix dcr php composer ecsf dcr node npm run lint - dcr node rpm run lintf + dcr node npm run lintf ### xDebug diff --git a/resources/js/Pages/Dashboard.vue b/resources/js/Pages/Dashboard.vue index f84cb24..605d48d 100644 --- a/resources/js/Pages/Dashboard.vue +++ b/resources/js/Pages/Dashboard.vue @@ -18,7 +18,7 @@
@@ -255,7 +255,6 @@ import { } from '@heroicons/vue/outline'; import {computed} from 'vue'; import {usePage} from '@inertiajs/inertia-vue3'; - export default { name: 'Dashboard', setup() { @@ -362,7 +361,6 @@ export default { 'Tenetur libero voluptatem rerum occaecati qui est molestiae exercitationem. Voluptate quisquam iure assumenda consequatur ex et recusandae. Alias consectetur voluptatibus. Accusamus a ab dicta et. Consequatur quis dignissimos voluptatem nisi.', }, ]; - return { user, stats, diff --git a/resources/js/Pages/Login.vue b/resources/js/Pages/Login.vue new file mode 100644 index 0000000..66b0f0f --- /dev/null +++ b/resources/js/Pages/Login.vue @@ -0,0 +1,85 @@ + + + diff --git a/resources/js/Shared/Layout/AppLayout.vue b/resources/js/Shared/Layout/AppLayout.vue new file mode 100644 index 0000000..ea11dfa --- /dev/null +++ b/resources/js/Shared/Layout/AppLayout.vue @@ -0,0 +1,19 @@ + + + diff --git a/resources/js/Shared/Layout/GuestLayout.vue b/resources/js/Shared/Layout/GuestLayout.vue new file mode 100644 index 0000000..2e8deed --- /dev/null +++ b/resources/js/Shared/Layout/GuestLayout.vue @@ -0,0 +1,12 @@ + + + + diff --git a/resources/js/Shared/MainMenu.vue b/resources/js/Shared/MainMenu.vue index f23d97d..d709004 100644 --- a/resources/js/Shared/MainMenu.vue +++ b/resources/js/Shared/MainMenu.vue @@ -11,7 +11,7 @@ Workflow @@ -42,7 +42,7 @@ Open user menu @@ -62,7 +62,9 @@ > {{ item.name }} @@ -209,8 +211,10 @@ {{ item.name }} @@ -270,7 +274,7 @@ export default { const userNavigation = [ {name: 'Your Profile', href: '#'}, {name: 'Settings', href: '#'}, - {name: 'Sign out', href: '#'}, + {name: 'Sign out', href: '/logout', method: 'post', as: 'button'}, ]; return { diff --git a/resources/js/app.js b/resources/js/app.js index 9cab07a..95cc0c5 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -1,13 +1,13 @@ import {createApp, h} from 'vue'; import {createInertiaApp, Head, Link} from '@inertiajs/inertia-vue3'; import {InertiaProgress} from '@inertiajs/progress'; -import Layout from '@/Shared/Layout'; +import AppLayout from '@/Shared/Layout/AppLayout'; createInertiaApp({ resolve: name => { const page = require(`./Pages/${name}`).default; - page.layout = page.layout || Layout; + page.layout = page.layout || AppLayout; return page; }, diff --git a/resources/lang/pl.json b/resources/lang/pl.json new file mode 100644 index 0000000..b6ae679 --- /dev/null +++ b/resources/lang/pl.json @@ -0,0 +1,3 @@ +{ + "User does not exist.": "Użytkownik nie istnieje." +} diff --git a/routes/web.php b/routes/web.php index 99b6a46..f4434c3 100644 --- a/routes/web.php +++ b/routes/web.php @@ -3,5 +3,18 @@ declare(strict_types=1); use Illuminate\Support\Facades\Route; +use Toby\Http\Controllers\GoogleController; +use Toby\Http\Controllers\LogoutController; -Route::get("/", fn() => inertia("Dashboard")); +Route::middleware("auth")->group(function (): void { + Route::get("/", fn() => inertia("Dashboard"))->name("dashboard"); + Route::post("/logout", LogoutController::class); +}); + +Route::middleware("guest")->group(function (): void { + Route::get("login", fn() => inertia("Login"))->name("login"); + Route::get("login/google/start", [GoogleController::class, "redirect"]) + ->name("login.google.start"); + Route::get("login/google/end", [GoogleController::class, "callback"]) + ->name("login.google.end"); +}); diff --git a/tailwind.config.js b/tailwind.config.js index cda7b7e..d48c4d3 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -11,6 +11,7 @@ module.exports = { }, colors: { 'blumilk': { + '25': '#F4F8FD', '50': '#D5DFEE', '100': '#C7D4E9', '200': '#AABDDD', diff --git a/tests/Feature/AuthenticationTest.php b/tests/Feature/AuthenticationTest.php new file mode 100644 index 0000000..f9431e7 --- /dev/null +++ b/tests/Feature/AuthenticationTest.php @@ -0,0 +1,43 @@ +get("/") + ->assertRedirect(); + } + + public function testUserIsNotRedirectedFromDashboard(): void + { + $user = User::factory()->create(); + + $this->actingAs($user) + ->get("/") + ->assertOk(); + } + + public function testUserCanLogout(): void + { + $user = User::factory()->create(); + + $this->actingAs($user); + + $this->assertAuthenticated(); + + $this->post("/logout") + ->assertRedirect(); + + $this->assertGuest(); + } +} diff --git a/tests/Feature/InertiaTest.php b/tests/Feature/InertiaTest.php index 555c618..617ba60 100644 --- a/tests/Feature/InertiaTest.php +++ b/tests/Feature/InertiaTest.php @@ -4,14 +4,21 @@ declare(strict_types=1); namespace Tests\Feature; +use Illuminate\Foundation\Testing\DatabaseMigrations; use Inertia\Testing\AssertableInertia as Assert; use Tests\TestCase; +use Toby\Models\User; class InertiaTest extends TestCase { + use DatabaseMigrations; + public function testInertia(): void { - $response = $this->get("/"); + $user = User::factory()->create(); + + $response = $this->actingAs($user) + ->get("/"); $response->assertOk(); $response->assertInertia(fn(Assert $page) => $page->component("Dashboard"));