Allow Clockify import without Billable column

app/Actions/Fortify/ResetUserPassword.php

@@ -5,12 +5,8 @@ declare(strict_types=1);
 namespace App\Actions\Fortify;
 
 use App\Models\User;
-use App\Providers\FortifyServiceProvider;
-use Illuminate\Auth\Passwords\PasswordBroker;
 use Illuminate\Support\Facades\Hash;
-use Illuminate\Support\Facades\Password;
 use Illuminate\Support\Facades\Validator;
-use Illuminate\Validation\ValidationException;
 use Laravel\Fortify\Contracts\ResetsUserPasswords;
 
 class ResetUserPassword implements ResetsUserPasswords
@@ -24,16 +20,6 @@ class ResetUserPassword implements ResetsUserPasswords
      */
     public function reset(User $user, array $input): void
     {
-        if (! FortifyServiceProvider::canResetPassword($user, $input)) {
-            /** @var PasswordBroker $broker */
-            $broker = Password::broker(config('fortify.passwords'));
-            $broker->deleteToken($user);
-
-            throw ValidationException::withMessages([
-                'email' => [__('This password reset link is invalid.')],
-            ]);
-        }
-
         Validator::make($input, [
             'password' => $this->passwordRules(),
         ])->validate();

app/Models/User.php

@@ -145,19 +145,9 @@ class User extends Authenticatable implements AuditableContract, FilamentUser, M
         return 'https://ui-avatars.com/api/?name='.urlencode($name).'&color=7F9CF5&background=EBF4FF';
     }
 
-    public function isSuperAdmin(): bool
-    {
-        return in_array($this->email, config('auth.super_admins', []), true) && $this->hasVerifiedEmail();
-    }
-
-    public function hasLocalPassword(): bool
-    {
-        return is_string($this->password) && $this->password !== '';
-    }
-
     public function canAccessPanel(Panel $panel): bool
     {
-        return $this->isSuperAdmin();
+        return in_array($this->email, config('auth.super_admins', []), true) && $this->hasVerifiedEmail();
     }
 
     public function isMemberOfOrganization(Organization $organization): bool

app/Providers/Filament/AdminPanelProvider.php

@@ -26,7 +26,6 @@ use Illuminate\Session\Middleware\StartSession;
 use Illuminate\Support\Facades\App;
 use Illuminate\View\Middleware\ShareErrorsFromSession;
 use Nwidart\Modules\Facades\Module;
-use Nwidart\Modules\Laravel\Module as LaravelModule;
 use pxlrbt\FilamentEnvironmentIndicator\EnvironmentIndicatorPlugin;
 
 class AdminPanelProvider extends PanelProvider
@@ -92,77 +91,22 @@ class AdminPanelProvider extends PanelProvider
         $modules = Module::allEnabled();
 
         foreach ($modules as $module) {
-            $moduleNamespace = $this->getModuleAppNamespace($module);
-
             $panel->discoverResources(
                 in: module_path($module->getName(), 'app/Filament/Resources'),
-                for: $moduleNamespace.'\\Filament\\Resources'
+                for: 'Extensions\\'.$module->getName().'\\App\\Filament\\Resources'
             );
 
             $panel->discoverPages(
                 in: module_path($module->getName(), 'app/Filament/Pages'),
-                for: $moduleNamespace.'\\Filament\\Pages'
+                for: 'Extensions\\'.$module->getName().'\\App\\Filament\\Pages'
             );
 
             $panel->discoverWidgets(
                 in: module_path($module->getName(), 'app/Filament/Widgets'),
-                for: $moduleNamespace.'\\Filament\\Widgets'
+                for: 'Extensions\\'.$module->getName().'\\App\\Filament\\Widgets'
             );
         }
 
         return $panel;
     }
