From b074cda26efc7cfc881f0d2ca17cd3dc52dc370d Mon Sep 17 00:00:00 2001
From: raish_varia <raish9396varia@gmail.com>
Date: Tue, 19 Nov 2019 08:39:54 +0530
Subject: [PATCH 1/4] refactor mail stuff

---
 .env.example                                  |   3 +
 app/Space/EnvironmentManager.php              | 222 ++++++++++++------
 resources/assets/js/plugins/en.js             |  16 +-
 .../js/views/wizard/mailDriver/Mailgun.vue    |   4 +-
 4 files changed, 168 insertions(+), 77 deletions(-)

diff --git a/.env.example b/.env.example
index 330a9e3f..09d89cf1 100644
--- a/.env.example
+++ b/.env.example
@@ -27,6 +27,9 @@ MAIL_USERNAME=
 MAIL_PASSWORD=
 MAIL_ENCRYPTION=
 
+MAIL_FROM_ADDRESS=
+MAIL_FROM_NAME=
+
 PUSHER_APP_ID=
 PUSHER_KEY=
 PUSHER_SECRET=
diff --git a/app/Space/EnvironmentManager.php b/app/Space/EnvironmentManager.php
index 456a0e0f..dc2c487a 100755
--- a/app/Space/EnvironmentManager.php
+++ b/app/Space/EnvironmentManager.php
@@ -33,20 +33,20 @@ class EnvironmentManager
     public function saveDatabaseVariables(DatabaseEnvironmentRequest $request)
     {
         $oldDatabaseData =
-        'DB_CONNECTION='.config('database.default')."\n".
-        'DB_HOST='.config('database.connections.'.config('database.default').'.host')."\n".
-        'DB_PORT='.config('database.connections.'.config('database.default').'.port')."\n".
-        'DB_DATABASE='.config('database.connections.'.config('database.default').'.database')."\n".
-        'DB_USERNAME='.config('database.connections.'.config('database.default').'.username')."\n".
-        'DB_PASSWORD='.config('database.connections.'.config('database.default').'.password')."\n\n";
+            'DB_CONNECTION='.config('database.default')."\n".
+            'DB_HOST='.config('database.connections.'.config('database.default').'.host')."\n".
+            'DB_PORT='.config('database.connections.'.config('database.default').'.port')."\n".
+            'DB_DATABASE='.config('database.connections.'.config('database.default').'.database')."\n".
+            'DB_USERNAME='.config('database.connections.'.config('database.default').'.username')."\n".
+            'DB_PASSWORD='.config('database.connections.'.config('database.default').'.password')."\n\n";
 
         $newDatabaseData =
-        'DB_CONNECTION='.$request->database_connection."\n".
-        'DB_HOST='.$request->database_hostname."\n".
-        'DB_PORT='.$request->database_port."\n".
-        'DB_DATABASE='.$request->database_name."\n".
-        'DB_USERNAME='.$request->database_username."\n".
-        'DB_PASSWORD='.$request->database_password."\n\n";
+            'DB_CONNECTION='.$request->database_connection."\n".
+            'DB_HOST='.$request->database_hostname."\n".
+            'DB_PORT='.$request->database_port."\n".
+            'DB_DATABASE='.$request->database_name."\n".
+            'DB_USERNAME='.$request->database_username."\n".
+            'DB_PASSWORD='.$request->database_password."\n\n";
 
         if (! $this->checkDatabaseConnection($request)) {
 
@@ -97,6 +97,8 @@ class EnvironmentManager
 
         $mailData = $this->getMailData($request);
         dd($mailData);
+//         extra_mail_data
+// extra_old_mail_data
         try {
 
             file_put_contents($this->envPath, str_replace(
@@ -118,40 +120,68 @@ class EnvironmentManager
 
     private function getMailData($request)
     {
-        $mailCredential = "";
-        $otherCredential = "";
-        $oldMailOtherCredential = "";
+        $mailFromCredential = "";
+        $extraMailData = "";
+        $extraOldMailData = "";
+        $oldMailData = "";
+        $newMailData = "";
 
         if(env('MAIL_FROM_ADDRESS') && env('MAIL_FROM_NAME')) {
-            $oldMailOtherCredential =
+            $mailFromCredential =
                 'MAIL_FROM_ADDRESS='.config('mail.from.address')."\n".
                 'MAIL_FROM_NAME='.config('mail.from.name')."\n\n";
         }
 
-        $oldMailCredential =
-            'MAIL_USERNAME='.config('mail.username')."\n".
-            'MAIL_PASSWORD='.config('mail.password')."\n";
-
-        $resetCredential =
-            'MAIL_USERNAME='."\n".
-            'MAIL_PASSWORD='."\n";
-
         switch ($request->mail_driver) {
             case 'smtp':
-                $mailCredential=
+
+                $oldMailData =
+                    'MAIL_DRIVER='.config('mail.driver')."\n".
+                    'MAIL_HOST='.config('mail.host')."\n".
+                    'MAIL_PORT='.config('mail.port')."\n".
+                    'MAIL_USERNAME='.config('mail.username')."\n".
+                    'MAIL_PASSWORD='.config('mail.password')."\n";
+                    'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
+                    $mailFromCredential;
+        
+                $newMailData =
+                    'MAIL_DRIVER='.$request->mail_driver."\n".
+                    'MAIL_HOST='.$request->mail_host."\n".
+                    'MAIL_PORT='.$request->mail_port."\n".
                     'MAIL_USERNAME='.$request->mail_username."\n".
                     'MAIL_PASSWORD='.$request->mail_password."\n";
+                    'MAIL_ENCRYPTION='.$request->mail_encryption."\n\n".
+                    'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
+                    'MAIL_FROM_NAME='.$request->from_name."\n\n";
                 break;
 
             case 'mailgun':
-                $mailCredential = $resetCredential;
-                $otherCredential=
+                $oldMailData =
+                    'MAIL_DRIVER='.config('mail.driver')."\n".
+                    'MAIL_HOST='.config('mail.host')."\n".
+                    'MAIL_PORT='.config('mail.port')."\n".
+                    'MAIL_USERNAME='.config('mail.username')."\n".
+                    'MAIL_PASSWORD='.config('mail.password')."\n";
+                    'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
+                    $mailFromCredential;
+        
+                $newMailData =
+                    'MAIL_DRIVER='.$request->mail_driver."\n".
+                    'MAIL_HOST='.$request->mail_host."\n".
+                    'MAIL_PORT='.$request->mail_port."\n".
+                    'MAIL_USERNAME='.config('mail.username')."\n".
+                    'MAIL_PASSWORD='.config('mail.password')."\n";
+                    'MAIL_ENCRYPTION='.$request->mail_encryption."\n\n".
+                    'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
+                    'MAIL_FROM_NAME='.$request->from_name."\n\n";
+
+                $extraMailData=
                     'MAILGUN_DOMAIN='.$request->mail_mailgun_domain."\n".
                     'MAILGUN_SECRET='.$request->mail_mailgun_secret."\n".
                     'MAILGUN_ENDPOINT='.$request->mail_mailgun_endpoint."\n\n";
 
                 if(env('MAILGUN_DOMAIN') && env('MAILGUN_SECRET') && env('MAILGUN_ENDPOINT')) {
-                    $oldMailOtherCredential =
+                    $extraOldMailData =
                         'MAILGUN_DOMAIN='.config('services.mailgun.domain')."\n".
                         'MAILGUN_SECRET='.config('services.mailgun.secret')."\n".
                         'MAILGUN_ENDPOINT='.config('services.mailgun.endpoint')."\n\n";
@@ -160,84 +190,142 @@ class EnvironmentManager
                 break;
 
             case 'sparkpost':
-                $mailCredential = $resetCredential;
-                $otherCredential=
+                $oldMailData =
+                    'MAIL_DRIVER='.config('mail.driver')."\n".
+                    'MAIL_HOST='.config('mail.host')."\n".
+                    'MAIL_PORT='.config('mail.port')."\n".
+                    'MAIL_USERNAME='.config('mail.username')."\n".
+                    'MAIL_PASSWORD='.config('mail.password')."\n";
+                    'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
+                    $mailFromCredential;
+
+                $newMailData =
+                    'MAIL_DRIVER='.$request->mail_driver."\n".
+                    'MAIL_HOST='.$request->mail_host."\n".
+                    'MAIL_PORT='.$request->mail_port."\n".
+                    'MAIL_USERNAME='.config('mail.username')."\n".
+                    'MAIL_PASSWORD='.config('mail.password')."\n";
+                    'MAIL_ENCRYPTION='.$request->mail_encryption."\n\n".
+                    'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
+                    'MAIL_FROM_NAME='.$request->from_name."\n\n";
+
+                $extraMailData=
                     'SPARKPOST_SECRET='.$request->mail_sparkpost_secret."\n\n";
 
-                if(env('SPARKPOST_SECRET')) {
-                    $oldMailOtherCredential =
-                        'SPARKPOST_SECRET='.config('services.sparkpost.secret')."\n\n";
-                }
+                    if(env('SPARKPOST_SECRET')) {
+                        $extraOldMailData =
+                            'SPARKPOST_SECRET='.config('services.sparkpost.secret')."\n\n";
+                    }
                 break;
 
             case 'ses':
-                $mailCredential = $resetCredential;
-                $otherCredential=
+                $oldMailData =
+                    'MAIL_DRIVER='.config('mail.driver')."\n".
+                    'MAIL_HOST='.config('mail.host')."\n".
+                    'MAIL_PORT='.config('mail.port')."\n".
+                    'MAIL_USERNAME='.config('mail.username')."\n".
+                    'MAIL_PASSWORD='.config('mail.password')."\n";
+                    'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
+                    $mailFromCredential;
+
+                $newMailData =
+                    'MAIL_DRIVER='.$request->mail_driver."\n".
+                    'MAIL_HOST='.$request->mail_host."\n".
+                    'MAIL_PORT='.$request->mail_port."\n".
+                    'MAIL_USERNAME='.config('mail.username')."\n".
+                    'MAIL_PASSWORD='.config('mail.password')."\n";
+                    'MAIL_ENCRYPTION='.$request->mail_encryption."\n\n".
+                    'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
+                    'MAIL_FROM_NAME='.$request->from_name."\n\n";
+
+                $extraMailData=
                     'SES_KEY='.$request->mail_ses_key."\n".
                     'SES_SECRET='.$request->mail_ses_secret."\n\n";
 
                 if(env('SES_KEY') && env('SES_SECRET')) {
-                    $oldMailOtherCredential =
+                    $extraOldMailData =
                         'SES_KEY='.config('services.ses.key')."\n".
                         'SES_SECRET='.config('services.ses.secret')."\n\n";
                 }
                 break;
 
             case 'mail':
-                $existMailData = 'MAIL_DRIVER='.$request->mail_driver."\n".
+                $oldMailData =
+                    'MAIL_DRIVER='.config('mail.driver')."\n".
                     'MAIL_HOST='.config('mail.host')."\n".
                     'MAIL_PORT='.config('mail.port')."\n".
-                    $resetCredential.
+                    'MAIL_USERNAME='.config('mail.username')."\n".
+                    'MAIL_PASSWORD='.config('mail.password')."\n";
+                    'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
+                    $mailFromCredential;
+
+                $newMailData =
+                    'MAIL_DRIVER='.$request->mail_driver."\n".
+                    'MAIL_HOST='.config('mail.host')."\n".
+                    'MAIL_PORT='.config('mail.port')."\n".
+                    'MAIL_USERNAME='.config('mail.username')."\n".
+                    'MAIL_PASSWORD='.config('mail.password')."\n";
                     'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
                     'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
-                    'MAIL_FROM_NAME='.$request->from_name."\n\n".
-                    $otherCredential;
+                    'MAIL_FROM_NAME='.$request->from_name."\n\n";
                 break;
 
             case 'sendmail':
-                $existMailData = 'MAIL_DRIVER='.$request->mail_driver."\n".
+                $oldMailData =
+                    'MAIL_DRIVER='.config('mail.driver')."\n".
                     'MAIL_HOST='.config('mail.host')."\n".
                     'MAIL_PORT='.config('mail.port')."\n".
-                    $resetCredential.
+                    'MAIL_USERNAME='.config('mail.username')."\n".
+                    'MAIL_PASSWORD='.config('mail.password')."\n";
+                    'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
+                    $mailFromCredential;
+
+                $newMailData =
+                    'MAIL_DRIVER='.$request->mail_driver."\n".
+                    'MAIL_HOST='.config('mail.host')."\n".
+                    'MAIL_PORT='.config('mail.port')."\n".
+                    'MAIL_USERNAME='.config('mail.username')."\n".
+                    'MAIL_PASSWORD='.config('mail.password')."\n";
                     'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
                     'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
-                    'MAIL_FROM_NAME='.$request->from_name."\n\n".
-                    $otherCredential;
+                    'MAIL_FROM_NAME='.$request->from_name."\n\n";
                 break;
 
             case 'mandrill':
-                $mailCredential = $oldMailCredential;
-                $otherCredential=
+                $oldMailData =
+                    'MAIL_DRIVER='.config('mail.driver')."\n".
+                    'MAIL_HOST='.config('mail.host')."\n".
+                    'MAIL_PORT='.config('mail.port')."\n".
+                    'MAIL_USERNAME='.config('mail.username')."\n".
+                    'MAIL_PASSWORD='.config('mail.password')."\n";
+                    'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
+                    $mailFromCredential;
+
+                $newMailData =
+                    'MAIL_DRIVER='.$request->mail_driver."\n".
+                    'MAIL_HOST='.$request->mail_host."\n".
+                    'MAIL_PORT='.$request->mail_port."\n".
+                    'MAIL_USERNAME='.config('mail.username')."\n".
+                    'MAIL_PASSWORD='.config('mail.password')."\n";
+                    'MAIL_ENCRYPTION='.$request->mail_encryption."\n\n".
+                    'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
+                    'MAIL_FROM_NAME='.$request->from_name."\n\n";
+
+                $extraMailData=
                     'MANDRILL_API_KEY='.$request->mail_mandrill_secret."\n\n";
 
                 if(env('MANDRILL_API_KEY')) {
-                    $oldMailOtherCredential =
+                    $extraOldMailData =
                         'MANDRILL_API_KEY='.config('services.mandrill.secret')."\n\n";
                 }
                 break;
         }
 
-        $oldMailData =
-            'MAIL_DRIVER='.config('mail.driver')."\n".
-            'MAIL_HOST='.config('mail.host')."\n".
-            'MAIL_PORT='.config('mail.port')."\n".
-            $oldMailCredential.
-            'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
-            $oldMailOtherCredential;
-
-        $newMailData = $existMailData ??
-            'MAIL_DRIVER='.$request->mail_driver."\n".
-            'MAIL_HOST='.$request->mail_host."\n".
-            'MAIL_PORT='.$request->mail_port."\n".
-            $mailCredential.
-            'MAIL_ENCRYPTION='.$request->mail_encryption."\n\n".
-            'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
-            'MAIL_FROM_NAME='.$request->from_name."\n\n".
-            $otherCredential;
-
         return [
             'old_mail_data' => $oldMailData,
-            'new_mail_data' => $newMailData
+            'new_mail_data' => $newMailData,
+            'extra_mail_data' => $extraMailData,
+            'extra_old_mail_data' => $extraOldMailData
         ];
     }
 
diff --git a/resources/assets/js/plugins/en.js b/resources/assets/js/plugins/en.js
index f726b3f9..91e9bfa7 100644
--- a/resources/assets/js/plugins/en.js
+++ b/resources/assets/js/plugins/en.js
@@ -569,16 +569,16 @@ export default {
       host: 'Mail Host',
       port: 'Mail Port',
       driver: 'Mail Driver',
-      domain: 'Domain',
       secret: 'Secret',
       sparkpost_secret: 'Sparkpost Secret',
-      mailgin_secret: 'Mailgun Secret',
+      mailgun_secret: 'Mailgun Secret',
+      mailgun_domain: 'Domain',
+      mailgun_endpoint: 'Mailgun Endpoint',
       ses_secret: 'SES Secret',
-      mandrill_secret: 'Mandrill Secret',
       ses_key: 'SES Key',
+      mandrill_secret: 'Mandrill Secret',
       password: 'Mail Password',
       username: 'Mail Username',
-      endpoint: 'Mail Endpoint',
       mail_config: 'Mail Configuration',
       from_name: 'From Mail Name',
       from_mail: 'From Mail Address',
@@ -747,16 +747,16 @@ export default {
       host: 'Mail Host',
       port: 'Mail Port',
       driver: 'Mail Driver',
-      domain: 'Domain',
       secret: 'Secret',
       sparkpost_secret: 'Sparkpost Secret',
-      mailgin_secret: 'Mailgun Secret',
+      mailgun_secret: 'Mailgun Secret',
+      mailgun_domain: 'Domain',
+      mailgun_endpoint: 'Mailgun Endpoint',
       ses_secret: 'SES Secret',
-      mandrill_secret: 'Mandrill Secret',
       ses_key: 'SES Key',
+      mandrill_secret: 'Mandrill Secret',
       password: 'Mail Password',
       username: 'Mail Username',
-      endpoint: 'Mail Endpoint',
       mail_config: 'Mail Configuration',
       from_name: 'From Mail Name',
       from_mail: 'From Mail Address',
diff --git a/resources/assets/js/views/wizard/mailDriver/Mailgun.vue b/resources/assets/js/views/wizard/mailDriver/Mailgun.vue
index a6fa165c..3e49ffb6 100644
--- a/resources/assets/js/views/wizard/mailDriver/Mailgun.vue
+++ b/resources/assets/js/views/wizard/mailDriver/Mailgun.vue
@@ -112,7 +112,7 @@
     </div>
     <div class="row my-2">
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.domain') }}</label>
+        <label class="form-label">{{ $t('wizard.mail.mailgun_domain') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.mail_mailgun_domain.$error"
@@ -128,7 +128,7 @@
         </div>
       </div>
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.mailgin_secret') }}</label>
+        <label class="form-label">{{ $t('wizard.mail.mailgun_secret') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.mail_mailgun_secret.$error"

From f1711ac2e9cc399bdec87e8f411038b4fa5b7a24 Mon Sep 17 00:00:00 2001
From: raishvaria <raishvaria1996@gmail.com>
Date: Tue, 19 Nov 2019 10:44:55 +0530
Subject: [PATCH 2/4] refactor mail var save on env

---
 app/Http/Requests/MailEnvironmentRequest.php  |  18 +-
 app/Space/EnvironmentManager.php              |  84 +++++----
 ...dsf\nMAILGUN_ENDPOINT=api.mailgun.net\n\n" | 159 ++++++++++++++++++
 .../js/views/settings/mailDriver/Mailgun.vue  |  14 +-
 4 files changed, 226 insertions(+), 49 deletions(-)
 create mode 100644 "public/MAILGUN_DOMAIN=sdfadsfds\nMAILGUN_SECRET=awerafdsf\nMAILGUN_ENDPOINT=api.mailgun.net\n\n"

diff --git a/app/Http/Requests/MailEnvironmentRequest.php b/app/Http/Requests/MailEnvironmentRequest.php
index cc911c6e..29b372ac 100644
--- a/app/Http/Requests/MailEnvironmentRequest.php
+++ b/app/Http/Requests/MailEnvironmentRequest.php
@@ -29,8 +29,8 @@ class MailEnvironmentRequest extends FormRequest
                     'mail_driver'           => 'required|string|max:50',
                     'mail_host'             => 'required|string|max:50',
                     'mail_port'             => 'required|max:50',
-                    'mail_username'         => 'required|string|max:50',
-                    'mail_password'         => 'required|string|max:50',
+                    'mail_username'         => 'required|string',
+                    'mail_password'         => 'required|string',
                     'mail_encryption'       => 'required|string|max:50',
                     'from_name'             => 'required|string|max:50',
                     'from_mail'             => 'required|string|max:50',
@@ -42,9 +42,9 @@ class MailEnvironmentRequest extends FormRequest
                     'mail_driver'           => 'required|string|max:50',
                     'mail_host'             => 'required|string|max:50',
                     'mail_port'             => 'required|max:50',
-                    'mail_mailgun_domain'   => 'required|string|max:50',
-                    'mail_mailgun_secret'   => 'required|string|max:50',
-                    'mail_mailgun_endpoint' => 'required|string|max:50',
+                    'mail_mailgun_domain'   => 'required|string',
+                    'mail_mailgun_secret'   => 'required|string',
+                    'mail_mailgun_endpoint' => 'required|string',
                     'mail_encryption'       => 'required|string|max:50',
                     'from_name'             => 'required|string|max:50',
                     'from_mail'             => 'required|string|max:50',
@@ -56,7 +56,7 @@ class MailEnvironmentRequest extends FormRequest
                     'mail_driver'           => 'required|string|max:50',
                     'mail_host'             => 'required|string|max:50',
                     'mail_port'             => 'required|max:50',
-                    'mail_sparkpost_secret' => 'required|string|max:50',
+                    'mail_sparkpost_secret' => 'required|string',
                     'mail_encryption'       => 'required|string|max:50',
                     'from_name'             => 'required|string|max:50',
                     'from_mail'             => 'required|string|max:50',
@@ -68,8 +68,8 @@ class MailEnvironmentRequest extends FormRequest
                     'mail_driver'           => 'required|string|max:50',
                     'mail_host'             => 'required|string|max:50',
                     'mail_port'             => 'required|max:50',
-                    'mail_ses_key'          => 'required|string|max:50',
-                    'mail_ses_secret'       => 'required|string|max:50',
+                    'mail_ses_key'          => 'required|string',
+                    'mail_ses_secret'       => 'required|string',
                     'mail_encryption'       => 'required|string|max:50',
                     'from_name'             => 'required|string|max:50',
                     'from_mail'             => 'required|string|max:50',
@@ -95,7 +95,7 @@ class MailEnvironmentRequest extends FormRequest
                     'mail_driver'           => 'required|string|max:50',
                     'mail_host'             => 'required|string|max:50',
                     'mail_port'             => 'required|max:50',
-                    'mail_mandrill_secret'  => 'required|string|max:50',
+                    'mail_mandrill_secret'  => 'required|string',
                     'mail_encryption'       => 'required|string|max:50',
                     'from_name'             => 'required|string|max:50',
                     'from_mail'             => 'required|string|max:50',
diff --git a/app/Space/EnvironmentManager.php b/app/Space/EnvironmentManager.php
index dc2c487a..deef9546 100755
--- a/app/Space/EnvironmentManager.php
+++ b/app/Space/EnvironmentManager.php
@@ -94,11 +94,8 @@ class EnvironmentManager
      */
     public function saveMailVariables(MailEnvironmentRequest $request)
     {
-
         $mailData = $this->getMailData($request);
-        dd($mailData);
-//         extra_mail_data
-// extra_old_mail_data
+
         try {
 
             file_put_contents($this->envPath, str_replace(
@@ -107,6 +104,22 @@ class EnvironmentManager
                 file_get_contents($this->envPath)
             ));
 
+            if($mailData['extra_old_mail_data']) {
+                file_put_contents($this->envPath, str_replace(
+                    $mailData['extra_old_mail_data'],
+                    $mailData['extra_mail_data'],
+                    file_get_contents($this->envPath)
+                ));
+            } else {
+                file_put_contents(
+                    $this->envPath,
+                    "\n".$mailData['extra_mail_data'],
+                    FILE_APPEND
+                );
+            }
+
+
+
         } catch (Exception $e) {
             return [
                 'error' => 'mail_variables_save_error'
@@ -126,7 +139,7 @@ class EnvironmentManager
         $oldMailData = "";
         $newMailData = "";
 
-        if(env('MAIL_FROM_ADDRESS') && env('MAIL_FROM_NAME')) {
+        if(env('MAIL_FROM_ADDRESS') !== NULL && env('MAIL_FROM_NAME') !== NULL ) {
             $mailFromCredential =
                 'MAIL_FROM_ADDRESS='.config('mail.from.address')."\n".
                 'MAIL_FROM_NAME='.config('mail.from.name')."\n\n";
@@ -140,19 +153,20 @@ class EnvironmentManager
                     'MAIL_HOST='.config('mail.host')."\n".
                     'MAIL_PORT='.config('mail.port')."\n".
                     'MAIL_USERNAME='.config('mail.username')."\n".
-                    'MAIL_PASSWORD='.config('mail.password')."\n";
+                    'MAIL_PASSWORD='.config('mail.password')."\n".
                     'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
                     $mailFromCredential;
-        
+
                 $newMailData =
                     'MAIL_DRIVER='.$request->mail_driver."\n".
                     'MAIL_HOST='.$request->mail_host."\n".
                     'MAIL_PORT='.$request->mail_port."\n".
                     'MAIL_USERNAME='.$request->mail_username."\n".
-                    'MAIL_PASSWORD='.$request->mail_password."\n";
+                    'MAIL_PASSWORD='.$request->mail_password."\n".
                     'MAIL_ENCRYPTION='.$request->mail_encryption."\n\n".
                     'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
                     'MAIL_FROM_NAME='.$request->from_name."\n\n";
+
                 break;
 
             case 'mailgun':
@@ -161,16 +175,16 @@ class EnvironmentManager
                     'MAIL_HOST='.config('mail.host')."\n".
                     'MAIL_PORT='.config('mail.port')."\n".
                     'MAIL_USERNAME='.config('mail.username')."\n".
-                    'MAIL_PASSWORD='.config('mail.password')."\n";
+                    'MAIL_PASSWORD='.config('mail.password')."\n".
                     'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
                     $mailFromCredential;
-        
+
                 $newMailData =
                     'MAIL_DRIVER='.$request->mail_driver."\n".
                     'MAIL_HOST='.$request->mail_host."\n".
                     'MAIL_PORT='.$request->mail_port."\n".
                     'MAIL_USERNAME='.config('mail.username')."\n".
-                    'MAIL_PASSWORD='.config('mail.password')."\n";
+                    'MAIL_PASSWORD='.config('mail.password')."\n".
                     'MAIL_ENCRYPTION='.$request->mail_encryption."\n\n".
                     'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
                     'MAIL_FROM_NAME='.$request->from_name."\n\n";
@@ -178,13 +192,13 @@ class EnvironmentManager
                 $extraMailData=
                     'MAILGUN_DOMAIN='.$request->mail_mailgun_domain."\n".
                     'MAILGUN_SECRET='.$request->mail_mailgun_secret."\n".
-                    'MAILGUN_ENDPOINT='.$request->mail_mailgun_endpoint."\n\n";
+                    'MAILGUN_ENDPOINT='.$request->mail_mailgun_endpoint."\n";
 
-                if(env('MAILGUN_DOMAIN') && env('MAILGUN_SECRET') && env('MAILGUN_ENDPOINT')) {
+                if(env('MAILGUN_DOMAIN') !== NULL && env('MAILGUN_SECRET') !== NULL && env('MAILGUN_ENDPOINT') !== NULL) {
                     $extraOldMailData =
                         'MAILGUN_DOMAIN='.config('services.mailgun.domain')."\n".
                         'MAILGUN_SECRET='.config('services.mailgun.secret')."\n".
-                        'MAILGUN_ENDPOINT='.config('services.mailgun.endpoint')."\n\n";
+                        'MAILGUN_ENDPOINT='.config('services.mailgun.endpoint')."\n";
                 }
 
                 break;
@@ -195,7 +209,7 @@ class EnvironmentManager
                     'MAIL_HOST='.config('mail.host')."\n".
                     'MAIL_PORT='.config('mail.port')."\n".
                     'MAIL_USERNAME='.config('mail.username')."\n".
-                    'MAIL_PASSWORD='.config('mail.password')."\n";
+                    'MAIL_PASSWORD='.config('mail.password')."\n".
                     'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
                     $mailFromCredential;
 
@@ -204,18 +218,19 @@ class EnvironmentManager
                     'MAIL_HOST='.$request->mail_host."\n".
                     'MAIL_PORT='.$request->mail_port."\n".
                     'MAIL_USERNAME='.config('mail.username')."\n".
-                    'MAIL_PASSWORD='.config('mail.password')."\n";
+                    'MAIL_PASSWORD='.config('mail.password')."\n".
                     'MAIL_ENCRYPTION='.$request->mail_encryption."\n\n".
                     'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
                     'MAIL_FROM_NAME='.$request->from_name."\n\n";
 
                 $extraMailData=
-                    'SPARKPOST_SECRET='.$request->mail_sparkpost_secret."\n\n";
+                    'SPARKPOST_SECRET='.$request->mail_sparkpost_secret."\n";
 
-                    if(env('SPARKPOST_SECRET')) {
+                    if(env('SPARKPOST_SECRET') !== NULL ) {
                         $extraOldMailData =
-                            'SPARKPOST_SECRET='.config('services.sparkpost.secret')."\n\n";
+                            'SPARKPOST_SECRET='.config('services.sparkpost.secret')."\n";
                     }
+
                 break;
 
             case 'ses':
@@ -224,7 +239,7 @@ class EnvironmentManager
                     'MAIL_HOST='.config('mail.host')."\n".
                     'MAIL_PORT='.config('mail.port')."\n".
                     'MAIL_USERNAME='.config('mail.username')."\n".
-                    'MAIL_PASSWORD='.config('mail.password')."\n";
+                    'MAIL_PASSWORD='.config('mail.password')."\n".
                     'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
                     $mailFromCredential;
 
@@ -233,20 +248,21 @@ class EnvironmentManager
                     'MAIL_HOST='.$request->mail_host."\n".
                     'MAIL_PORT='.$request->mail_port."\n".
                     'MAIL_USERNAME='.config('mail.username')."\n".
-                    'MAIL_PASSWORD='.config('mail.password')."\n";
+                    'MAIL_PASSWORD='.config('mail.password')."\n".
                     'MAIL_ENCRYPTION='.$request->mail_encryption."\n\n".
                     'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
                     'MAIL_FROM_NAME='.$request->from_name."\n\n";
 
                 $extraMailData=
                     'SES_KEY='.$request->mail_ses_key."\n".
-                    'SES_SECRET='.$request->mail_ses_secret."\n\n";
+                    'SES_SECRET='.$request->mail_ses_secret."\n";
 
-                if(env('SES_KEY') && env('SES_SECRET')) {
+                if(env('SES_KEY') !== NULL  && env('SES_SECRET') !== NULL ) {
                     $extraOldMailData =
                         'SES_KEY='.config('services.ses.key')."\n".
-                        'SES_SECRET='.config('services.ses.secret')."\n\n";
+                        'SES_SECRET='.config('services.ses.secret')."\n";
                 }
+
                 break;
 
             case 'mail':
@@ -255,7 +271,7 @@ class EnvironmentManager
                     'MAIL_HOST='.config('mail.host')."\n".
                     'MAIL_PORT='.config('mail.port')."\n".
                     'MAIL_USERNAME='.config('mail.username')."\n".
-                    'MAIL_PASSWORD='.config('mail.password')."\n";
+                    'MAIL_PASSWORD='.config('mail.password')."\n".
                     'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
                     $mailFromCredential;
 
@@ -264,10 +280,11 @@ class EnvironmentManager
                     'MAIL_HOST='.config('mail.host')."\n".
                     'MAIL_PORT='.config('mail.port')."\n".
                     'MAIL_USERNAME='.config('mail.username')."\n".
-                    'MAIL_PASSWORD='.config('mail.password')."\n";
+                    'MAIL_PASSWORD='.config('mail.password')."\n".
                     'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
                     'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
                     'MAIL_FROM_NAME='.$request->from_name."\n\n";
+
                 break;
 
             case 'sendmail':
@@ -276,7 +293,7 @@ class EnvironmentManager
                     'MAIL_HOST='.config('mail.host')."\n".
                     'MAIL_PORT='.config('mail.port')."\n".
                     'MAIL_USERNAME='.config('mail.username')."\n".
-                    'MAIL_PASSWORD='.config('mail.password')."\n";
+                    'MAIL_PASSWORD='.config('mail.password')."\n".
                     'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
                     $mailFromCredential;
 
@@ -285,10 +302,11 @@ class EnvironmentManager
                     'MAIL_HOST='.config('mail.host')."\n".
                     'MAIL_PORT='.config('mail.port')."\n".
                     'MAIL_USERNAME='.config('mail.username')."\n".
-                    'MAIL_PASSWORD='.config('mail.password')."\n";
+                    'MAIL_PASSWORD='.config('mail.password')."\n".
                     'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
                     'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
                     'MAIL_FROM_NAME='.$request->from_name."\n\n";
+
                 break;
 
             case 'mandrill':
@@ -297,7 +315,7 @@ class EnvironmentManager
                     'MAIL_HOST='.config('mail.host')."\n".
                     'MAIL_PORT='.config('mail.port')."\n".
                     'MAIL_USERNAME='.config('mail.username')."\n".
-                    'MAIL_PASSWORD='.config('mail.password')."\n";
+                    'MAIL_PASSWORD='.config('mail.password')."\n".
                     'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
                     $mailFromCredential;
 
@@ -306,17 +324,17 @@ class EnvironmentManager
                     'MAIL_HOST='.$request->mail_host."\n".
                     'MAIL_PORT='.$request->mail_port."\n".
                     'MAIL_USERNAME='.config('mail.username')."\n".
-                    'MAIL_PASSWORD='.config('mail.password')."\n";
+                    'MAIL_PASSWORD='.config('mail.password')."\n".
                     'MAIL_ENCRYPTION='.$request->mail_encryption."\n\n".
                     'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
                     'MAIL_FROM_NAME='.$request->from_name."\n\n";
 
                 $extraMailData=
-                    'MANDRILL_API_KEY='.$request->mail_mandrill_secret."\n\n";
+                    'MANDRILL_API_KEY='.$request->mail_mandrill_secret."\n";
 
-                if(env('MANDRILL_API_KEY')) {
+                if(env('MANDRILL_API_KEY') !== NULL ) {
                     $extraOldMailData =
-                        'MANDRILL_API_KEY='.config('services.mandrill.secret')."\n\n";
+                        'MANDRILL_API_KEY='.config('services.mandrill.secret')."\n";
                 }
                 break;
         }
diff --git "a/public/MAILGUN_DOMAIN=sdfadsfds\nMAILGUN_SECRET=awerafdsf\nMAILGUN_ENDPOINT=api.mailgun.net\n\n" "b/public/MAILGUN_DOMAIN=sdfadsfds\nMAILGUN_SECRET=awerafdsf\nMAILGUN_ENDPOINT=api.mailgun.net\n\n"
new file mode 100644
index 00000000..414cc134
--- /dev/null
+++ "b/public/MAILGUN_DOMAIN=sdfadsfds\nMAILGUN_SECRET=awerafdsf\nMAILGUN_ENDPOINT=api.mailgun.net\n\n"
@@ -0,0 +1,159 @@
+APP_ENV=local
+APP_KEY=base64:za3LXYKL1zDxPK+zCbyvPHKwwwPFe2h9YUj5MRepKas=
+APP_DEBUG=true
+APP_LOG_LEVEL=debug
+APP_URL=http://crater-web.test
+
+DB_CONNECTION=mysql
+DB_HOST=127.0.0.1
+DB_PORT=3306
+DB_DATABASE=crater_test
+DB_USERNAME=root
+DB_PASSWORD=
+
+BROADCAST_DRIVER=log
+CACHE_DRIVER=file
+SESSION_DRIVER=file
+QUEUE_DRIVER=sync
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_DRIVER=mailgun
+MAIL_HOST=mailtrap.io
+MAIL_PORT=2525
+MAIL_USERNAME=new@gmail.com
+MAIL_PASSWORD=admin@123
+MAIL_ENCRYPTION=tls
+
+MAIL_FROM_ADDRESS=admin@crater.in
+MAIL_FROM_NAME=Crater
+
+PUSHER_APP_ID=
+PUSHER_KEY=
+PUSHER_SECRET=
+
+PROXY_OAUTH_CLIENT_ID=2
+PROXY_OAUTH_CLIENT_SECRET=orsdUadWk74IaSNAzW9xv2CfjcEI85dJUsFFAxJw
+PROXY_OAUTH_GRANT_TYPE=password
+
+APP_ENV=local
+APP_KEY=base64:za3LXYKL1zDxPK+zCbyvPHKwwwPFe2h9YUj5MRepKas=
+APP_DEBUG=true
+APP_LOG_LEVEL=debug
+APP_URL=http://crater-web.test
+
+DB_CONNECTION=mysql
+DB_HOST=127.0.0.1
+DB_PORT=3306
+DB_DATABASE=crater_test
+DB_USERNAME=root
+DB_PASSWORD=
+
+BROADCAST_DRIVER=log
+CACHE_DRIVER=file
+SESSION_DRIVER=file
+QUEUE_DRIVER=sync
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_DRIVER=mailgun
+MAIL_HOST=mailtrap.io
+MAIL_PORT=2525
+MAIL_USERNAME=new@gmail.com
+MAIL_PASSWORD=admin@123
+MAIL_ENCRYPTION=tls
+
+MAIL_FROM_ADDRESS=admin@crater.inasdaf
+MAIL_FROM_NAME=Crater
+
+PUSHER_APP_ID=
+PUSHER_KEY=
+PUSHER_SECRET=
+
+PROXY_OAUTH_CLIENT_ID=2
+PROXY_OAUTH_CLIENT_SECRET=orsdUadWk74IaSNAzW9xv2CfjcEI85dJUsFFAxJw
+PROXY_OAUTH_GRANT_TYPE=password
+
+APP_ENV=local
+APP_KEY=base64:za3LXYKL1zDxPK+zCbyvPHKwwwPFe2h9YUj5MRepKas=
+APP_DEBUG=true
+APP_LOG_LEVEL=debug
+APP_URL=http://crater-web.test
+
+DB_CONNECTION=mysql
+DB_HOST=127.0.0.1
+DB_PORT=3306
+DB_DATABASE=crater_test
+DB_USERNAME=root
+DB_PASSWORD=
+
+BROADCAST_DRIVER=log
+CACHE_DRIVER=file
+SESSION_DRIVER=file
+QUEUE_DRIVER=sync
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_DRIVER=mailgun
+MAIL_HOST=mailtrap.io
+MAIL_PORT=2525
+MAIL_USERNAME=new@gmail.com
+MAIL_PASSWORD=admin@123
+MAIL_ENCRYPTION=tls
+
+MAIL_FROM_ADDRESS=admin@crater.inasdaf
+MAIL_FROM_NAME=Crater
+
+PUSHER_APP_ID=
+PUSHER_KEY=
+PUSHER_SECRET=
+
+PROXY_OAUTH_CLIENT_ID=2
+PROXY_OAUTH_CLIENT_SECRET=orsdUadWk74IaSNAzW9xv2CfjcEI85dJUsFFAxJw
+PROXY_OAUTH_GRANT_TYPE=password
+
+APP_ENV=local
+APP_KEY=base64:za3LXYKL1zDxPK+zCbyvPHKwwwPFe2h9YUj5MRepKas=
+APP_DEBUG=true
+APP_LOG_LEVEL=debug
+APP_URL=http://crater-web.test
+
+DB_CONNECTION=mysql
+DB_HOST=127.0.0.1
+DB_PORT=3306
+DB_DATABASE=crater_test
+DB_USERNAME=root
+DB_PASSWORD=
+
+BROADCAST_DRIVER=log
+CACHE_DRIVER=file
+SESSION_DRIVER=file
+QUEUE_DRIVER=sync
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_DRIVER=mailgun
+MAIL_HOST=mailtrap.io
+MAIL_PORT=2525
+MAIL_USERNAME=new@gmail.com
+MAIL_PASSWORD=admin@123
+MAIL_ENCRYPTION=tls
+
+MAIL_FROM_ADDRESS=admin@crater.inasdaf
+MAIL_FROM_NAME=Crater
+
+PUSHER_APP_ID=
+PUSHER_KEY=
+PUSHER_SECRET=
+
+PROXY_OAUTH_CLIENT_ID=2
+PROXY_OAUTH_CLIENT_SECRET=orsdUadWk74IaSNAzW9xv2CfjcEI85dJUsFFAxJw
+PROXY_OAUTH_GRANT_TYPE=password
diff --git a/resources/assets/js/views/settings/mailDriver/Mailgun.vue b/resources/assets/js/views/settings/mailDriver/Mailgun.vue
index a6fa165c..72e38565 100644
--- a/resources/assets/js/views/settings/mailDriver/Mailgun.vue
+++ b/resources/assets/js/views/settings/mailDriver/Mailgun.vue
@@ -100,7 +100,7 @@
           :invalid="$v.mailConfigData.from_name.$error"
           v-model.trim="mailConfigData.from_name"
           type="text"
-          name="name"
+          name="from_name"
           @input="$v.mailConfigData.from_name.$touch()"
         />
         <div v-if="$v.mailConfigData.from_name.$error">
@@ -112,13 +112,13 @@
     </div>
     <div class="row my-2">
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.domain') }}</label>
+        <label class="form-label">{{ $t('wizard.mail.mailgun_domain') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.mail_mailgun_domain.$error"
           v-model.trim="mailConfigData.mail_mailgun_domain"
           type="text"
-          name="db_name"
+          name="mailgun_domain"
           @input="$v.mailConfigData.mail_mailgun_domain.$touch()"
         />
         <div v-if="$v.mailConfigData.mail_mailgun_domain.$error">
@@ -128,13 +128,13 @@
         </div>
       </div>
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.mailgin_secret') }}</label>
+        <label class="form-label">{{ $t('wizard.mail.mailgun_secret') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.mail_mailgun_secret.$error"
           v-model.trim="mailConfigData.mail_mailgun_secret"
           type="password"
-          name="name"
+          name="mailgun_secret"
           show-password
           @input="$v.mailConfigData.mail_mailgun_secret.$touch()"
         />
@@ -147,13 +147,13 @@
     </div>
     <div class="row my-2">
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.endpoint') }}</label>
+        <label class="form-label">{{ $t('wizard.mail.mailgun_endpoint') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.mail_mailgun_endpoint.$error"
           v-model.trim="mailConfigData.mail_mailgun_endpoint"
           type="text"
-          name="mail_mailgun_endpoint"
+          name="mailgun_endpoint"
           @input="$v.mailConfigData.mail_mailgun_endpoint.$touch()"
         />
         <div v-if="$v.mailConfigData.mail_mailgun_endpoint.$error">

From 3b06e625022c4697ec1dceebf32a65ecf374b3b1 Mon Sep 17 00:00:00 2001
From: raishvaria <raishvaria1996@gmail.com>
Date: Tue, 19 Nov 2019 12:17:44 +0530
Subject: [PATCH 3/4] remove sparkpost and mandrill

---
 .../Controllers/EnvironmentController.php     |   6 +-
 app/Http/Requests/MailEnvironmentRequest.php  |  25 --
 app/Space/EnvironmentManager.php              |  59 -----
 config/services.php                           |   4 -
 resources/assets/js/plugins/en.js             |   4 -
 .../assets/js/views/settings/MailConfig.vue   |   6 +-
 .../js/views/settings/mailDriver/Basic.vue    |   8 +-
 .../js/views/settings/mailDriver/Mailgun.vue  |  18 +-
 .../js/views/settings/mailDriver/Mandrill.vue | 230 -----------------
 .../js/views/settings/mailDriver/Ses.vue      |  20 +-
 .../js/views/settings/mailDriver/Smtp.vue     |  18 +-
 .../views/settings/mailDriver/Sparkpost.vue   | 233 ------------------
 .../js/views/wizard/EmailConfiguration.vue    |   6 +-
 .../js/views/wizard/mailDriver/Mailgun.vue    |  10 +-
 .../js/views/wizard/mailDriver/Mandrill.vue   | 230 -----------------
 .../assets/js/views/wizard/mailDriver/Ses.vue |   4 +-
 .../js/views/wizard/mailDriver/Smtp.vue       |   2 +-
 .../js/views/wizard/mailDriver/Sparkpost.vue  | 233 ------------------
 18 files changed, 43 insertions(+), 1073 deletions(-)
 delete mode 100644 resources/assets/js/views/settings/mailDriver/Mandrill.vue
 delete mode 100644 resources/assets/js/views/settings/mailDriver/Sparkpost.vue
 delete mode 100644 resources/assets/js/views/wizard/mailDriver/Mandrill.vue
 delete mode 100644 resources/assets/js/views/wizard/mailDriver/Sparkpost.vue

diff --git a/app/Http/Controllers/EnvironmentController.php b/app/Http/Controllers/EnvironmentController.php
index 94d9701a..7bf6aaed 100755
--- a/app/Http/Controllers/EnvironmentController.php
+++ b/app/Http/Controllers/EnvironmentController.php
@@ -81,10 +81,8 @@ class EnvironmentController extends Controller
             'mail_mailgun_endpoint' => config('services.mailgun.endpoint'),
             'mail_mailgun_domain' => config('services.mailgun.domain'),
             'mail_mailgun_secret' => config('services.mailgun.secret'),
-            'mail_sparkpost_secret' => config('services.sparkpost.secret'),
             'mail_ses_key' => config('services.ses.key'),
             'mail_ses_secret' => config('services.ses.secret'),
-            'mail_mandrill_secret' => config('services.mandrill.secret'),
         ];
 
 
@@ -102,9 +100,7 @@ class EnvironmentController extends Controller
             'mail',
             'sendmail',
             'mailgun',
-            'mandrill',
-            'ses',
-            'sparkpost'
+            'ses'
         ];
 
         return response()->json($drivers);
diff --git a/app/Http/Requests/MailEnvironmentRequest.php b/app/Http/Requests/MailEnvironmentRequest.php
index 29b372ac..652964cb 100644
--- a/app/Http/Requests/MailEnvironmentRequest.php
+++ b/app/Http/Requests/MailEnvironmentRequest.php
@@ -51,18 +51,6 @@ class MailEnvironmentRequest extends FormRequest
                 ];
                 break;
 
-            case 'sparkpost':
-                return [
-                    'mail_driver'           => 'required|string|max:50',
-                    'mail_host'             => 'required|string|max:50',
-                    'mail_port'             => 'required|max:50',
-                    'mail_sparkpost_secret' => 'required|string',
-                    'mail_encryption'       => 'required|string|max:50',
-                    'from_name'             => 'required|string|max:50',
-                    'from_mail'             => 'required|string|max:50',
-                ];
-                break;
-
             case 'ses':
                 return [
                     'mail_driver'           => 'required|string|max:50',
@@ -89,19 +77,6 @@ class MailEnvironmentRequest extends FormRequest
                     'from_mail'             => 'required|string|max:50',
                 ];
                 break;
-
-            case 'mandrill':
-                return [
-                    'mail_driver'           => 'required|string|max:50',
-                    'mail_host'             => 'required|string|max:50',
-                    'mail_port'             => 'required|max:50',
-                    'mail_mandrill_secret'  => 'required|string',
-                    'mail_encryption'       => 'required|string|max:50',
-                    'from_name'             => 'required|string|max:50',
-                    'from_mail'             => 'required|string|max:50',
-                ];
-                break;
         }
-
     }
 }
diff --git a/app/Space/EnvironmentManager.php b/app/Space/EnvironmentManager.php
index deef9546..bd120703 100755
--- a/app/Space/EnvironmentManager.php
+++ b/app/Space/EnvironmentManager.php
@@ -203,36 +203,6 @@ class EnvironmentManager
 
                 break;
 
-            case 'sparkpost':
-                $oldMailData =
-                    'MAIL_DRIVER='.config('mail.driver')."\n".
-                    'MAIL_HOST='.config('mail.host')."\n".
-                    'MAIL_PORT='.config('mail.port')."\n".
-                    'MAIL_USERNAME='.config('mail.username')."\n".
-                    'MAIL_PASSWORD='.config('mail.password')."\n".
-                    'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
-                    $mailFromCredential;
-
-                $newMailData =
-                    'MAIL_DRIVER='.$request->mail_driver."\n".
-                    'MAIL_HOST='.$request->mail_host."\n".
-                    'MAIL_PORT='.$request->mail_port."\n".
-                    'MAIL_USERNAME='.config('mail.username')."\n".
-                    'MAIL_PASSWORD='.config('mail.password')."\n".
-                    'MAIL_ENCRYPTION='.$request->mail_encryption."\n\n".
-                    'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
-                    'MAIL_FROM_NAME='.$request->from_name."\n\n";
-
-                $extraMailData=
-                    'SPARKPOST_SECRET='.$request->mail_sparkpost_secret."\n";
-
-                    if(env('SPARKPOST_SECRET') !== NULL ) {
-                        $extraOldMailData =
-                            'SPARKPOST_SECRET='.config('services.sparkpost.secret')."\n";
-                    }
-
-                break;
-
             case 'ses':
                 $oldMailData =
                     'MAIL_DRIVER='.config('mail.driver')."\n".
@@ -308,35 +278,6 @@ class EnvironmentManager
                     'MAIL_FROM_NAME='.$request->from_name."\n\n";
 
                 break;
-
-            case 'mandrill':
-                $oldMailData =
-                    'MAIL_DRIVER='.config('mail.driver')."\n".
-                    'MAIL_HOST='.config('mail.host')."\n".
-                    'MAIL_PORT='.config('mail.port')."\n".
-                    'MAIL_USERNAME='.config('mail.username')."\n".
-                    'MAIL_PASSWORD='.config('mail.password')."\n".
-                    'MAIL_ENCRYPTION='.config('mail.encryption')."\n\n".
-                    $mailFromCredential;
-
-                $newMailData =
-                    'MAIL_DRIVER='.$request->mail_driver."\n".
-                    'MAIL_HOST='.$request->mail_host."\n".
-                    'MAIL_PORT='.$request->mail_port."\n".
-                    'MAIL_USERNAME='.config('mail.username')."\n".
-                    'MAIL_PASSWORD='.config('mail.password')."\n".
-                    'MAIL_ENCRYPTION='.$request->mail_encryption."\n\n".
-                    'MAIL_FROM_ADDRESS='.$request->from_mail."\n".
-                    'MAIL_FROM_NAME='.$request->from_name."\n\n";
-
-                $extraMailData=
-                    'MANDRILL_API_KEY='.$request->mail_mandrill_secret."\n";
-
-                if(env('MANDRILL_API_KEY') !== NULL ) {
-                    $extraOldMailData =
-                        'MANDRILL_API_KEY='.config('services.mandrill.secret')."\n";
-                }
-                break;
         }
 
         return [
diff --git a/config/services.php b/config/services.php
index 319fdc05..bc4699d8 100644
--- a/config/services.php
+++ b/config/services.php
@@ -34,10 +34,6 @@ return [
         'api_key' => env('SENDGRID_API_KEY'),
     ],
 
-    'mandrill' => [
-        'secret' => env('MANDRILL_API_KEY'),
-    ],
-
     'stripe' => [
         'model' => Crater\User::class,
         'key' => env('STRIPE_KEY'),
diff --git a/resources/assets/js/plugins/en.js b/resources/assets/js/plugins/en.js
index 91e9bfa7..f15c7a99 100644
--- a/resources/assets/js/plugins/en.js
+++ b/resources/assets/js/plugins/en.js
@@ -570,13 +570,11 @@ export default {
       port: 'Mail Port',
       driver: 'Mail Driver',
       secret: 'Secret',
-      sparkpost_secret: 'Sparkpost Secret',
       mailgun_secret: 'Mailgun Secret',
       mailgun_domain: 'Domain',
       mailgun_endpoint: 'Mailgun Endpoint',
       ses_secret: 'SES Secret',
       ses_key: 'SES Key',
-      mandrill_secret: 'Mandrill Secret',
       password: 'Mail Password',
       username: 'Mail Username',
       mail_config: 'Mail Configuration',
@@ -748,13 +746,11 @@ export default {
       port: 'Mail Port',
       driver: 'Mail Driver',
       secret: 'Secret',
-      sparkpost_secret: 'Sparkpost Secret',
       mailgun_secret: 'Mailgun Secret',
       mailgun_domain: 'Domain',
       mailgun_endpoint: 'Mailgun Endpoint',
       ses_secret: 'SES Secret',
       ses_key: 'SES Key',
-      mandrill_secret: 'Mandrill Secret',
       password: 'Mail Password',
       username: 'Mail Username',
       mail_config: 'Mail Configuration',
diff --git a/resources/assets/js/views/settings/MailConfig.vue b/resources/assets/js/views/settings/MailConfig.vue
index 3ba22956..58820c37 100644
--- a/resources/assets/js/views/settings/MailConfig.vue
+++ b/resources/assets/js/views/settings/MailConfig.vue
@@ -25,21 +25,17 @@ import MultiSelect from 'vue-multiselect'
 import { validationMixin } from 'vuelidate'
 import Smtp from './mailDriver/Smtp'
 import Mailgun from './mailDriver/Mailgun'
-import Sparkpost from './mailDriver/Sparkpost'
 import Ses from './mailDriver/Ses'
 import Basic from './mailDriver/Basic'
-import Mandrill from './mailDriver/Mandrill'
 
 export default {
   components: {
     MultiSelect,
     Smtp,
     Mailgun,
-    Sparkpost,
     Ses,
     sendmail: Basic,
-    mail: Basic,
-    Mandrill
+    mail: Basic
   },
   mixins: [validationMixin],
   data () {
diff --git a/resources/assets/js/views/settings/mailDriver/Basic.vue b/resources/assets/js/views/settings/mailDriver/Basic.vue
index 2d4f4b84..bb265378 100644
--- a/resources/assets/js/views/settings/mailDriver/Basic.vue
+++ b/resources/assets/js/views/settings/mailDriver/Basic.vue
@@ -2,7 +2,7 @@
   <form @submit.prevent="saveEmailConfig()">
     <div class="row">
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.driver') }}</label>
+        <label class="form-label">{{ $t('settings.mail.driver') }}</label>
         <span class="text-danger"> *</span>
         <base-select
           v-model="mailConfigData.mail_driver"
@@ -19,7 +19,7 @@
         </div>
       </div>
       <!-- <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.host') }}</label>
+        <label class="form-label">{{ $t('settings.mail.host') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.mail_host.$error"
@@ -37,7 +37,7 @@
     </div>
     <div class="row my-2">
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.from_mail') }}</label>
+        <label class="form-label">{{ $t('settings.mail.from_mail') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.from_mail.$error"
@@ -53,7 +53,7 @@
         </div>
       </div>
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.from_name') }}</label>
+        <label class="form-label">{{ $t('settings.mail.from_name') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.from_name.$error"
diff --git a/resources/assets/js/views/settings/mailDriver/Mailgun.vue b/resources/assets/js/views/settings/mailDriver/Mailgun.vue
index 72e38565..db4c1dac 100644
--- a/resources/assets/js/views/settings/mailDriver/Mailgun.vue
+++ b/resources/assets/js/views/settings/mailDriver/Mailgun.vue
@@ -2,7 +2,7 @@
   <form @submit.prevent="saveEmailConfig()">
     <div class="row">
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.driver') }}</label>
+        <label class="form-label">{{ $t('settings.mail.driver') }}</label>
         <span class="text-danger"> *</span>
         <base-select
           v-model="mailConfigData.mail_driver"
@@ -19,7 +19,7 @@
         </div>
       </div>
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.host') }}</label>
+        <label class="form-label">{{ $t('settings.mail.host') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.mail_host.$error"
@@ -37,7 +37,7 @@
     </div>
     <div class="row my-2">
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.port') }}</label>
+        <label class="form-label">{{ $t('settings.mail.port') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.mail_port.$error"
@@ -56,7 +56,7 @@
         </div>
       </div>
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.encryption') }}</label>
+        <label class="form-label">{{ $t('settings.mail.encryption') }}</label>
         <span class="text-danger"> *</span>
         <base-select
           v-model.trim="mailConfigData.mail_encryption"
@@ -75,7 +75,7 @@
     </div>
     <div class="row my-2">
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.from_mail') }}</label>
+        <label class="form-label">{{ $t('settings.mail.from_mail') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.from_mail.$error"
@@ -94,7 +94,7 @@
         </div>
       </div>
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.from_name') }}</label>
+        <label class="form-label">{{ $t('settings.mail.from_name') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.from_name.$error"
@@ -112,7 +112,7 @@
     </div>
     <div class="row my-2">
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.mailgun_domain') }}</label>
+        <label class="form-label">{{ $t('settings.mail.mailgun_domain') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.mail_mailgun_domain.$error"
@@ -128,7 +128,7 @@
         </div>
       </div>
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.mailgun_secret') }}</label>
+        <label class="form-label">{{ $t('settings.mail.mailgun_secret') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.mail_mailgun_secret.$error"
@@ -147,7 +147,7 @@
     </div>
     <div class="row my-2">
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.mailgun_endpoint') }}</label>
+        <label class="form-label">{{ $t('settings.mail.mailgun_endpoint') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.mail_mailgun_endpoint.$error"
diff --git a/resources/assets/js/views/settings/mailDriver/Mandrill.vue b/resources/assets/js/views/settings/mailDriver/Mandrill.vue
deleted file mode 100644
index c7a60a59..00000000
--- a/resources/assets/js/views/settings/mailDriver/Mandrill.vue
+++ /dev/null
@@ -1,230 +0,0 @@
-<template>
-  <form @submit.prevent="saveEmailConfig()">
-    <div class="row">
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.driver') }}</label>
-        <span class="text-danger"> *</span>
-        <base-select
-          v-model="mailConfigData.mail_driver"
-          :invalid="$v.mailConfigData.mail_driver.$error"
-          :options="mailDrivers"
-          :searchable="true"
-          :show-labels="false"
-          @input="onChangeDriver"
-        />
-        <div v-if="$v.mailConfigData.mail_driver.$error">
-          <span v-if="!$v.mailConfigData.mail_driver.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-        </div>
-      </div>
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.host') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.mail_host.$error"
-          v-model.trim="mailConfigData.mail_host"
-          type="text"
-          name="mail_host"
-          @input="$v.mailConfigData.mail_host.$touch()"
-        />
-        <div v-if="$v.mailConfigData.mail_host.$error">
-          <span v-if="!$v.mailConfigData.mail_host.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-        </div>
-      </div>
-    </div>
-    <div class="row my-2">
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.port') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.mail_port.$error"
-          v-model.trim="mailConfigData.mail_port"
-          type="text"
-          name="mail_port"
-          @input="$v.mailConfigData.mail_port.$touch()"
-        />
-        <div v-if="$v.mailConfigData.mail_port.$error">
-          <span v-if="!$v.mailConfigData.mail_port.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-        </div>
-      </div>
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.encryption') }}</label>
-        <span class="text-danger"> *</span>
-        <base-select
-          v-model.trim="mailConfigData.mail_encryption"
-          :invalid="$v.mailConfigData.mail_encryption.$error"
-          :options="encryptions"
-          :searchable="true"
-          :show-labels="false"
-          @input="$v.mailConfigData.mail_encryption.$touch()"
-        />
-        <div v-if="$v.mailConfigData.mail_encryption.$error">
-          <span v-if="!$v.mailConfigData.mail_encryption.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-        </div>
-      </div>
-    </div>
-    <div class="row my-2">
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.from_mail') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.from_mail.$error"
-          v-model.trim="mailConfigData.from_mail"
-          type="text"
-          name="from_mail"
-          @input="$v.mailConfigData.from_mail.$touch()"
-        />
-        <div v-if="$v.mailConfigData.from_mail.$error">
-          <span v-if="!$v.mailConfigData.from_mail.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-          <span v-if="!$v.mailConfigData.from_mail.numeric" class="text-danger">
-            {{ $tc('validation.numbers_only') }}
-          </span>
-        </div>
-      </div>
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.from_name') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.from_name.$error"
-          v-model.trim="mailConfigData.from_name"
-          type="text"
-          name="name"
-          @input="$v.mailConfigData.from_name.$touch()"
-        />
-        <div v-if="$v.mailConfigData.from_name.$error">
-          <span v-if="!$v.mailConfigData.from_name.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-        </div>
-      </div>
-    </div>
-    <div class="row my-2">
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.mandrill_secret') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.mail_mandrill_secret.$error"
-          v-model.trim="mailConfigData.mail_mandrill_secret"
-          type="password"
-          name="name"
-          show-password
-          @input="$v.mailConfigData.mail_mandrill_secret.$touch()"
-        />
-        <div v-if="$v.mailConfigData.mail_mandrill_secret.$error">
-          <span v-if="!$v.mailConfigData.mail_mandrill_secret.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-        </div>
-      </div>
-    </div>
-    <base-button
-      :loading="loading"
-      class="pull-right mt-4"
-      icon="save"
-      color="theme"
-      type="submit"
-    >
-      {{ $t('general.save') }}
-    </base-button>
-  </form>
-</template>
-<script>
-import MultiSelect from 'vue-multiselect'
-import { validationMixin } from 'vuelidate'
-const { required, email, numeric } = require('vuelidate/lib/validators')
-
-export default {
-  components: {
-    MultiSelect
-  },
-  mixins: [validationMixin],
-  props: {
-    configData: {
-      type: Object,
-      require: true,
-      default: Object
-    },
-    loading: {
-      type: Boolean,
-      require: true,
-      default: false
-    },
-    mailDrivers: {
-      type: Array,
-      require: true,
-      default: Array
-    }
-  },
-  data () {
-    return {
-      mailConfigData: {
-        mail_driver: '',
-        mail_host: '',
-        mail_port: null,
-        mail_mandrill_secret: '',
-        mail_encryption: 'tls',
-        from_mail: '',
-        from_name: ''
-      },
-      encryptions: ['tls', 'ssl', 'starttls']
-    }
-  },
-  validations: {
-    mailConfigData: {
-      mail_driver: {
-        required
-      },
-      mail_host: {
-        required
-      },
-      mail_port: {
-        required,
-        numeric
-      },
-      mail_mandrill_secret: {
-        required
-      },
-      mail_encryption: {
-        required
-      },
-      from_mail: {
-        required,
-        email
-      },
-      from_name: {
-        required
-      }
-    }
-  },
-  mounted () {
-    for (const key in this.mailConfigData) {
-      if (this.configData.hasOwnProperty(key)) {
-        this.mailConfigData[key] = this.configData[key]
-      }
-    }
-  },
-  methods: {
-    async saveEmailConfig () {
-      this.$v.mailConfigData.$touch()
-      if (!this.$v.mailConfigData.$invalid) {
-        this.$emit('submit-data', this.mailConfigData)
-      }
-
-      return false
-    },
-    onChangeDriver () {
-      this.$v.mailConfigData.mail_driver.$touch()
-      this.$emit('on-change-driver', this.mailConfigData.mail_driver)
-    }
-  }
-}
-</script>
diff --git a/resources/assets/js/views/settings/mailDriver/Ses.vue b/resources/assets/js/views/settings/mailDriver/Ses.vue
index 9733fe1e..c5486887 100644
--- a/resources/assets/js/views/settings/mailDriver/Ses.vue
+++ b/resources/assets/js/views/settings/mailDriver/Ses.vue
@@ -2,7 +2,7 @@
   <form @submit.prevent="saveEmailConfig()">
     <div class="row">
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.driver') }}</label>
+        <label class="form-label">{{ $t('settings.mail.driver') }}</label>
         <span class="text-danger"> *</span>
         <base-select
           v-model="mailConfigData.mail_driver"
@@ -19,7 +19,7 @@
         </div>
       </div>
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.host') }}</label>
+        <label class="form-label">{{ $t('settings.mail.host') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.mail_host.$error"
@@ -37,7 +37,7 @@
     </div>
     <div class="row my-2">
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.port') }}</label>
+        <label class="form-label">{{ $t('settings.mail.port') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.mail_port.$error"
@@ -56,7 +56,7 @@
         </div>
       </div>
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.encryption') }}</label>
+        <label class="form-label">{{ $t('settings.mail.encryption') }}</label>
         <span class="text-danger"> *</span>
         <base-select
           v-model.trim="mailConfigData.mail_encryption"
@@ -75,7 +75,7 @@
     </div>
     <div class="row my-2">
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.from_mail') }}</label>
+        <label class="form-label">{{ $t('settings.mail.from_mail') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.from_mail.$error"
@@ -94,7 +94,7 @@
         </div>
       </div>
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.from_name') }}</label>
+        <label class="form-label">{{ $t('settings.mail.from_name') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.from_name.$error"
@@ -112,13 +112,13 @@
     </div>
     <div class="row my-2">
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.ses_key') }}</label>
+        <label class="form-label">{{ $t('settings.mail.ses_key') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.mail_ses_key.$error"
           v-model.trim="mailConfigData.mail_ses_key"
           type="text"
-          name="name"
+          name="mail_ses_key"
           @input="$v.mailConfigData.mail_ses_key.$touch()"
         />
         <div v-if="$v.mailConfigData.mail_ses_key.$error">
@@ -128,13 +128,13 @@
         </div>
       </div>
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.ses_secret') }}</label>
+        <label class="form-label">{{ $t('settings.mail.ses_secret') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.mail_ses_secret.$error"
           v-model.trim="mailConfigData.mail_ses_secret"
           type="password"
-          name="name"
+          name="mail_ses_secret"
           show-password
           @input="$v.mailConfigData.mail_ses_secret.$touch()"
         />
diff --git a/resources/assets/js/views/settings/mailDriver/Smtp.vue b/resources/assets/js/views/settings/mailDriver/Smtp.vue
index 8bbea8d9..29bbb12e 100644
--- a/resources/assets/js/views/settings/mailDriver/Smtp.vue
+++ b/resources/assets/js/views/settings/mailDriver/Smtp.vue
@@ -2,7 +2,7 @@
   <form @submit.prevent="saveEmailConfig()">
     <div class="row">
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.driver') }}</label>
+        <label class="form-label">{{ $t('settings.mail.driver') }}</label>
         <span class="text-danger"> *</span>
         <base-select
           v-model="mailConfigData.mail_driver"
@@ -19,7 +19,7 @@
         </div>
       </div>
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.host') }}</label>
+        <label class="form-label">{{ $t('settings.mail.host') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.mail_host.$error"
@@ -37,7 +37,7 @@
     </div>
     <div class="row my-2">
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.username') }}</label>
+        <label class="form-label">{{ $t('settings.mail.username') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.mail_username.$error"
@@ -53,7 +53,7 @@
         </div>
       </div>
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.password') }}</label>
+        <label class="form-label">{{ $t('settings.mail.password') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.mail_password.$error"
@@ -72,7 +72,7 @@
     </div>
     <div class="row my-2">
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.port') }}</label>
+        <label class="form-label">{{ $t('settings.mail.port') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.mail_port.$error"
@@ -91,7 +91,7 @@
         </div>
       </div>
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.encryption') }}</label>
+        <label class="form-label">{{ $t('settings.mail.encryption') }}</label>
         <span class="text-danger"> *</span>
         <base-select
           v-model.trim="mailConfigData.mail_encryption"
@@ -110,7 +110,7 @@
     </div>
     <div class="row my-2">
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.from_mail') }}</label>
+        <label class="form-label">{{ $t('settings.mail.from_mail') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.from_mail.$error"
@@ -129,13 +129,13 @@
         </div>
       </div>
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.from_name') }}</label>
+        <label class="form-label">{{ $t('settings.mail.from_name') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.from_name.$error"
           v-model.trim="mailConfigData.from_name"
           type="text"
-          name="name"
+          name="from_name"
           @input="$v.mailConfigData.from_name.$touch()"
         />
         <div v-if="$v.mailConfigData.from_name.$error">
diff --git a/resources/assets/js/views/settings/mailDriver/Sparkpost.vue b/resources/assets/js/views/settings/mailDriver/Sparkpost.vue
deleted file mode 100644
index ae08d2ba..00000000
--- a/resources/assets/js/views/settings/mailDriver/Sparkpost.vue
+++ /dev/null
@@ -1,233 +0,0 @@
-<template>
-  <form @submit.prevent="saveEmailConfig()">
-    <div class="row">
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.driver') }}</label>
-        <span class="text-danger"> *</span>
-        <base-select
-          v-model="mailConfigData.mail_driver"
-          :invalid="$v.mailConfigData.mail_driver.$error"
-          :options="mailDrivers"
-          :searchable="true"
-          :show-labels="false"
-          @input="onChangeDriver"
-        />
-        <div v-if="$v.mailConfigData.mail_driver.$error">
-          <span v-if="!$v.mailConfigData.mail_driver.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-        </div>
-      </div>
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.host') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.mail_host.$error"
-          v-model.trim="mailConfigData.mail_host"
-          type="text"
-          name="mail_host"
-          @input="$v.mailConfigData.mail_host.$touch()"
-        />
-        <div v-if="$v.mailConfigData.mail_host.$error">
-          <span v-if="!$v.mailConfigData.mail_host.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-        </div>
-      </div>
-    </div>
-    <div class="row my-2">
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.port') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.mail_port.$error"
-          v-model.trim="mailConfigData.mail_port"
-          type="text"
-          name="mail_port"
-          @input="$v.mailConfigData.mail_port.$touch()"
-        />
-        <div v-if="$v.mailConfigData.mail_port.$error">
-          <span v-if="!$v.mailConfigData.mail_port.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-          <span v-if="!$v.mailConfigData.mail_port.numeric" class="text-danger">
-            {{ $tc('validation.numbers_only') }}
-          </span>
-        </div>
-      </div>
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.encryption') }}</label>
-        <span class="text-danger"> *</span>
-        <base-select
-          v-model.trim="mailConfigData.mail_encryption"
-          :invalid="$v.mailConfigData.mail_encryption.$error"
-          :options="encryptions"
-          :searchable="true"
-          :show-labels="false"
-          @input="$v.mailConfigData.mail_encryption.$touch()"
-        />
-        <div v-if="$v.mailConfigData.mail_encryption.$error">
-          <span v-if="!$v.mailConfigData.mail_encryption.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-        </div>
-      </div>
-    </div>
-    <div class="row my-2">
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.from_mail') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.from_mail.$error"
-          v-model.trim="mailConfigData.from_mail"
-          type="text"
-          name="from_mail"
-          @input="$v.mailConfigData.from_mail.$touch()"
-        />
-        <div v-if="$v.mailConfigData.from_mail.$error">
-          <span v-if="!$v.mailConfigData.from_mail.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-          <span v-if="!$v.mailConfigData.from_mail.numeric" class="text-danger">
-            {{ $tc('validation.numbers_only') }}
-          </span>
-        </div>
-      </div>
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.from_name') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.from_name.$error"
-          v-model.trim="mailConfigData.from_name"
-          type="text"
-          name="name"
-          @input="$v.mailConfigData.from_name.$touch()"
-        />
-        <div v-if="$v.mailConfigData.from_name.$error">
-          <span v-if="!$v.mailConfigData.from_name.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-        </div>
-      </div>
-    </div>
-    <div class="row my-2">
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.sparkpost_secret') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.mail_sparkpost_secret.$error"
-          v-model.trim="mailConfigData.mail_sparkpost_secret"
-          type="password"
-          name="name"
-          show-password
-          @input="$v.mailConfigData.mail_sparkpost_secret.$touch()"
-        />
-        <div v-if="$v.mailConfigData.mail_sparkpost_secret.$error">
-          <span v-if="!$v.mailConfigData.mail_sparkpost_secret.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-        </div>
-      </div>
-    </div>
-    <base-button
-      :loading="loading"
-      class="pull-right mt-4"
-      icon="save"
-      color="theme"
-      type="submit"
-    >
-      {{ $t('general.save') }}
-    </base-button>
-  </form>
-</template>
-<script>
-import MultiSelect from 'vue-multiselect'
-import { validationMixin } from 'vuelidate'
-const { required, email, numeric } = require('vuelidate/lib/validators')
-
-export default {
-  components: {
-    MultiSelect
-  },
-  mixins: [validationMixin],
-  props: {
-    configData: {
-      type: Object,
-      require: true,
-      default: Object
-    },
-    loading: {
-      type: Boolean,
-      require: true,
-      default: false
-    },
-    mailDrivers: {
-      type: Array,
-      require: true,
-      default: Array
-    }
-  },
-  data () {
-    return {
-      mailConfigData: {
-        mail_driver: '',
-        mail_host: '',
-        mail_port: null,
-        mail_sparkpost_secret: '',
-        mail_encryption: 'tls',
-        from_mail: '',
-        from_name: ''
-      },
-      encryptions: ['tls', 'ssl', 'starttls']
-    }
-  },
-  validations: {
-    mailConfigData: {
-      mail_driver: {
-        required
-      },
-      mail_host: {
-        required
-      },
-      mail_port: {
-        required,
-        numeric
-      },
-      mail_sparkpost_secret: {
-        required
-      },
-      mail_encryption: {
-        required
-      },
-      from_mail: {
-        required,
-        email
-      },
-      from_name: {
-        required
-      }
-    }
-  },
-  mounted () {
-    for (const key in this.mailConfigData) {
-      if (this.configData.hasOwnProperty(key)) {
-        this.mailConfigData[key] = this.configData[key]
-      }
-    }
-  },
-  methods: {
-    async saveEmailConfig () {
-      this.$v.mailConfigData.$touch()
-      if (!this.$v.mailConfigData.$invalid) {
-        this.$emit('submit-data', this.mailConfigData)
-      }
-
-      return false
-    },
-    onChangeDriver () {
-      this.$v.mailConfigData.mail_driver.$touch()
-      this.$emit('on-change-driver', this.mailConfigData.mail_driver)
-    }
-  }
-}
-</script>
diff --git a/resources/assets/js/views/wizard/EmailConfiguration.vue b/resources/assets/js/views/wizard/EmailConfiguration.vue
index 0c9e228e..17dc917b 100644
--- a/resources/assets/js/views/wizard/EmailConfiguration.vue
+++ b/resources/assets/js/views/wizard/EmailConfiguration.vue
@@ -19,21 +19,17 @@ import MultiSelect from 'vue-multiselect'
 import { validationMixin } from 'vuelidate'
 import Smtp from './mailDriver/Smtp'
 import Mailgun from './mailDriver/Mailgun'
-import Sparkpost from './mailDriver/Sparkpost'
 import Ses from './mailDriver/Ses'
 import Basic from './mailDriver/Basic'
-import Mandrill from './mailDriver/Mandrill'
 
 export default {
   components: {
     MultiSelect,
     Smtp,
     Mailgun,
-    Sparkpost,
     Ses,
     sendmail: Basic,
-    mail: Basic,
-    Mandrill
+    mail: Basic
   },
   mixins: [validationMixin],
   data () {
diff --git a/resources/assets/js/views/wizard/mailDriver/Mailgun.vue b/resources/assets/js/views/wizard/mailDriver/Mailgun.vue
index 3e49ffb6..72e38565 100644
--- a/resources/assets/js/views/wizard/mailDriver/Mailgun.vue
+++ b/resources/assets/js/views/wizard/mailDriver/Mailgun.vue
@@ -100,7 +100,7 @@
           :invalid="$v.mailConfigData.from_name.$error"
           v-model.trim="mailConfigData.from_name"
           type="text"
-          name="name"
+          name="from_name"
           @input="$v.mailConfigData.from_name.$touch()"
         />
         <div v-if="$v.mailConfigData.from_name.$error">
@@ -118,7 +118,7 @@
           :invalid="$v.mailConfigData.mail_mailgun_domain.$error"
           v-model.trim="mailConfigData.mail_mailgun_domain"
           type="text"
-          name="db_name"
+          name="mailgun_domain"
           @input="$v.mailConfigData.mail_mailgun_domain.$touch()"
         />
         <div v-if="$v.mailConfigData.mail_mailgun_domain.$error">
@@ -134,7 +134,7 @@
           :invalid="$v.mailConfigData.mail_mailgun_secret.$error"
           v-model.trim="mailConfigData.mail_mailgun_secret"
           type="password"
-          name="name"
+          name="mailgun_secret"
           show-password
           @input="$v.mailConfigData.mail_mailgun_secret.$touch()"
         />
@@ -147,13 +147,13 @@
     </div>
     <div class="row my-2">
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.endpoint') }}</label>
+        <label class="form-label">{{ $t('wizard.mail.mailgun_endpoint') }}</label>
         <span class="text-danger"> *</span>
         <base-input
           :invalid="$v.mailConfigData.mail_mailgun_endpoint.$error"
           v-model.trim="mailConfigData.mail_mailgun_endpoint"
           type="text"
-          name="mail_mailgun_endpoint"
+          name="mailgun_endpoint"
           @input="$v.mailConfigData.mail_mailgun_endpoint.$touch()"
         />
         <div v-if="$v.mailConfigData.mail_mailgun_endpoint.$error">
diff --git a/resources/assets/js/views/wizard/mailDriver/Mandrill.vue b/resources/assets/js/views/wizard/mailDriver/Mandrill.vue
deleted file mode 100644
index c7a60a59..00000000
--- a/resources/assets/js/views/wizard/mailDriver/Mandrill.vue
+++ /dev/null
@@ -1,230 +0,0 @@
-<template>
-  <form @submit.prevent="saveEmailConfig()">
-    <div class="row">
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.driver') }}</label>
-        <span class="text-danger"> *</span>
-        <base-select
-          v-model="mailConfigData.mail_driver"
-          :invalid="$v.mailConfigData.mail_driver.$error"
-          :options="mailDrivers"
-          :searchable="true"
-          :show-labels="false"
-          @input="onChangeDriver"
-        />
-        <div v-if="$v.mailConfigData.mail_driver.$error">
-          <span v-if="!$v.mailConfigData.mail_driver.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-        </div>
-      </div>
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.host') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.mail_host.$error"
-          v-model.trim="mailConfigData.mail_host"
-          type="text"
-          name="mail_host"
-          @input="$v.mailConfigData.mail_host.$touch()"
-        />
-        <div v-if="$v.mailConfigData.mail_host.$error">
-          <span v-if="!$v.mailConfigData.mail_host.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-        </div>
-      </div>
-    </div>
-    <div class="row my-2">
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.port') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.mail_port.$error"
-          v-model.trim="mailConfigData.mail_port"
-          type="text"
-          name="mail_port"
-          @input="$v.mailConfigData.mail_port.$touch()"
-        />
-        <div v-if="$v.mailConfigData.mail_port.$error">
-          <span v-if="!$v.mailConfigData.mail_port.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-        </div>
-      </div>
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.encryption') }}</label>
-        <span class="text-danger"> *</span>
-        <base-select
-          v-model.trim="mailConfigData.mail_encryption"
-          :invalid="$v.mailConfigData.mail_encryption.$error"
-          :options="encryptions"
-          :searchable="true"
-          :show-labels="false"
-          @input="$v.mailConfigData.mail_encryption.$touch()"
-        />
-        <div v-if="$v.mailConfigData.mail_encryption.$error">
-          <span v-if="!$v.mailConfigData.mail_encryption.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-        </div>
-      </div>
-    </div>
-    <div class="row my-2">
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.from_mail') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.from_mail.$error"
-          v-model.trim="mailConfigData.from_mail"
-          type="text"
-          name="from_mail"
-          @input="$v.mailConfigData.from_mail.$touch()"
-        />
-        <div v-if="$v.mailConfigData.from_mail.$error">
-          <span v-if="!$v.mailConfigData.from_mail.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-          <span v-if="!$v.mailConfigData.from_mail.numeric" class="text-danger">
-            {{ $tc('validation.numbers_only') }}
-          </span>
-        </div>
-      </div>
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.from_name') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.from_name.$error"
-          v-model.trim="mailConfigData.from_name"
-          type="text"
-          name="name"
-          @input="$v.mailConfigData.from_name.$touch()"
-        />
-        <div v-if="$v.mailConfigData.from_name.$error">
-          <span v-if="!$v.mailConfigData.from_name.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-        </div>
-      </div>
-    </div>
-    <div class="row my-2">
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.mandrill_secret') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.mail_mandrill_secret.$error"
-          v-model.trim="mailConfigData.mail_mandrill_secret"
-          type="password"
-          name="name"
-          show-password
-          @input="$v.mailConfigData.mail_mandrill_secret.$touch()"
-        />
-        <div v-if="$v.mailConfigData.mail_mandrill_secret.$error">
-          <span v-if="!$v.mailConfigData.mail_mandrill_secret.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-        </div>
-      </div>
-    </div>
-    <base-button
-      :loading="loading"
-      class="pull-right mt-4"
-      icon="save"
-      color="theme"
-      type="submit"
-    >
-      {{ $t('general.save') }}
-    </base-button>
-  </form>
-</template>
-<script>
-import MultiSelect from 'vue-multiselect'
-import { validationMixin } from 'vuelidate'
-const { required, email, numeric } = require('vuelidate/lib/validators')
-
-export default {
-  components: {
-    MultiSelect
-  },
-  mixins: [validationMixin],
-  props: {
-    configData: {
-      type: Object,
-      require: true,
-      default: Object
-    },
-    loading: {
-      type: Boolean,
-      require: true,
-      default: false
-    },
-    mailDrivers: {
-      type: Array,
-      require: true,
-      default: Array
-    }
-  },
-  data () {
-    return {
-      mailConfigData: {
-        mail_driver: '',
-        mail_host: '',
-        mail_port: null,
-        mail_mandrill_secret: '',
-        mail_encryption: 'tls',
-        from_mail: '',
-        from_name: ''
-      },
-      encryptions: ['tls', 'ssl', 'starttls']
-    }
-  },
-  validations: {
-    mailConfigData: {
-      mail_driver: {
-        required
-      },
-      mail_host: {
-        required
-      },
-      mail_port: {
-        required,
-        numeric
-      },
-      mail_mandrill_secret: {
-        required
-      },
-      mail_encryption: {
-        required
-      },
-      from_mail: {
-        required,
-        email
-      },
-      from_name: {
-        required
-      }
-    }
-  },
-  mounted () {
-    for (const key in this.mailConfigData) {
-      if (this.configData.hasOwnProperty(key)) {
-        this.mailConfigData[key] = this.configData[key]
-      }
-    }
-  },
-  methods: {
-    async saveEmailConfig () {
-      this.$v.mailConfigData.$touch()
-      if (!this.$v.mailConfigData.$invalid) {
-        this.$emit('submit-data', this.mailConfigData)
-      }
-
-      return false
-    },
-    onChangeDriver () {
-      this.$v.mailConfigData.mail_driver.$touch()
-      this.$emit('on-change-driver', this.mailConfigData.mail_driver)
-    }
-  }
-}
-</script>
diff --git a/resources/assets/js/views/wizard/mailDriver/Ses.vue b/resources/assets/js/views/wizard/mailDriver/Ses.vue
index 9733fe1e..ae8a2618 100644
--- a/resources/assets/js/views/wizard/mailDriver/Ses.vue
+++ b/resources/assets/js/views/wizard/mailDriver/Ses.vue
@@ -118,7 +118,7 @@
           :invalid="$v.mailConfigData.mail_ses_key.$error"
           v-model.trim="mailConfigData.mail_ses_key"
           type="text"
-          name="name"
+          name="mail_ses_key"
           @input="$v.mailConfigData.mail_ses_key.$touch()"
         />
         <div v-if="$v.mailConfigData.mail_ses_key.$error">
@@ -134,7 +134,7 @@
           :invalid="$v.mailConfigData.mail_ses_secret.$error"
           v-model.trim="mailConfigData.mail_ses_secret"
           type="password"
-          name="name"
+          name="mail_ses_secret"
           show-password
           @input="$v.mailConfigData.mail_ses_secret.$touch()"
         />
diff --git a/resources/assets/js/views/wizard/mailDriver/Smtp.vue b/resources/assets/js/views/wizard/mailDriver/Smtp.vue
index 8bbea8d9..994db778 100644
--- a/resources/assets/js/views/wizard/mailDriver/Smtp.vue
+++ b/resources/assets/js/views/wizard/mailDriver/Smtp.vue
@@ -135,7 +135,7 @@
           :invalid="$v.mailConfigData.from_name.$error"
           v-model.trim="mailConfigData.from_name"
           type="text"
-          name="name"
+          name="from_name"
           @input="$v.mailConfigData.from_name.$touch()"
         />
         <div v-if="$v.mailConfigData.from_name.$error">
diff --git a/resources/assets/js/views/wizard/mailDriver/Sparkpost.vue b/resources/assets/js/views/wizard/mailDriver/Sparkpost.vue
deleted file mode 100644
index ae08d2ba..00000000
--- a/resources/assets/js/views/wizard/mailDriver/Sparkpost.vue
+++ /dev/null
@@ -1,233 +0,0 @@
-<template>
-  <form @submit.prevent="saveEmailConfig()">
-    <div class="row">
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.driver') }}</label>
-        <span class="text-danger"> *</span>
-        <base-select
-          v-model="mailConfigData.mail_driver"
-          :invalid="$v.mailConfigData.mail_driver.$error"
-          :options="mailDrivers"
-          :searchable="true"
-          :show-labels="false"
-          @input="onChangeDriver"
-        />
-        <div v-if="$v.mailConfigData.mail_driver.$error">
-          <span v-if="!$v.mailConfigData.mail_driver.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-        </div>
-      </div>
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.host') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.mail_host.$error"
-          v-model.trim="mailConfigData.mail_host"
-          type="text"
-          name="mail_host"
-          @input="$v.mailConfigData.mail_host.$touch()"
-        />
-        <div v-if="$v.mailConfigData.mail_host.$error">
-          <span v-if="!$v.mailConfigData.mail_host.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-        </div>
-      </div>
-    </div>
-    <div class="row my-2">
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.port') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.mail_port.$error"
-          v-model.trim="mailConfigData.mail_port"
-          type="text"
-          name="mail_port"
-          @input="$v.mailConfigData.mail_port.$touch()"
-        />
-        <div v-if="$v.mailConfigData.mail_port.$error">
-          <span v-if="!$v.mailConfigData.mail_port.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-          <span v-if="!$v.mailConfigData.mail_port.numeric" class="text-danger">
-            {{ $tc('validation.numbers_only') }}
-          </span>
-        </div>
-      </div>
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.encryption') }}</label>
-        <span class="text-danger"> *</span>
-        <base-select
-          v-model.trim="mailConfigData.mail_encryption"
-          :invalid="$v.mailConfigData.mail_encryption.$error"
-          :options="encryptions"
-          :searchable="true"
-          :show-labels="false"
-          @input="$v.mailConfigData.mail_encryption.$touch()"
-        />
-        <div v-if="$v.mailConfigData.mail_encryption.$error">
-          <span v-if="!$v.mailConfigData.mail_encryption.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-        </div>
-      </div>
-    </div>
-    <div class="row my-2">
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.from_mail') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.from_mail.$error"
-          v-model.trim="mailConfigData.from_mail"
-          type="text"
-          name="from_mail"
-          @input="$v.mailConfigData.from_mail.$touch()"
-        />
-        <div v-if="$v.mailConfigData.from_mail.$error">
-          <span v-if="!$v.mailConfigData.from_mail.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-          <span v-if="!$v.mailConfigData.from_mail.numeric" class="text-danger">
-            {{ $tc('validation.numbers_only') }}
-          </span>
-        </div>
-      </div>
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.from_name') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.from_name.$error"
-          v-model.trim="mailConfigData.from_name"
-          type="text"
-          name="name"
-          @input="$v.mailConfigData.from_name.$touch()"
-        />
-        <div v-if="$v.mailConfigData.from_name.$error">
-          <span v-if="!$v.mailConfigData.from_name.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-        </div>
-      </div>
-    </div>
-    <div class="row my-2">
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.sparkpost_secret') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.mail_sparkpost_secret.$error"
-          v-model.trim="mailConfigData.mail_sparkpost_secret"
-          type="password"
-          name="name"
-          show-password
-          @input="$v.mailConfigData.mail_sparkpost_secret.$touch()"
-        />
-        <div v-if="$v.mailConfigData.mail_sparkpost_secret.$error">
-          <span v-if="!$v.mailConfigData.mail_sparkpost_secret.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-        </div>
-      </div>
-    </div>
-    <base-button
-      :loading="loading"
-      class="pull-right mt-4"
-      icon="save"
-      color="theme"
-      type="submit"
-    >
-      {{ $t('general.save') }}
-    </base-button>
-  </form>
-</template>
-<script>
-import MultiSelect from 'vue-multiselect'
-import { validationMixin } from 'vuelidate'
-const { required, email, numeric } = require('vuelidate/lib/validators')
-
-export default {
-  components: {
-    MultiSelect
-  },
-  mixins: [validationMixin],
-  props: {
-    configData: {
-      type: Object,
-      require: true,
-      default: Object
-    },
-    loading: {
-      type: Boolean,
-      require: true,
-      default: false
-    },
-    mailDrivers: {
-      type: Array,
-      require: true,
-      default: Array
-    }
-  },
-  data () {
-    return {
-      mailConfigData: {
-        mail_driver: '',
-        mail_host: '',
-        mail_port: null,
-        mail_sparkpost_secret: '',
-        mail_encryption: 'tls',
-        from_mail: '',
-        from_name: ''
-      },
-      encryptions: ['tls', 'ssl', 'starttls']
-    }
-  },
-  validations: {
-    mailConfigData: {
-      mail_driver: {
-        required
-      },
-      mail_host: {
-        required
-      },
-      mail_port: {
-        required,
-        numeric
-      },
-      mail_sparkpost_secret: {
-        required
-      },
-      mail_encryption: {
-        required
-      },
-      from_mail: {
-        required,
-        email
-      },
-      from_name: {
-        required
-      }
-    }
-  },
-  mounted () {
-    for (const key in this.mailConfigData) {
-      if (this.configData.hasOwnProperty(key)) {
-        this.mailConfigData[key] = this.configData[key]
-      }
-    }
-  },
-  methods: {
-    async saveEmailConfig () {
-      this.$v.mailConfigData.$touch()
-      if (!this.$v.mailConfigData.$invalid) {
-        this.$emit('submit-data', this.mailConfigData)
-      }
-
-      return false
-    },
-    onChangeDriver () {
-      this.$v.mailConfigData.mail_driver.$touch()
-      this.$emit('on-change-driver', this.mailConfigData.mail_driver)
-    }
-  }
-}
-</script>

From c6bfcddf504166b4f2cfb62cf8aa047f72885304 Mon Sep 17 00:00:00 2001
From: raishvaria <raishvaria1996@gmail.com>
Date: Tue, 19 Nov 2019 12:21:42 +0530
Subject: [PATCH 4/4] remove unused file

---
 ...dsf\nMAILGUN_ENDPOINT=api.mailgun.net\n\n" | 159 ------------------
 1 file changed, 159 deletions(-)
 delete mode 100644 "public/MAILGUN_DOMAIN=sdfadsfds\nMAILGUN_SECRET=awerafdsf\nMAILGUN_ENDPOINT=api.mailgun.net\n\n"

diff --git "a/public/MAILGUN_DOMAIN=sdfadsfds\nMAILGUN_SECRET=awerafdsf\nMAILGUN_ENDPOINT=api.mailgun.net\n\n" "b/public/MAILGUN_DOMAIN=sdfadsfds\nMAILGUN_SECRET=awerafdsf\nMAILGUN_ENDPOINT=api.mailgun.net\n\n"
deleted file mode 100644
index 414cc134..00000000
--- "a/public/MAILGUN_DOMAIN=sdfadsfds\nMAILGUN_SECRET=awerafdsf\nMAILGUN_ENDPOINT=api.mailgun.net\n\n"
+++ /dev/null
@@ -1,159 +0,0 @@
-APP_ENV=local
-APP_KEY=base64:za3LXYKL1zDxPK+zCbyvPHKwwwPFe2h9YUj5MRepKas=
-APP_DEBUG=true
-APP_LOG_LEVEL=debug
-APP_URL=http://crater-web.test
-
-DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
-DB_PORT=3306
-DB_DATABASE=crater_test
-DB_USERNAME=root
-DB_PASSWORD=
-
-BROADCAST_DRIVER=log
-CACHE_DRIVER=file
-SESSION_DRIVER=file
-QUEUE_DRIVER=sync
-
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
-REDIS_PORT=6379
-
-MAIL_DRIVER=mailgun
-MAIL_HOST=mailtrap.io
-MAIL_PORT=2525
-MAIL_USERNAME=new@gmail.com
-MAIL_PASSWORD=admin@123
-MAIL_ENCRYPTION=tls
-
-MAIL_FROM_ADDRESS=admin@crater.in
-MAIL_FROM_NAME=Crater
-
-PUSHER_APP_ID=
-PUSHER_KEY=
-PUSHER_SECRET=
-
-PROXY_OAUTH_CLIENT_ID=2
-PROXY_OAUTH_CLIENT_SECRET=orsdUadWk74IaSNAzW9xv2CfjcEI85dJUsFFAxJw
-PROXY_OAUTH_GRANT_TYPE=password
-
-APP_ENV=local
-APP_KEY=base64:za3LXYKL1zDxPK+zCbyvPHKwwwPFe2h9YUj5MRepKas=
-APP_DEBUG=true
-APP_LOG_LEVEL=debug
-APP_URL=http://crater-web.test
-
-DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
-DB_PORT=3306
-DB_DATABASE=crater_test
-DB_USERNAME=root
-DB_PASSWORD=
-
-BROADCAST_DRIVER=log
-CACHE_DRIVER=file
-SESSION_DRIVER=file
-QUEUE_DRIVER=sync
-
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
-REDIS_PORT=6379
-
-MAIL_DRIVER=mailgun
-MAIL_HOST=mailtrap.io
-MAIL_PORT=2525
-MAIL_USERNAME=new@gmail.com
-MAIL_PASSWORD=admin@123
-MAIL_ENCRYPTION=tls
-
-MAIL_FROM_ADDRESS=admin@crater.inasdaf
-MAIL_FROM_NAME=Crater
-
-PUSHER_APP_ID=
-PUSHER_KEY=
-PUSHER_SECRET=
-
-PROXY_OAUTH_CLIENT_ID=2
-PROXY_OAUTH_CLIENT_SECRET=orsdUadWk74IaSNAzW9xv2CfjcEI85dJUsFFAxJw
-PROXY_OAUTH_GRANT_TYPE=password
-
-APP_ENV=local
-APP_KEY=base64:za3LXYKL1zDxPK+zCbyvPHKwwwPFe2h9YUj5MRepKas=
-APP_DEBUG=true
-APP_LOG_LEVEL=debug
-APP_URL=http://crater-web.test
-
-DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
-DB_PORT=3306
-DB_DATABASE=crater_test
-DB_USERNAME=root
-DB_PASSWORD=
-
-BROADCAST_DRIVER=log
-CACHE_DRIVER=file
-SESSION_DRIVER=file
-QUEUE_DRIVER=sync
-
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
-REDIS_PORT=6379
-
-MAIL_DRIVER=mailgun
-MAIL_HOST=mailtrap.io
-MAIL_PORT=2525
-MAIL_USERNAME=new@gmail.com
-MAIL_PASSWORD=admin@123
-MAIL_ENCRYPTION=tls
-
-MAIL_FROM_ADDRESS=admin@crater.inasdaf
-MAIL_FROM_NAME=Crater
-
-PUSHER_APP_ID=
-PUSHER_KEY=
-PUSHER_SECRET=
-
-PROXY_OAUTH_CLIENT_ID=2
-PROXY_OAUTH_CLIENT_SECRET=orsdUadWk74IaSNAzW9xv2CfjcEI85dJUsFFAxJw
-PROXY_OAUTH_GRANT_TYPE=password
-
-APP_ENV=local
-APP_KEY=base64:za3LXYKL1zDxPK+zCbyvPHKwwwPFe2h9YUj5MRepKas=
-APP_DEBUG=true
-APP_LOG_LEVEL=debug
-APP_URL=http://crater-web.test
-
-DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
-DB_PORT=3306
-DB_DATABASE=crater_test
-DB_USERNAME=root
-DB_PASSWORD=
-
-BROADCAST_DRIVER=log
-CACHE_DRIVER=file
-SESSION_DRIVER=file
-QUEUE_DRIVER=sync
-
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
-REDIS_PORT=6379
-
-MAIL_DRIVER=mailgun
-MAIL_HOST=mailtrap.io
-MAIL_PORT=2525
-MAIL_USERNAME=new@gmail.com
-MAIL_PASSWORD=admin@123
-MAIL_ENCRYPTION=tls
-
-MAIL_FROM_ADDRESS=admin@crater.inasdaf
-MAIL_FROM_NAME=Crater
-
-PUSHER_APP_ID=
-PUSHER_KEY=
-PUSHER_SECRET=
-
-PROXY_OAUTH_CLIENT_ID=2
-PROXY_OAUTH_CLIENT_SECRET=orsdUadWk74IaSNAzW9xv2CfjcEI85dJUsFFAxJw
-PROXY_OAUTH_GRANT_TYPE=password