refatoracao e etc mt cansado pra uma mensagemzinha completa

.env.example

@@ -60,7 +60,7 @@ TWITCH_OAUTH_SCOPES="user:read:email"
 
 
 GITHUB_OAUTH_BASE_URI="https://id.twitch.tv/oauth2"
-GITHUB_OAUTH_ID=""
+GITHUB_OAUTH_ID="6b82a4205e7ce901190b"
 GITHUB_REDIRECT_URI="http://localhost:8000/auth/oauth/github"
 GITHUB_OAUTH_SECRET=""
 GITHUB_OAUTH_SCOPES="user:email"

app/Contracts/OAuthContract.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace App\Contracts;
+
+interface OAuthContract {
+    public function auth(string $code): array;
+    public function getAuthenticatedUser(string $token): array;
+}

app/Contracts/SocialContract.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace App\Contracts;
+
+interface SocialContract {
+    public function findUser(string $username): array;
+}

app/Http/Controllers/AuthController.php

@@ -2,80 +2,28 @@
 
 namespace App\Http\Controllers;
 
-use App\Models\User;
-use App\Services\OAuth\GithubService;
-use App\Services\OAuth\TwitchService;
+use App\Repositories\AuthRepository;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Storage;
-use Ramsey\Uuid\Uuid;
 
 class AuthController extends Controller
 {
-    public function getTwitchProvider(Request $request)
+    function __construct(AuthRepository $repository)
     {
-        if (!$code = $request->query('code')) {
-            return redirect('/');
-        }
-
-        $service = new TwitchService();
-        $response = $service->twitchAuth($code);
-        $providerUser = $service->getTwitchUser($response['access_token']);
-
-        $user = $this->findOrCreate('twitch', $providerUser);
-        Auth::login($user);
-
-        return redirect('/dashboard');
+        $this->_repository = $repository;
     }
 
-    public function getGithubProvider(Request $request)
-    {
+    public function auth(Request $request, string $provider) {
         if (!$code = $request->query('code')) {
             return redirect('/');
         }
 
-        $service = new GithubService();
-        $response = $service->githubAuth($code);
-        $providerUser = $service->getGithubUser($response['access_token']);
-
-        $user = $this->findOrCreate('github', $providerUser);
-        Auth::login($user);
+        $this->_repository->authenticate($provider, $code);
 
         return redirect('/dashboard');
     }
 
-    private function findOrCreate(string $provider, array $providerUser)
-    {
-        $payload = [
-            $provider . '_username' => $providerUser['login'] ?? $providerUser['data'][0]['login'],
-            "name" => $providerUser['name'] ?? $providerUser['data'][0]['display_name'],
-            $provider . "_id" => $providerUser['id'] ?? $providerUser['data'][0]['id'],
-            "email" => $providerUser['email'] ?? $providerUser['data'][0]['email'],
-            'image' => $providerUser['avatar_url'] ?? $providerUser['data'][0]['profile_image_url']
-        ];
-
-
-        if ($user = User::where($provider . "_id", $payload[$provider . '_id'])->first()) {
-            return $user;
-        }
-
-        if ($user = User::where('email', $payload['email'])->first()) {
-            $user->update([
-                $provider . "_id" => $payload[$provider . '_id'],
-                $provider . "_username" => $payload[$provider . '_username']
-            ]);
-
-            return $user;
-        }
-        $imagePath = 'avatars/' . Uuid::uuid4()->toString() . '.png';
-        Storage::put('public/' . $imagePath, file_get_contents($payload['image']));
-        $payload['image_path'] = $imagePath;
-
-        return User::create($payload);
-    }
-
     public function getLogout() {
-        Auth::logout();
+        $this->_repository->logout();
 
         return redirect('/');
     }

app/Http/Controllers/MeController.php

@@ -2,44 +2,27 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Storage;
-use Ramsey\Uuid\Uuid;
+use App\Http\Requests\PostAvatarRequest;
+use App\Repositories\MeRepository;
 
 class MeController extends Controller
 {
-    public function __construct()
+    public function __construct(MeRepository $repository)
     {
         $this->middleware('auth');
+        $this->_repository = $repository;
     }
 
-    public function postProfileAvatar(Request $request)
+    public function postProfileAvatar(PostAvatarRequest $request)
     {
-        $this->validate($request, [
-            'image' => 'required|image'
-        ]);
-
-        $file = $request->file('image');
-
-        $imageName = Uuid::uuid4()->toString() . '.' . $file->getClientOriginalExtension();
-        $file->storePubliclyAs('public/avatars', $imageName);
-
-        Storage::delete('public/' . Auth::user()->image_path);
-
-        $imagePath = 'avatars/' . $imageName;
-
-        Auth::user()->update([
-            'image_path' => $imagePath
-        ]);
+        $this->_repository->postAvatar($request->file('image'));
 
         return response()->json([], 200);
     }
 
     public function deleteMe()
     {
-        Auth::user()->delete();
-        Auth::logout();
+        $this->_repository->delete();     
 
         return redirect('/');
     }

app/Http/Controllers/MessagesController.php

@@ -2,27 +2,25 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
+use App\Http\Requests\CreateMessageRequest;
+use App\Repositories\MessageRepository;
+use Exception;
 
 class MessagesController extends Controller
 {
-    public function __construct()
+    public function __construct(MessageRepository $repository)
     {
         $this->middleware('auth');
+        $this->_repository = $repository;
     }
 
-    public function postMessage(Request $request)
+    public function postMessage(CreateMessageRequest $request)
     {
-        $fields = $this->validate($request, [
-            'content' => 'required',
-            'receiver_username' => 'string|nullable'
-        ]);
-
-        $fields['is_private'] = (bool) $request->input('is_private');
-        $fields['receiver_username'] = strtolower($fields['receiver_username']);
-
-        Auth::user()->messages()->create($fields);
+        try {
+            $this->_repository->createMessage($request->validated());
+        } catch (Exception $e) {
+            return back()->withErrors($e->getMessage());
+        }
 
         return back();
     }

app/Http/Controllers/ViewController.php

@@ -2,32 +2,27 @@
 
 namespace App\Http\Controllers;
 
-use App\Models\Message;
-use App\Models\User;
+use App\Repositories\ViewRepository;
 
 class ViewController extends Controller
 {
-    public function __construct()
+    public function __construct(ViewRepository $repository)
     {
         $this->middleware('auth:web', ['except' => 'viewLanding']);
+        $this->_repository = $repository;
     }
 
     public function viewLanding()
     {
-        $users = User::orderByDesc('created_at')->paginate(4);
-        $registeredUsers = User::count();
-        $messagesSent = Message::count();
+        [ $users, $registeredUsers, $messagesSent ] = $this->_repository->getLandingContent();
 
         return view('welcome', compact(['users', 'registeredUsers', 'messagesSent']));
     }
 
     public function viewDashboard()
     {
-        $messages = Message::orderByDesc('created_at')
-            ->where('is_private', false)
-            ->orWhere('receiver_username', '=', auth()->user()->github_username)
-            ->orWhere('user_id', auth()->user()->id)
-            ->paginate(15);
+        [ $messages ] = $this->_repository->getDashboardContent();
+
         return view('dashboard', compact('messages'));
     }
 

app/Http/Requests/CreateMessageRequest.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class CreateMessageRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'content' => 'required',
+            'receiver_username' => 'string|nullable'
+        ];
+    }
+}

app/Http/Requests/PostAvatarRequest.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class PostAvatarRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'image' => 'required|image'
+        ];
+    }
+}

