Updated extension billing to 0.0.6

.env.example

@@ -5,8 +5,7 @@ APP_KEY=base64:UNQNf1SXeASNkWux01Rj8EnHYx8FO0kAxWNDwktclkk=
 APP_DEBUG=true
 APP_URL=https://solidtime.test
 APP_FORCE_HTTPS=false
-# Supported values: on, off, invite-only (true/false are supported for backwards compatibility)
-APP_ENABLE_REGISTRATION=on
+APP_ENABLE_REGISTRATION=true
 SUPER_ADMINS=admin@example.com
 PAGINATION_PER_PAGE_DEFAULT=500
 

app/Actions/Fortify/CreateNewUser.php

@@ -4,11 +4,9 @@ declare(strict_types=1);
 
 namespace App\Actions\Fortify;
 
-use App\Enums\RegistrationMode;
 use App\Enums\Weekday;
 use App\Events\NewsletterRegistered;
 use App\Models\User;
-use App\Service\InvitationService;
 use App\Service\IpLookup\IpLookupServiceContract;
 use App\Service\TimezoneService;
 use App\Service\UserService;
@@ -33,14 +31,13 @@ class CreateNewUser implements CreatesNewUsers
      */
     public function create(array $input): User
     {
-        $registrationMode = RegistrationMode::fromConfig(config('app.enable_registration'));
-        if ($registrationMode === RegistrationMode::Off) {
+        if (! config('app.enable_registration')) {
             throw ValidationException::withMessages([
                 'email' => [__('Registration is disabled.')],
             ]);
         }
 
-        $validated = Validator::make($input, [
+        Validator::make($input, [
             'name' => [
                 'required',
                 'string',
@@ -63,20 +60,6 @@ class CreateNewUser implements CreatesNewUsers
             ],
         ])->validate();
 
-        if ($registrationMode === RegistrationMode::InviteOnly) {
-            $invitationService = app(InvitationService::class);
-            $email = (string) $validated['email'];
-            if (! $invitationService->hasAcceptedInvitationForEmail($email)) {
-                $message = $invitationService->hasPendingInvitationForEmail($email)
-                    ? __('Please accept the organization invitation sent to your email address before registering.')
-                    : __('Registration is only available to invited users.');
-
-                throw ValidationException::withMessages([
-                    'email' => [$message],
-                ]);
-            }
-        }
-
         $timezone = null;
         if (array_key_exists('timezone', $input) && is_string($input['timezone'])) {
             if (app(TimezoneService::class)->isValid($input['timezone'])) {

app/Enums/RegistrationMode.php

@@ -1,29 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Enums;
-
-enum RegistrationMode: string
-{
-    case On = 'on';
-    case InviteOnly = 'invite-only';
-    case Off = 'off';
-
-    public static function fromConfig(mixed $value): self
-    {
-        if ($value === true) {
-            return self::On;
-        }
-
-        if ($value === false || $value === null) {
-            return self::Off;
-        }
-
-        return match (strtolower(trim((string) $value))) {
-            '1', 'on', 'true' => self::On,
-            'invite-only' => self::InviteOnly,
-            default => self::Off,
-        };
-    }
-}

app/Http/Controllers/Web/OrganizationInvitationController.php

@@ -36,7 +36,6 @@ class OrganizationInvitationController extends Controller
             }
 
             return redirect(route('register'))
-                ->with('registration_email', $email)
                 ->with('bannerText', __('Please create an account to finish joining the :organization organization.', [
                     'organization' => $organization->name,
                 ]))

app/Providers/FortifyServiceProvider.php

@@ -45,7 +45,6 @@ class FortifyServiceProvider extends ServiceProvider
 
         Fortify::registerView(function () {
             return Inertia::render('Auth/Register', [
-                'email' => session('registration_email', ''),
                 'terms_url' => config('auth.terms_url'),
                 'privacy_policy_url' => config('auth.privacy_policy_url'),
                 'newsletter_consent' => config('auth.newsletter_consent'),

app/Service/InvitationService.php

@@ -18,22 +18,6 @@ use Illuminate\Support\Facades\Mail;
 
 class InvitationService
 {
-    public function hasAcceptedInvitationForEmail(string $email): bool
-    {
-        return OrganizationInvitation::query()
-            ->whereRaw('lower(email) = ?', [strtolower($email)])
-            ->whereNotNull('accepted_at')
-            ->exists();
-    }
-
-    public function hasPendingInvitationForEmail(string $email): bool
-    {
-        return OrganizationInvitation::query()
-            ->whereRaw('lower(email) = ?', [strtolower($email)])
-            ->whereNull('accepted_at')
-            ->exists();
-    }
-
     /**
      * @throws UserIsAlreadyMemberOfOrganizationApiException|InvitationForTheEmailAlreadyExistsApiException
      */

config/app.php

@@ -100,7 +100,7 @@ return [
 
     'force_https' => (bool) env('APP_FORCE_HTTPS', false),
 
-    'enable_registration' => env('APP_ENABLE_REGISTRATION', 'off'),
+    'enable_registration' => (bool) env('APP_ENABLE_REGISTRATION', false),
 
     'local_email_verification' => (bool) env('APP_LOCAL_EMAIL_VERIFICATION', false),
 

e2e/invitation-registration-prefill.spec.ts

@@ -1,32 +0,0 @@
-import { expect, test } from '../playwright/fixtures';
-import { PLAYWRIGHT_BASE_URL } from '../playwright/config';
-import { getInvitationAcceptUrl } from './utils/mailpit';
-
-test('prefills the registration email after accepting an invitation', async ({ page, browser }) => {
-    const memberId = `${Date.now()}-${Math.floor(Math.random() * 100000)}`;
-    const memberEmail = `prefill-${memberId}@invitation.test`;
-
-    await page.goto(PLAYWRIGHT_BASE_URL + '/members');
-    await page.getByRole('button', { name: 'Invite Member' }).click();
-    await page.getByPlaceholder('Member Email').fill(memberEmail);
-    await page.getByRole('button', { name: 'Employee' }).click();
-    await Promise.all([
-        page.waitForResponse(
-            (response) =>
-                response.url().includes('/invitations') &&
-                response.request().method() === 'POST' &&
-                response.status() === 204
-        ),
-        page.getByRole('button', { name: 'Invite Member', exact: true }).click(),
-    ]);
-
-    const inviteeContext = await browser.newContext();
-    const inviteePage = await inviteeContext.newPage();
-    const acceptUrl = await getInvitationAcceptUrl(inviteePage.request, memberEmail);
-    await inviteePage.goto(acceptUrl);
-    await inviteePage.waitForURL(/\/register$/);
-
-    await expect(inviteePage.getByLabel('Email')).toHaveValue(memberEmail);
-
-    await inviteeContext.close();
-});

extensions/manifest.json

@@ -1,7 +1,7 @@
 {
     "Billing": {
         "repository": "solidtime-io/extension-billing",
-        "ref": "v0.0.5"
+        "ref": "v0.0.6"
     },
     "Services": {
         "repository": "solidtime-io/extension-services",

resources/js/Pages/Auth/Register.vue

@@ -8,13 +8,9 @@ import { Field, FieldLabel, FieldError } from '@/packages/ui/src/field';
 import PrimaryButton from '@/packages/ui/src/Buttons/PrimaryButton.vue';
 import TextInput from '@/packages/ui/src/Input/TextInput.vue';
 
-const props = defineProps<{
-    email: string;
-}>();
-
 const form = useForm({
     name: '',
-    email: props.email,
+    email: '',
     password: '',
     password_confirmation: '',
     terms: false,

tests/Feature/RegistrationTest.php

@@ -22,13 +22,6 @@ use TiMacDonald\Log\LogEntry;
 
 class RegistrationTest extends TestCaseWithDatabase
 {
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        Config::set('app.enable_registration', 'on');
-    }
-
     public function test_registration_screen_can_be_rendered(): void
     {
         if (! Features::enabled(Features::registration())) {
@@ -96,77 +89,6 @@ class RegistrationTest extends TestCaseWithDatabase
         Event::assertNotDispatched(NewsletterRegistered::class);
     }
 
-    public function test_user_registration_fails_without_an_invitation_if_registration_is_invite_only(): void
-    {
-        Config::set('app.enable_registration', 'invite-only');
-
-        $response = $this->post('/register', [
-            'name' => 'Test User',
-            'email' => 'test@example.com',
-            'password' => 'password',
-            'password_confirmation' => 'password',
-            'terms' => true,
-        ]);
-
-        $response->assertInvalid([
-            'email' => 'Registration is only available to invited users.',
-        ]);
-        $this->assertFalse(User::query()->where('email', 'test@example.com')->exists());
-    }
-
-    public function test_invited_user_can_register_if_registration_is_invite_only(): void
-    {
-        Config::set('app.enable_registration', 'invite-only');
-        $user = $this->createUserWithPermission();
-        OrganizationInvitation::factory()
-            ->forOrganization($user->organization)
-            ->role(Role::Employee)
-            ->accepted()
-            ->create([
-                'email' => 'Invited.User@example.com',
-            ]);
-
-        $response = $this->post('/register', [
-            'name' => 'Invited User',
-            'email' => 'invited.user@example.com',
-            'password' => 'password',
-            'password_confirmation' => 'password',
-            'terms' => true,
-        ]);
-
-        $response->assertValid();
-        $this->assertAuthenticated();
-        $response->assertRedirect(RouteServiceProvider::HOME);
-        $newUser = User::query()->where('email', 'invited.user@example.com')->firstOrFail();
-        $this->assertSame($user->organization->getKey(), $newUser->organizations()->firstOrFail()->getKey());
-    }
-
-    public function test_user_must_accept_pending_invitation_before_registration_if_registration_is_invite_only(): void
-    {
-        Config::set('app.enable_registration', 'invite-only');
-        $user = $this->createUserWithPermission();
-        OrganizationInvitation::factory()
-            ->forOrganization($user->organization)
-            ->role(Role::Employee)
-            ->create([
-                'email' => 'test@example.com',
-            ]);
-
-        $response = $this->post('/register', [
-            'name' => 'Test User',
-            'email' => 'test@example.com',
-            'password' => 'password',
-            'password_confirmation' => 'password',
-            'terms' => true,
-        ]);
-
-        $response->assertInvalid([
-            'email' => 'Please accept the organization invitation sent to your email address before registering.',
-        ]);
-        $this->assertGuest();
-        $this->assertFalse(User::query()->where('email', 'test@example.com')->exists());
-    }
-
     public function test_new_user_can_not_register_with_likely_invalid_domain(): void
     {
         // Act

tests/Unit/Endpoint/Web/OrganizationInvitationEndpointTest.php

@@ -38,7 +38,6 @@ class OrganizationInvitationEndpointTest extends EndpointTestAbstract
         $response->assertRedirect(route('register'));
         $response->assertSessionHas('bannerText', 'Please create an account to finish joining the '.$user->organization->name.' organization.');
         $response->assertSessionHas('bannerStyle', 'info');
-        $response->assertSessionHas('registration_email', strtolower($invitation->email));
         $invitation->refresh();
         $this->assertNotNull($invitation->accepted_at);
     }
@@ -65,7 +64,6 @@ class OrganizationInvitationEndpointTest extends EndpointTestAbstract
         $response->assertRedirect(route('register'));
         $response->assertSessionHas('bannerText', 'Please create an account to finish joining the '.$user->organization->name.' organization.');
         $response->assertSessionHas('bannerStyle', 'info');
-        $response->assertSessionHas('registration_email', strtolower($invitation->email));
         $invitation->refresh();
         $this->assertNotNull($invitation->accepted_at);
     }

tests/Unit/Enums/RegistrationModeTest.php

@@ -1,38 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tests\Unit\Enums;
-
-use App\Enums\RegistrationMode;
-use PHPUnit\Framework\Attributes\CoversClass;
-use PHPUnit\Framework\Attributes\DataProvider;
-use PHPUnit\Framework\TestCase;
-
-#[CoversClass(RegistrationMode::class)]
-class RegistrationModeTest extends TestCase
-{
-    /**
-     * @return array<string, array{mixed, RegistrationMode}>
-     */
-    public static function configValueProvider(): array
-    {
-        return [
-            'boolean true' => [true, RegistrationMode::On],
-            'on' => ['on', RegistrationMode::On],
-            'true' => ['true', RegistrationMode::On],
-            'invite-only' => ['invite-only', RegistrationMode::InviteOnly],
-            'boolean false' => [false, RegistrationMode::Off],
-            'off' => ['off', RegistrationMode::Off],
-            'false' => ['false', RegistrationMode::Off],
-            'unsupported invite alias' => ['invite', RegistrationMode::Off],
-            'unknown' => ['unknown', RegistrationMode::Off],
-        ];
-    }
-
-    #[DataProvider('configValueProvider')]
-    public function test_registration_mode_is_created_from_config_value(mixed $value, RegistrationMode $expected): void
-    {
-        $this->assertSame($expected, RegistrationMode::fromConfig($value));
-    }
-}