-
-    /** @var array<string, string> Cache of module name => resolved app namespace. */
-    private static array $moduleAppNamespaces = [];
-
-    private function getModuleAppNamespace(LaravelModule $module): string
-    {
-        return self::$moduleAppNamespaces[$module->getName()] ??= $this->resolveModuleAppNamespace($module);
-    }
-
-    /**
-     * Resolve the PHP namespace mapped to a module's app/ directory so the
-     * Filament panel can discover its Resources/Pages/Widgets under the right
-     * namespace.
-     *
-     * Two module layouts currently coexist in this repo:
-     *   - laravel-modules v12 (app_folder enabled): a bare namespace maps to
-     *     app/ — e.g. "Extensions\SSO\" => app/, so classes are
-     *     Extensions\SSO\Filament\... (this is the current convention).
-     *   - the older layout: an "...\App" namespace maps to app/ — e.g.
-     *     "Extensions\Billing\App\" => app/, so classes are
-     *     Extensions\Billing\App\Filament\...
-     *
-     * The package's own namespace derivation assumes the v12 (bare) layout and
-     * would mis-resolve the legacy modules, so we read each module's composer
-     * PSR-4 map and use whichever namespace actually points at app/. The legacy
-     * "...\App" shape is only a fallback for when composer is missing/unreadable.
-     * Once every module adopts the bare layout this collapses to
-     * config('modules.namespace').'\\'.$module->getName().
-     */
-    private function resolveModuleAppNamespace(LaravelModule $module): string
-    {
-        $fallback = 'Extensions\\'.$module->getName().'\\App';
-
-        $composerPath = module_path($module->getName(), 'composer.json');
-        $psr4 = [];
-        if (is_file($composerPath)) {
-            $composer = json_decode((string) file_get_contents($composerPath), true);
-            $psr4 = is_array($composer) ? ($composer['autoload']['psr-4'] ?? []) : [];
-        }
-
-        foreach ((array) $psr4 as $namespace => $path) {
-            if (is_string($namespace) && $this->normalizeComposerPath($path) === 'app') {
-                return rtrim($namespace, '\\');
-            }
-        }
-
-        return $fallback;
-    }
-
-    private function normalizeComposerPath(mixed $path): string
-    {
-        return trim(str_replace('\\', '/', (string) $path), '/');
-    }
 }

app/Providers/FortifyServiceProvider.php

