fix: fix socialite integration (monicahq/chandler#554)

monicahq · May 27, 2023 · 2fddbe1 · 2fddbe1
1 parent 039f478
commit 2fddbe1
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 14 deletions.
diff --git a/app/Domains/Vault/ManageJournals/Web/ViewHelpers/JournalShowViewHelper.php b/app/Domains/Vault/ManageJournals/Web/ViewHelpers/JournalShowViewHelper.php
@@ -82,7 +82,7 @@ public static function postsInYear(Journal $journal, int $year, User $user): Col
                     'excerpt' => $post->excerpt,
                     'written_at_day' => Str::upper(DateHelper::formatShortDay($post->written_at)),
                     'written_at_day_number' => DateHelper::formatDayNumber($post->written_at),
-                    'photo' => $post?->files?->first() ? [
+                    'photo' => optional(optional($post)->files)->first() ? [
                         'id' => $post->files->first()->id,
                         'url' => [
                             'show' => 'https://ucarecdn.com/'.$post->files->first()->uuid.'/-/scale_crop/75x75/smart/-/format/auto/-/quality/smart_retina/',

diff --git a/app/Http/Controllers/Auth/AcceptInvitationController.php b/app/Http/Controllers/Auth/AcceptInvitationController.php
@@ -50,7 +50,7 @@ public function store(Request $request)
         Auth::login($user);
 
         return response()->json([
-            'data' => route('vault.index'),
+            'data' => route('home'),
         ], 200);
     }
 }
diff --git a/app/Http/Controllers/Auth/SocialiteCallbackController.php b/app/Http/Controllers/Auth/SocialiteCallbackController.php
@@ -47,7 +47,7 @@ public function callback(Request $request, string $driver): RedirectResponse
             $this->checkForErrors($request, $driver);
 
             return $this->loginPipeline($request)->then(function (/*$request*/) {
-                return Redirect::intended(route('vault.index'));
+                return Redirect::intended(route('home'));
             });
         } catch (ValidationException $e) {
             throw $e->redirectTo(Redirect::intended(route('home'))->getTargetUrl());

diff --git a/composer.lock b/composer.lock
diff --git a/database/migrations/2021_07_06_065356_create_user_token_socialite.php b/database/migrations/2021_07_06_065356_create_user_token_socialite.php
@@ -19,7 +19,7 @@ public function up()
             $table->string('driver', 50);
             $table->char('format', 6);
             $table->string('email', 1024)->nullable();
-            $table->string('token', 2048);
+            $table->string('token', 4096);
             $table->string('token_secret', 2048)->nullable();
             $table->string('refresh_token', 2048)->nullable();
             $table->unsignedBigInteger('expires_in')->nullable();

diff --git a/routes/web.php b/routes/web.php
@@ -151,7 +151,7 @@
         return Redirect::route('login');
     }
     if (($vaults = Auth::user()->vaults)->count() === 1) {
-        return Redirect::route('vault.show', $vaults->first());
+        return Redirect::intended(route('vault.show', $vaults->first()));
     }
 
     return Redirect::intended(RouteServiceProvider::HOME);

diff --git a/tests/Feature/Controllers/Auth/SocialiteCallbackControllerTest.php b/tests/Feature/Controllers/Auth/SocialiteCallbackControllerTest.php
@@ -92,7 +92,7 @@ public function it_get_user_created(): void
 
         $response = $this->get('/auth/test/callback?code=thecode&state=state');
         $response->assertStatus(302);
-        $response->assertRedirect(config('app.url').'/vaults');
+        $response->assertRedirect(config('app.url'));
 
         $mock->assertResponses();
 
@@ -123,7 +123,7 @@ public function it_associate_token_to_logged_user(): void
 
         $response = $this->get('/auth/test/callback?code=thecode&state=state');
         $response->assertStatus(302);
-        $response->assertRedirect(config('app.url').'/vaults');
+        $response->assertRedirect(config('app.url'));
 
         $mock->assertResponses();