diff --git a/app/Http/Controllers/APIS/AdminApi/UsersController.php b/app/Http/Controllers/APIS/AdminApi/UsersController.php index e6c53e2..131488f 100644 --- a/app/Http/Controllers/APIS/AdminApi/UsersController.php +++ b/app/Http/Controllers/APIS/AdminApi/UsersController.php @@ -9,6 +9,7 @@ use App\Mail\Admin\UserCreatedMail; use App\Models\User; use App\Services\AdminService; use Exception; +use Faker\Guesser\Name; use Illuminate\Database\QueryException; use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Log; @@ -213,17 +214,17 @@ class UsersController extends Controller // Validation rules (include all fields) $validator = Validator::make($request->all(), [ 'email' => 'required|email|unique:users,email', - 'authority' => 'required|string|in:CUSTOMER_USER,TENANT_ADMIN,SYS_ADMIN', - 'tenant_id' => 'required|uuid', - 'customer_id' => 'nullable|uuid', - 'first_name' => 'required|string|max:255', - 'last_name' => 'required|string|max:255', - 'phone' => 'nullable|string|max:20', + // 'authority' => 'required|string|in:CUSTOMER_USER,TENANT_ADMIN,SYS_ADMIN', + // 'tenant_id' => 'required|uuid', + // 'customer_id' => 'nullable|uuid', + // 'first_name' => 'required|string|max:255', + // 'last_name' => 'required|string|max:255', + // 'phone' => 'nullable|string|max:20', 'name' => 'nullable|string|max:255', - 'description' => 'nullable|string', - 'default_dashboard_id' => 'nullable', - 'home_dashboard_id' => 'nullable', - 'version' => 'nullable|integer', + // 'description' => 'nullable|string', + // 'default_dashboard_id' => 'nullable', + // 'home_dashboard_id' => 'nullable', + // 'version' => 'nullable|integer', // Add validation for other fields as needed ]); @@ -243,17 +244,17 @@ class UsersController extends Controller $user = User::create([ 'id' => $userId, 'email' => $request->email, - 'authority' => $request->authority, - 'tenant_id' => $request->tenant_id, - 'customer_id' => $request->customer_id, - 'first_name' => $request->first_name, - 'last_name' => $request->last_name, - 'phone' => $request->phone, - 'name' => $request->name ?? "{$request->first_name} {$request->last_name}", - 'description' => $request->description, - 'default_dashboard_id' => $request->default_dashboard_id, + 'authority' => $request->authority ?? 'CUSTOMER_USER', + 'tenant_id' => $request->tenant_id ?? null, + 'customer_id' => $request->customer_id ?? null, + 'first_name' => $request->first_name ?? $request->name, + 'last_name' => $request->last_name ?? $request->name, + 'phone' => $request->phone ?? null, + 'name' => $request->name ?? null, + 'description' => $request->description ?? null, + 'default_dashboard_id' => $request->default_dashboard_id ?? null, 'default_dashboard_fullscreen' => $request->default_dashboard_fullscreen ?? false, - 'home_dashboard_id' => $request->home_dashboard_id, + 'home_dashboard_id' => $request->home_dashboard_id ?? null, 'home_dashboard_hide_toolbar' => $request->home_dashboard_hide_toolbar ?? false, 'user_credentials_enabled' => $request->user_credentials_enabled ?? false, 'failed_login_attempts' => $request->failed_login_attempts ?? 0,