@@ -25,73 +25,6 @@ use Laravel\Fortify\Fortify;
 
 class FortifyServiceProvider extends ServiceProvider
 {
-    /**
-     * Dummy bcrypt hash compared against when no user matches the submitted
-     * email. Hash::check is run against it so login takes the same time whether
-     * or not the email exists — otherwise an unknown email would skip the
-     * (deliberately slow) hash and return faster, letting an attacker enumerate
-     * registered accounts by timing the response. The plaintext is irrelevant:
-     * it is only ever checked against attacker-supplied input and never matches.
-     */
-    private const ABSENT_USER_PASSWORD_HASH = '$2y$12$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi';
-
-    /**
-     * Authorization rules applied AFTER the password is verified. Each rule
-     * receives the authenticated user + request and returns whether the login
-     * may proceed; any rule returning false denies it. This is an extension
-     * point: modules (e.g. SSO enforcement) add a rule to veto a password login
-     * instead of replacing this credential check — which would silently drift
-     * from the host logic the next time it changes.
-     *
-     * @var array<int, \Closure(User, Request): bool>
-     */
-    protected static array $loginRules = [];
-
-    /**
-     * Authorization rules applied before a password reset is completed. Rules
-     * receive the user being reset + submitted input and return whether the
-     * local reset flow may set a new password for that account.
-     *
-     * @var array<int, \Closure(User, array<string, mixed>): bool>
-     */
-    protected static array $passwordResetRules = [];
-
-    /**
-     * Register an additional rule that gates password login (see $loginRules).
-     *
-     * @param  \Closure(User, Request): bool  $rule
-     */
-    public static function authenticateUsingRule(\Closure $rule): void
-    {
-        static::$loginRules[] = $rule;
-    }
-
-    /**
-     * Register an additional rule that gates password reset completion.
-     *
-     * @param  \Closure(User, array<string, mixed>): bool  $rule
-     */
-    public static function resetPasswordUsingRule(\Closure $rule): void
-    {
-        static::$passwordResetRules[] = $rule;
-    }
-
-    /**
-     * Check whether the given user may complete the local password reset flow.
-     *
-     * @param  array<string, mixed>  $input
-     */
-    public static function canResetPassword(User $user, array $input = []): bool
-    {
-        foreach (static::$passwordResetRules as $rule) {
-            if (! $rule($user, $input)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
     /**
      * Register any application services.
      */
@@ -159,23 +92,7 @@ class FortifyServiceProvider extends ServiceProvider
                 ->where('is_placeholder', '=', false)
                 ->first();
 
-            // Always run the hash check — against the real hash, or a dummy when
-            // there is no user — so login timing is identical either way (see
-            // ABSENT_USER_PASSWORD_HASH). Passwordless accounts (SSO-only users
-            // have password = null) fail here, so they cannot password-login.
-            $existingPasswordHash = $user->password ?? self::ABSENT_USER_PASSWORD_HASH;
-
-            $passwordIsValid = Hash::check((string) $request->password, $existingPasswordHash);
-
-            if ($user !== null && $passwordIsValid) {
-                // Credentials are valid; now apply any registered authorization
-                // rules (e.g. SSO enforcement may still block password login).
-                foreach (static::$loginRules as $rule) {
-                    if (! $rule($user, $request)) {
-                        return null;
-                    }
-                }
-
+            if ($user !== null && Hash::check($request->password, $user->password)) {
                 return $user;
             }
 

app/Service/Import/Importers/ClockifyTimeEntriesImporter.php

@@ -116,10 +116,12 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
                     throw new ImportException('Time entry description is too long');
                 }
                 $timeEntry->description = $record['Description'];
-                if (! in_array($record['Billable'], ['Yes', 'No'], true)) {
-                    throw new ImportException('Invalid billable value');
+                if (isset($record['Billable'])) {
+                    if (! in_array($record['Billable'], ['Yes', 'No'], true)) {
+                        throw new ImportException('Invalid billable value');
+                    }
+                    $timeEntry->billable = $record['Billable'] === 'Yes';
                 }
-                $timeEntry->billable = $record['Billable'] === 'Yes';
                 $timeEntry->tags = $this->getTags($record['Tags']);
                 $timeEntry->is_imported = true;
 
@@ -219,7 +221,6 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
             'Group',
             'Email',
             'Tags',
-            'Billable',
             'Start Date',
             'Start Time',
             'End Date',

app/Service/UserService.php

@@ -48,56 +48,6 @@ class UserService
         }
         $user->save();
 
-        $this->createDefaultOrganizationForUser(
-            $user,
-            $currency,
-            $numberFormat,
-            $currencyFormat,
-            $dateFormat,
-            $intervalFormat,
-            $timeFormat,
-        );
-
-        return $user;
-    }
-
-    /**
-     * Create a user without a password (e.g. provisioned via SSO). Such users
-     * can only authenticate through a linked identity provider.
-     */
-    public function createPasswordlessUser(
-        string $name,
-        string $email,
-        string $timezone,
-        Weekday $weekStart,
-        ?string $currency,
-        bool $verifyEmail = false
-    ): User {
-        $user = new User;
-        $user->name = $name;
-        $user->email = strtolower($email);
-        $user->password = null;
-        $user->timezone = $timezone;
-        $user->week_start = $weekStart;
-        if ($verifyEmail) {
-            $user->email_verified_at = Carbon::now();
-        }
-        $user->save();
-
-        $this->createDefaultOrganizationForUser($user, $currency);
-
-        return $user;
-    }
-
-    private function createDefaultOrganizationForUser(
-        User $user,
-        ?string $currency,
-        ?NumberFormat $numberFormat = null,
-        ?CurrencyFormat $currencyFormat = null,
-        ?DateFormat $dateFormat = null,
-        ?IntervalFormat $intervalFormat = null,
-        ?TimeFormat $timeFormat = null,
-    ): void {
         $organizations = app(InvitationService::class)->processAcceptedInvitations($user);
 
         if ($organizations->isEmpty()) {
@@ -114,6 +64,8 @@ class UserService
             );
             $this->switchCurrentOrganization($user, $organization);
         }
+
+        return $user;
     }
 
     /**

resources/js/Pages/Auth/Login.vue

@@ -7,16 +7,10 @@ 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';
 
-withDefaults(
-    defineProps<{
-        canResetPassword?: boolean;
-        status?: string;
-    }>(),
-    {
-        canResetPassword: false,
-        status: '',
-    }
-);
+defineProps({
+    canResetPassword: Boolean,
+    status: String,
+});
 
 const form = useForm({
     email: '',
@@ -34,8 +28,8 @@ const submit = () => {
 };
 
 const page = usePage<{
-    flash?: {
-        message?: string;
+    flash: {
+        message: string;
     };
 }>();
 </script>
@@ -67,9 +61,6 @@ const page = usePage<{
             {{ page.props.flash?.message }}
         </div>
 
-        <!-- Extension seam: alternative-auth errors (e.g. SSO callback failures) -->
-        <slot name="error" />
-
         <form @submit.prevent="submit">
             <Field>
                 <FieldLabel for="email">Email</FieldLabel>
@@ -112,8 +103,5 @@ const page = usePage<{
                 </PrimaryButton>
             </div>
         </form>
-
-        <!-- Extension seam: alternative auth methods (e.g. SSO providers) -->
-        <slot name="alternatives" />
     </AuthenticationCard>
 </template>

resources/js/app.ts

@@ -10,73 +10,35 @@ import { QueryClient, VueQueryPlugin } from '@tanstack/vue-query';
 import { type DefineComponent } from 'vue';
 import { setupPrefetching } from '@/utils/prefetch';
 
-interface ExtensionManifest {
-    name?: string;
-    alias?: string;
-}
-
 const appName = import.meta.env.VITE_APP_NAME || 'Laravel';
 const pinia = createPinia();
 const queryClient = new QueryClient();
-const extensionManifests = import.meta.glob('../../extensions/**/module.json', {
-    eager: true,
-    import: 'default',
-}) as Record<string, ExtensionManifest>;
-// BillingPortal is a Vue 2 component and must not be bundled into the Vue 3 app.
-const extensionPages = import.meta.glob<DefineComponent>([
-    '../../extensions/**/resources/js/Pages/**/*.vue',
-    '!**/BillingPortal.vue',
-]);
-const extensionDirectories = Object.entries(extensionManifests).reduce<Record<string, string>>(
-    (directories, [path, manifest]) => {
-        const match = path.match(/^\.\.\/\.\.\/extensions\/([^/]+)\/module\.json$/);
-        const extensionDirectory = match?.[1];
-
-        if (extensionDirectory === undefined) {
-            return directories;
-        }
-
-        for (const key of [manifest.name, manifest.alias, extensionDirectory]) {
-            if (typeof key !== 'string' || key === '') {
-                continue;
-            }
-
-            directories[key] = extensionDirectory;
-            directories[key.toLowerCase()] = extensionDirectory;
-        }
-
-        return directories;
-    },
-    {}
-);
-
-function resolveExtensionDirectory(moduleName: string): string {
-    return (
-        extensionDirectories[moduleName] ??
-        extensionDirectories[moduleName.toLowerCase()] ??
-        moduleName
-    );
-}
 
 createInertiaApp({
     title: (title) => `${title} - ${appName}`,
     resolve: (name) => {
-        // "Module::Page" (both halves present) resolves to that extension's page
-        // directory; everything else is a host page under resources/js/Pages.
-        const [module, ...pageSegments] = name.split('::');
-        const page = pageSegments.join('::');
+        if (name.includes('Invoicing::')) {
+            const [module, page] = name.split('::');
 
-        if (module && page) {
-            const extensionDirectory = resolveExtensionDirectory(module);
-            const pagePath = `../../extensions/${extensionDirectory}/resources/js/Pages/${page}.vue`;
+            const pagePath = module
+                ? `../../extensions/${module}/resources/js/Pages/${page}.vue`
+                : `./Pages/${page}.vue`;
 
-            return resolvePageComponent(pagePath, extensionPages);
+            // BillingPortal is a Vue 2 Component and therefore should not be imported
+            const pages = module
+                ? import.meta.glob<DefineComponent>([
+                      '../../extensions/**/resources/js/Pages/*.vue',
+                      '!**/BillingPortal.vue',
+                  ])
+                : import.meta.glob<DefineComponent>('./Pages/**/*.vue');
+
+            return resolvePageComponent(pagePath, pages);
+        } else {
+            return resolvePageComponent(
+                `./Pages/${name}.vue`,
+                import.meta.glob<DefineComponent>('./Pages/**/*.vue')
+            );
         }
-
-        return resolvePageComponent(
-            `./Pages/${name}.vue`,
-            import.meta.glob<DefineComponent>('./Pages/**/*.vue')
-        );
     },
     setup({ el, App, props, plugin }) {
         const app = createApp({ render: () => h(App, props) });

resources/testfiles/clockify_time_entries_import_test_4.csv

@@ -0,0 +1,3 @@
+"Project","Client","Description","Task","User","Group","Email","Tags","Start Date","Start Time","End Date","End Time","Duration (h)","Duration (decimal)","Billable Rate (USD)","Billable Amount (USD)"
+"Project without Client","","","","Peter Tester","","peter.test@email.test","Development, Backend","03/04/2024","10:23:52 AM","03/04/2024","10:23:52 AM","00:00:00","0.00","0.00","0.00"
+"Project for Big Company","Big Company","Working hard","Task 1","Peter Tester","","peter.test@email.test","","03/04/2024","10:23 AM","03/04/2024","11:23:01 AM","01:00:01","0.00","0.00","0.00"

tests/Unit/Service/Import/Importers/ClockifyTimeEntriesImporterTest.php

@@ -41,6 +41,30 @@ class ClockifyTimeEntriesImporterTest extends ImporterTestAbstract
         $this->assertSame(1, $report->clientsCreated);
     }
 
+    public function test_import_of_test_file_without_billable_works_and_defaults_to_non_billable(): void
+    {
+        // Arrange
+        $organization = Organization::factory()->create();
+        $timezone = 'Europe/Vienna';
+        $importer = new ClockifyTimeEntriesImporter;
+        $importer->init($organization);
+        $data = Storage::disk('testfiles')->get('clockify_time_entries_import_test_4.csv');
+
+        // Act
+        $importer->importData($data, $timezone);
+        $report = $importer->getReport();
+
+        // Assert
+        $testScenario = $this->checkTestScenarioAfterImportExcludingTimeEntries(false, true);
+        $this->checkTimeEntries($testScenario, false, true);
+        $this->assertSame(2, $report->timeEntriesCreated);
+        $this->assertSame(2, $report->tagsCreated);
+        $this->assertSame(1, $report->tasksCreated);
+        $this->assertSame(1, $report->usersCreated);
+        $this->assertSame(2, $report->projectsCreated);
+        $this->assertSame(1, $report->clientsCreated);
+    }
+
     public function test_import_of_test_with_special_characters_description_succeeds(): void
     {
         // Arrange

tests/Unit/Service/Import/Importers/ImporterTestAbstract.php

@@ -26,7 +26,7 @@ class ImporterTestAbstract extends TestCase
     /**
      * @return object{user1: User, project1: Project, project2: Project, tag1: Tag, tag2: Tag}
      */
-    protected function checkTestScenarioAfterImportExcludingTimeEntries(bool $detailed = false): object
+    protected function checkTestScenarioAfterImportExcludingTimeEntries(bool $detailed = false, bool $billableDefault = false): object
     {
         $users = User::all();
         $this->assertCount(2, $users);
@@ -80,12 +80,12 @@ class ImporterTestAbstract extends TestCase
             $this->assertSame('#ef5350', $project1->color);
             $this->assertSame(null, $project1->billable_rate);
             // Project for Big Company
-            $this->assertSame(true, $project2->is_billable);
+            $this->assertSame(! $billableDefault, $project2->is_billable);
             $this->assertSame(false, $project2->is_public);
             $this->assertSame('#ec407a', $project2->color);
             $this->assertSame(10001, $project2->billable_rate);
             // Project (Archived)
-            $this->assertSame(true, $project3->is_billable);
+            $this->assertSame(! $billableDefault, $project3->is_billable);
             $this->assertSame(true, $project3->is_public);
             $this->assertSame('#6a407f', $project3->color);
             $this->assertSame(null, $project3->billable_rate);
@@ -176,7 +176,7 @@ class ImporterTestAbstract extends TestCase
     /**
      * @param  object{user1: User, project1: Project, project2: Project, tag1: Tag, tag2: Tag}  $testScenario
      */
-    protected function checkTimeEntries(object $testScenario, bool $secondRun = false): void
+    protected function checkTimeEntries(object $testScenario, bool $secondRun = false, bool $billableDefault = false): void
     {
         $timeEntries = TimeEntry::all();
         if ($secondRun) {
@@ -197,7 +197,7 @@ class ImporterTestAbstract extends TestCase
         $this->assertSame('Working hard', $timeEntry2->description);
         $this->assertSame('2024-03-04 09:23:00', $timeEntry2->start->toDateTimeString());
         $this->assertSame('2024-03-04 10:23:01', $timeEntry2->end->toDateTimeString());
-        $this->assertTrue($timeEntry2->billable);
+        $this->assertSame(! $billableDefault, $timeEntry2->billable);
         $this->assertTrue($timeEntry2->is_imported);
         $this->assertSame([], $timeEntry2->tags);
     }

tests/Unit/Service/UserServiceTest.php

@@ -5,10 +5,8 @@ declare(strict_types=1);
 namespace Tests\Unit\Service;
 
 use App\Enums\Role;
-use App\Enums\Weekday;
 use App\Models\Member;
 use App\Models\Organization;
-use App\Models\OrganizationInvitation;
 use App\Models\Project;
 use App\Models\ProjectMember;
 use App\Models\TimeEntry;
@@ -137,60 +135,4 @@ class UserServiceTest extends TestCase
         $this->assertSame(Role::Owner->value, $newMember->role);
         $this->assertSame($newOrganization->getKey(), $user->currentOrganization->getKey());
     }
-
-    public function test_create_passwordless_user_joins_accepted_invitation_organization_instead_of_creating_personal_one(): void
-    {
-        // Arrange — an accepted invitation exists for the email (e.g. the user
-        // followed the invite link, then signs up via SSO). Casing differs to
-        // prove the email is normalised before the invitation is matched.
-        $organization = Organization::factory()->create();
-        OrganizationInvitation::factory()
-            ->forOrganization($organization)
-            ->role(Role::Employee)
-            ->accepted()
-            ->create([
-                'email' => 'invitee@example.com',
-            ]);
-
-        // Act
-        $user = $this->userService->createPasswordlessUser(
-            'Invitee',
-            'Invitee@Example.com',
-            'UTC',
-            Weekday::Monday,
-            null,
-        );
-
-        // Assert — invitation is materialised, no personal organization is created
-        $this->assertNull($user->password);
-        $this->assertDatabaseMissing(OrganizationInvitation::class, [
-            'email' => 'invitee@example.com',
-        ]);
-        $user->refresh();
-        $this->assertSame(1, $user->organizations()->count());
-        $this->assertSame($organization->getKey(), $user->organizations()->first()->getKey());
-        $member = Member::whereBelongsTo($user)->whereBelongsTo($organization)->firstOrFail();
-        $this->assertSame(Role::Employee->value, $member->role);
-    }
-
-    public function test_create_passwordless_user_creates_personal_organization_when_no_invitation_exists(): void
-    {
-        // Act
-        $user = $this->userService->createPasswordlessUser(
-            'Solo User',
-            'solo@example.com',
-            'UTC',
-            Weekday::Monday,
-            null,
-        );
-
-        // Assert — a personal organization is created, owned by the user and set current
-        $user->refresh();
-        $this->assertNull($user->password);
-        $this->assertSame(1, $user->organizations()->count());
-        $organization = $user->organizations()->first();
-        $this->assertTrue($organization->personal_team);
-        $this->assertSame($user->getKey(), $organization->user_id);
-        $this->assertSame($organization->getKey(), $user->currentOrganization->getKey());
-    }
 }