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

refactor mail var save on env

Browse Source
This commit is contained in:
raishvaria
2019-11-19 10:44:55 +05:30
parent b074cda26e
commit f1711ac2e9
4 changed files with 226 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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',

84
app/Space/EnvironmentManager.php
View File

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

159
public/MAILGUN_DOMAIN=sdfadsfds MAILGUN_SECRET=awerafdsf MAILGUN_ENDPOINT=api.mailgun.net Normal file
View File

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

14
resources/assets/js/views/settings/mailDriver/Mailgun.vue
View File

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