fix: auth issues

Author: devansh-webkul

composer.json

@@ -17,6 +17,7 @@
         "laravel/framework": "^10.0",
         "laravel/sanctum": "^3.2",
         "laravel/tinker": "^2.5",
+        "laravel/ui": "^4.5",
         "maatwebsite/excel": "^3.1",
         "prettus/l5-repository": "^2.7.9"
     },

composer.lock

@@ -26,7 +26,7 @@ public function boot(Router $router): void
 
         include __DIR__.'/../Http/helpers.php';
 
-        Route::middleware(['web', 'admin_locale'])
+        Route::middleware(['web', 'admin_locale', 'user'])
             ->prefix(config('app.admin_path'))
             ->group(__DIR__.'/../Routes/Admin/web.php');
 

packages/Webkul/Admin/src/Providers/AdminServiceProvider.php

@@ -15,8 +15,8 @@ class="h-10 w-[110px]"
                 />
             @else
                 <img
-                    class="w-max" 
-                    src="{{ vite()->asset('images/logo.svg') }}"
+                    class="w-max"
+                    src="{{ admin_vite()->asset('images/logo.svg') }}"
                     alt="{{ config('app.name') }}"
                 />
             @endif
@@ -39,10 +39,10 @@ class="w-max"
 
                             <x-admin::form.control-group.control
                                 type="email"
-                                class="w-[254px] max-w-full" 
+                                class="w-[254px] max-w-full"
                                 id="email"
-                                name="email" 
-                                rules="required|email" 
+                                name="email"
+                                rules="required|email"
                                 :value="old('email')"
                                 :label="trans('admin::app.users.forget-password.create.email')"
                                 :placeholder="trans('admin::app.users.forget-password.create.email')"
@@ -54,15 +54,15 @@ class="w-[254px] max-w-full"
 
                     <div class="flex items-center justify-between p-4">
                         <!-- Back to Sign In link -->
-                        <a 
+                        <a
                             class="cursor-pointer text-xs font-semibold leading-6 text-brandColor"
                             href="{{ route('admin.session.create') }}"
                         >
                             @lang('admin::app.users.forget-password.create.sign-in-link')
                         </a>
 
                         <!-- Form Submit Button -->
-                        <button 
+                        <button
                             class="primary-button">
                             @lang('admin::app.users.forget-password.create.submit-btn')
                         </button>
@@ -71,4 +71,4 @@ class="primary-button">
             </div>
         </div>
     </div>
-</x-admin::layouts.anonymous>
+</x-admin::layouts.anonymous>

packages/Webkul/Admin/src/Resources/views/sessions/forgot-password.blade.php

@@ -15,8 +15,8 @@ class="h-10 w-[110px]"
                 />
             @else
                 <img
-                    class="w-max" 
-                    src="{{ vite()->asset('images/logo.svg') }}"
+                    class="w-max"
+                    src="{{ admin_vite()->asset('images/logo.svg') }}"
                     alt="{{ config('app.name') }}"
                 />
             @endif
@@ -33,7 +33,7 @@ class="w-max"
                     <x-admin::form.control-group.control
                         type="hidden"
                         name="token"
-                        :value="$token"       
+                        :value="$token"
                     />
 
                     <div class="border-y p-4 dark:border-gray-800">
@@ -45,17 +45,17 @@ class="w-max"
 
                             <x-admin::form.control-group.control
                                 type="email"
-                                class="w-[254px] max-w-full" 
+                                class="w-[254px] max-w-full"
                                 id="email"
-                                name="email" 
-                                rules="required|email" 
+                                name="email"
+                                rules="required|email"
                                 :label="trans('admin::app.users.reset-password.email')"
                                 :placeholder="trans('admin::app.users.reset-password.email')"
                             />
 
                             <x-admin::form.control-group.error control-name="email" />
                         </x-admin::form.control-group>
-                        
+
                         <!-- Password -->
                         <x-admin::form.control-group>
                             <x-admin::form.control-group.label class="required">
@@ -64,10 +64,10 @@ class="w-[254px] max-w-full"
 
                             <x-admin::form.control-group.control
                                 type="password"
-                                class="w-[254px] max-w-full" 
+                                class="w-[254px] max-w-full"
                                 id="password"
-                                name="password" 
-                                rules="required|min:6" 
+                                name="password"
+                                rules="required|min:6"
                                 :label="trans('admin::app.users.reset-password.password')"
                                 :placeholder="trans('admin::app.users.reset-password.password')"
                                 ref="password"
@@ -84,10 +84,10 @@ class="w-[254px] max-w-full"
 
                             <x-admin::form.control-group.control
                                 type="password"
-                                class="w-[254px] max-w-full" 
+                                class="w-[254px] max-w-full"
                                 id="password_confirmation"
                                 name="password_confirmation"
-                                rules="confirmed:@password" 
+                                rules="confirmed:@password"
                                 :label="trans('admin::app.users.reset-password.confirm-password')"
                                 :placeholder="trans('admin::app.users.reset-password.confirm-password')"
                                 ref="password"
@@ -99,15 +99,15 @@ class="w-[254px] max-w-full"
 
                     <div class="flex items-center justify-between p-4">
                         <!-- Back Button-->