app/Models/User.php

@@ -23,8 +23,10 @@ class User extends Authenticatable
         'password',
         'github_id',
         'twitch_id',
+        'discord_id',
         'github_username',
         'twitch_username',
+        'discord_username',
         'image_path'
     ];
 

app/Repositories/AuthRepository.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Repositories;
+
+use App\Models\User;
+use App\Services\OAuth\DiscordService;
+use Ramsey\Uuid\Uuid;
+use Illuminate\Support\Facades\Auth;
+use App\Services\OAuth\GithubService;
+use App\Services\OAuth\TwitchService;
+use Illuminate\Support\Facades\Storage;
+
+
+class AuthRepository {
+
+    public function authenticate($provider, $code) {
+        $service = $this->getProvider($provider);
+
+        $response = $service->auth($code);
+        $providerUser = $service->getAuthenticatedUser($response['access_token']);
+
+        $user = $this->findOrCreate($provider, $providerUser);
+        Auth::login($user);
+    }
+
+    public function logout() {
+        Auth::logout();
+    }
+
+    private function getProvider($provider) {
+        return match ($provider) {
+            'twitch' => new TwitchService,
+            'github' => new GithubService,
+            'discord' => new DiscordService
+        };
+    }
+
+    private function findOrCreate(string $provider, array $providerUser)
+    {
+        $payload = [
+            $provider . '_username' => $providerUser['login'],
+            "name" => $providerUser['name'],
+            $provider . "_id" => $providerUser['id'],
+            "email" => $providerUser['email'],
+            'image' => $providerUser['avatar_url']
+        ];
+
+        if ($user = User::where($provider . "_id", $payload[$provider . '_id'])->first()) {
+            return $user;
+        }
+
+        if ($user = User::where('email', $payload['email'])->first()) {
+            $user->update([
+                $provider . "_id" => $payload[$provider . '_id'],
+                $provider . "_username" => $payload[$provider . '_username']
+            ]);
+
+            return $user;
+        }
+        $imagePath = 'avatars/' . Uuid::uuid4()->toString() . '.png';
+        Storage::put('public/' . $imagePath, file_get_contents($payload['image']));
+        $payload['image_path'] = $imagePath;
+
+        return User::create($payload);
+    }
+}