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

Oauth #8

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Procfile

This file was deleted.

13 changes: 7 additions & 6 deletions app/Http/Controllers/Auth/AuthenticatedSessionController.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,33 @@
use App\Http\Controllers\Controller;
use App\Http\Requests\Auth\LoginRequest;
use App\Providers\RouteServiceProvider;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Route;
use Inertia\Inertia;
use Inertia\Response;

class AuthenticatedSessionController extends Controller
{
/**
* Display the login view.
*
* @return \Inertia\Response
* @return Response
*/
public function create()
{
return Inertia::render('Auth/Login', [
'canResetPassword' => Route::has('password.request'),
'status' => session('status'),
]);
}

/**
* Handle an incoming authentication request.
*
* @param \App\Http\Requests\Auth\LoginRequest $request
* @return \Illuminate\Http\RedirectResponse
* @param LoginRequest $request
* @return RedirectResponse
*/
public function store(LoginRequest $request)
{
Expand All @@ -44,8 +45,8 @@ public function store(LoginRequest $request)
/**
* Destroy an authenticated session.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\RedirectResponse
* @param Request $request
* @return RedirectResponse
*/
public function destroy(Request $request)
{
Expand Down
45 changes: 0 additions & 45 deletions app/Http/Controllers/Auth/ConfirmablePasswordController.php

This file was deleted.

This file was deleted.

24 changes: 0 additions & 24 deletions app/Http/Controllers/Auth/EmailVerificationPromptController.php

This file was deleted.

73 changes: 0 additions & 73 deletions app/Http/Controllers/Auth/NewPasswordController.php

This file was deleted.

54 changes: 0 additions & 54 deletions app/Http/Controllers/Auth/PasswordResetLinkController.php

This file was deleted.

51 changes: 51 additions & 0 deletions app/Http/Controllers/Auth/ProviderController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<?php

namespace App\Http\Controllers\Auth;

use App\Http\Controllers\Controller;
use App\Models\User;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Laravel\Socialite\Facades\Socialite;

class ProviderController extends Controller
{
public function redirect($provider)
{
return Socialite::driver($provider)->redirect();
}

public function callback($provider)
{
try {
$socialUser = Socialite::driver($provider)->user();

if (User::where('email', $socialUser->getEmail())->exists()) {
return redirect('/login')->withErrors(['email' => 'This email uses a different method to login.']);
}

$user = User::where([
'provider' => $provider,
'provider_id' => $socialUser->getId()
])->first();

if (!$user) {
$user = User::create([
'name' => $socialUser->getName(),
'email' => $socialUser->getEmail(),
'username' => User::generateUserName($socialUser->getName()),
'provider' => $provider,
'provider_id' => $socialUser->getId(),
'provider_token' => $socialUser->token,
'email_verified_at' => now()
]);
}

Auth::login($user);

return redirect('/dashboard');
} catch (\Exception $e) {
return redirect('/login');
}
}
}
14 changes: 10 additions & 4 deletions app/Http/Controllers/Auth/RegisteredUserController.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,21 @@
use App\Models\User;
use App\Providers\RouteServiceProvider;
use Illuminate\Auth\Events\Registered;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Hash;
use Illuminate\Validation\Rules;
use Illuminate\Validation\ValidationException;
use Inertia\Inertia;
use Inertia\Response;

class RegisteredUserController extends Controller
{
/**
* Display the registration view.
*
* @return \Inertia\Response
* @return Response
*/
public function create()
{
Expand All @@ -27,21 +30,24 @@ public function create()
/**
* Handle an incoming registration request.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\RedirectResponse
* @param Request $request
* @return RedirectResponse
*
* @throws \Illuminate\Validation\ValidationException
* @throws ValidationException
*/
public function store(Request $request)
{
$request->validate([
'name' => 'required|string|max:255',
'email' => 'required|string|email|max:255|unique:users',
'username' => 'required|string|max:255|unique:users',
'password' => ['required', 'confirmed', Rules\Password::defaults()],
]);

$user = User::create([
'name' => $request->name,
'username' => $request->username,
// 'username' => User::generateUserName($request->name),
'email' => $request->email,
'password' => Hash::make($request->password),
]);
Expand Down
Loading