-                        <a 
+                        <a
                             class="cursor-pointer text-xs font-semibold leading-6 text-brandColor"
                             href="{{ route('admin.session.create') }}"
                         >
                             @lang('admin::app.users.reset-password.back-link-title')
                         </a>
 
                         <!-- Submit Button -->
-                        <button 
+                        <button
                             class="primary-button">
                             @lang('admin::app.users.reset-password.submit-btn')
                         </button>
@@ -116,4 +116,4 @@ class="primary-button">
             </div>
         </div>
     </div>
-</x-admin::layouts.anonymous>
+</x-admin::layouts.anonymous>

packages/Webkul/Admin/src/Resources/views/sessions/reset-password.blade.php

@@ -3,7 +3,7 @@
 use Illuminate\Support\Facades\Route;
 use Webkul\Admin\Http\Controllers\Activity\ActivityController;
 
-Route::middleware(['user'])->controller(ActivityController::class)->prefix('activities')->group(function () {
+Route::controller(ActivityController::class)->prefix('activities')->group(function () {
     Route::get('', 'index')->name('admin.activities.index');
 
     Route::get('get', 'get')->name('admin.activities.get');

packages/Webkul/Admin/src/Routes/Admin/activities-routes.php

@@ -6,40 +6,42 @@
 use Webkul\Admin\Http\Controllers\User\ResetPasswordController;
 use Webkul\Admin\Http\Controllers\User\SessionController;
 
-/**
- * Redirect route.
- */
-Route::get('/', [Controller::class, 'redirectToLogin']);
-
-/**
- * Session routes.
- */
-Route::controller(SessionController::class)->group(function () {
-    Route::prefix('login')->group(function () {
-        Route::get('', 'create')->name('admin.session.create');
-
-        Route::post('', 'store')->name('admin.session.store');
+Route::withoutMiddleware(['user'])->group(function () {
+    /**
+     * Redirect route.
+     */
+    Route::get('/', [Controller::class, 'redirectToLogin']);
+
+    /**
+     * Session routes.
+     */
+    Route::controller(SessionController::class)->group(function () {
+        Route::prefix('login')->group(function () {
+            Route::get('', 'create')->name('admin.session.create');
+
+            Route::post('', 'store')->name('admin.session.store');
+        });
+
+        Route::middleware(['user'])->group(function () {
+            Route::delete('logout', 'destroy')->name('admin.session.destroy');
+        });
     });
 
-    Route::middleware(['user'])->group(function () {
-        Route::delete('logout', 'destroy')->name('admin.session.destroy');
-    });
-});
-
-/**
- * Forgot password routes.
- */
-Route::controller(ForgotPasswordController::class)->prefix('forget-password')->group(function () {
-    Route::get('', 'create')->name('admin.forgot_password.create');
+    /**
+     * Forgot password routes.
+     */
+    Route::controller(ForgotPasswordController::class)->prefix('forget-password')->group(function () {
+        Route::get('', 'create')->name('admin.forgot_password.create');
 
-    Route::post('', 'store')->name('admin.forgot_password.store');
-});
+        Route::post('', 'store')->name('admin.forgot_password.store');
+    });
 
-/**
- * Reset password routes.
- */
-Route::controller(ResetPasswordController::class)->prefix('reset-password')->group(function () {
-    Route::get('{token}', 'create')->name('admin.reset_password.create');
+    /**
+     * Reset password routes.
+     */
+    Route::controller(ResetPasswordController::class)->prefix('reset-password')->group(function () {
+        Route::get('{token}', 'create')->name('admin.reset_password.create');
 
-    Route::post('', 'store')->name('admin.reset_password.store');
+        Route::post('', 'store')->name('admin.reset_password.store');
+    });
 });

packages/Webkul/Admin/src/Routes/Admin/auth-routes.php

@@ -3,7 +3,7 @@
 use Illuminate\Support\Facades\Route;
 use Webkul\Admin\Http\Controllers\Configuration\ConfigurationController;
 
-Route::middleware(['user'])->controller(ConfigurationController::class)->prefix('configuration')->group(function () {
+Route::controller(ConfigurationController::class)->prefix('configuration')->group(function () {
     Route::get('search', 'search')->name('admin.configuration.search');
 
     Route::prefix('{slug?}/{slug2?}')->group(function () {

packages/Webkul/Admin/src/Routes/Admin/configuration-routes.php

@@ -6,7 +6,7 @@
 use Webkul\Admin\Http\Controllers\Contact\Persons\PersonController;
 use Webkul\Admin\Http\Controllers\Contact\Persons\TagController;
 
-Route::middleware(['user'])->prefix('contacts')->group(function () {
+Route::prefix('contacts')->group(function () {
     /**
      * Persons routes.
      */

packages/Webkul/Admin/src/Routes/Admin/contacts-routes.php

@@ -7,7 +7,7 @@
 use Webkul\Admin\Http\Controllers\Lead\QuoteController;
 use Webkul\Admin\Http\Controllers\Lead\TagController;
 
-Route::middleware(['user'])->controller(LeadController::class)->prefix('leads')->group(function () {
+Route::controller(LeadController::class)->prefix('leads')->group(function () {
     Route::get('', 'index')->name('admin.leads.index');
 
     Route::get('create', 'create')->name('admin.leads.create');