Merge branch 'feature/config-sync' into develop

bangyadiii · May 27, 2024 · c18545d · c18545d
2 parents 97a3a72 + 20d6465
commit c18545d
Show file tree

Hide file tree

Showing 34 changed files with 169 additions and 684 deletions.
diff --git a/app/Http/Controllers/Auth/ConfirmablePasswordController.php b/app/Http/Controllers/Auth/ConfirmablePasswordController.php
diff --git a/app/Http/Controllers/Auth/EmailVerificationNotificationController.php b/app/Http/Controllers/Auth/EmailVerificationNotificationController.php
diff --git a/app/Http/Controllers/Auth/EmailVerificationPromptController.php b/app/Http/Controllers/Auth/EmailVerificationPromptController.php
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
diff --git a/app/Http/Controllers/Auth/NewPasswordController.php b/app/Http/Controllers/Auth/NewPasswordController.php
diff --git a/app/Http/Controllers/Auth/PasswordController.php b/app/Http/Controllers/Auth/PasswordController.php
diff --git a/app/Http/Controllers/Auth/PasswordResetLinkController.php b/app/Http/Controllers/Auth/PasswordResetLinkController.php
diff --git a/app/Http/Controllers/Auth/RegisteredUserController.php b/app/Http/Controllers/Auth/RegisteredUserController.php
diff --git a/app/Http/Controllers/Auth/VerifyEmailController.php b/app/Http/Controllers/Auth/VerifyEmailController.php
diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php
@@ -12,6 +12,6 @@ class VerifyCsrfToken extends Middleware
      * @var array<int, string>
      */
     protected $except = [
-        //
+        // 'livewire/*'
     ];
 }
diff --git a/app/Livewire/Customer/CreateCustomer.php b/app/Livewire/Customer/CreateCustomer.php
@@ -7,6 +7,7 @@
 use App\Models\Bill;
 use App\Models\Customer;
 use App\Models\Plan;
+use App\Models\Profile;
 use App\Models\Router;
 use App\Models\Secret;
 use App\Models\Setting;
@@ -44,16 +45,17 @@ public function store()
         $customer->fill($this->form->only(
             Customer::make()->getFillable()
         ));
-
         if ($this->form->secret_type === 'add_secret') {
             try {
                 $client = Router::getClient($router->host, $router->username, $router->password);
+                $profile = Profile::getProfile($client, $plan->ppp_profile_id);
+
                 $id = Secret::addSecret(
                     $client,
                     $this->form->secret_username,
                     $this->form->secret_password,
                     $this->form->ppp_service,
-                    $plan->ppp_profile_id,
+                    $profile['name'],
                     $this->form->local_address,
                     $this->form->remote_address,
                     $this->form->ip_type,