TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-27 19:51:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

remove sparkpost and mandrill

Browse Source
This commit is contained in:
raishvaria
2019-11-19 12:17:44 +05:30
parent f1711ac2e9
commit 3b06e62502
18 changed files with 43 additions and 1073 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/EnvironmentController.php
View File

@ -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);

25
app/Http/Requests/MailEnvironmentRequest.php
View File

@ -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;
}
}
}

59
app/Space/EnvironmentManager.php
View File

@ -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 [