Merge pull request #143 from mettle/feature/automatic-invitation-acce…

…ptance

[Feature] Automatic Invitation Acceptance For Existing Users

app/Services/Workspaces/SendInvitation.php

@@ -24,6 +24,16 @@ public function handle(Workspace $workspace, string $email): Invitation
 
         $invitation = $this->createInvitation($workspace, $email, Workspace::ROLE_MEMBER, $existingUser);
 
+        if ($existingUser) {
+            // If there is an existing user, we are just going to automatically accept the invitation. This avoids
+            // needing to support displaying workspace invitation management to users who are not part of any existing
+            // workspace, but also just makes sense, as it isn't likely that anyone already signed up to a SendPortal
+            // instance would really want to reject an invitation in the first place, so we remove friction here.
+            /** @var AcceptInvitation $acceptInvitation */
+            $acceptInvitation = app(AcceptInvitation::class);
+            $acceptInvitation->handle($existingUser, $invitation);
+        }
+
         $this->emailInvitation($invitation);
 
         return $invitation;

resources/views/workspaces/emails/invitation-to-existing-user.blade.php

@@ -1,13 +1,7 @@
-{{__('Hi!')}}
+<p>{{__('Hi!')}}</p>
 
-<br><br>
+<p>{{__(':userName has added you to their workspace on SendPortal!', ['userName' => $invitation->workspace->owner->name])}}</p>
 
-{{__(':userName has invited you to join their workspace on SendPortal!', ['userName' => $invitation->workspace->owner->name])}}
+<p>{{__('Since you already have an account, you have automatically been added to the workspace.')}}</p>
 
-<br><br>
-
-{{__('Since you already have an account, you may accept the invitation from your account settings screen.')}}
-
-<br><br>
-
-{{__('See you soon!')}}
+<p>{{__('See you soon!')}}</p>

resources/views/workspaces/emails/invitation-to-new-user.blade.php

@@ -1,14 +1,12 @@
-{{__('Hi!')}}
+<p>{{__('Hi!')}}</p>
 
-<br><br>
+<p>
+    {{__(':userName has invited you to join their workspace on SendPortal!', ['userName' => $invitation->workspace->owner->name])}}
+    {{__('If you do not already have an account, you may click the following link to get started:')}}
+</p>
 
-{{__(':userName has invited you to join their workspace on SendPortal!', ['userName' => $invitation->workspace->owner->name])}}
-{{__('If you do not already have an account, you may click the following link to get started:')}}
+<p>
+    <a href="{{ url('register?invitation='.$invitation->token) }}">{{ url('register?invitation='.$invitation->token) }}</a>
+</p>
 
-<br><br>
-
-<a href="{{ url('register?invitation='.$invitation->token) }}">{{ url('register?invitation='.$invitation->token) }}</a>
-
-<br><br>
-
-{{__('See you soon!')}}
+<p>{{__('See you soon!')}}</p>