ElyBy-Mirror/accounts
1
0
Fork 0
mirror of https://github.com/elyby/accounts.git synced 2025-05-31 14:11:46 +05:30
Code Issues Packages Projects Releases Wiki Activity

Update smtp mail transport configuration

Browse Source
This commit is contained in:
ErickSkrauch
2019-12-29 17:59:58 +03:00
parent 7607248c27
commit 3e1fb19cf3
4 changed files with 53 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.env-dist
View File

@@ -18,9 +18,11 @@ RECAPTCHA_SECRET=
SENTRY_DSN= SENTRY_DSN=
## SMTP params ## SMTP params
SMTP_HOST=
SMTP_PORT=
SMTP_USER= SMTP_USER=
SMTP_PASS= SMTP_PASS=
SMTP_PORT= SMTP_ENCRYPTION=
## MariaDB connection params ## MariaDB connection params
DB_HOST=db DB_HOST=db

16
api/models/FeedbackForm.php
View File

@@ -1,11 +1,13 @@
<?php <?php
declare(strict_types=1);
namespace api\models; namespace api\models;
use api\models\base\ApiForm; use api\models\base\ApiForm;
use common\helpers\Error as E; use common\helpers\Error as E;
use common\models\Account; use common\models\Account;
use Webmozart\Assert\Assert;
use Yii; use Yii;
use yii\base\ErrorException;
use yii\base\InvalidConfigException; use yii\base\InvalidConfigException;
class FeedbackForm extends ApiForm { class FeedbackForm extends ApiForm {
@@ -18,11 +20,11 @@ class FeedbackForm extends ApiForm {
public $message; public $message;
public function rules() { public function rules(): array {
return [ return [
['subject', 'required', 'message' => E::SUBJECT_REQUIRED], [['subject'], 'required', 'message' => E::SUBJECT_REQUIRED],
['email', 'required', 'message' => E::EMAIL_REQUIRED], [['email'], 'required', 'message' => E::EMAIL_REQUIRED],
['message', 'required', 'message' => E::MESSAGE_REQUIRED], [['message'], 'required', 'message' => E::MESSAGE_REQUIRED],
[['subject'], 'string', 'max' => 255], [['subject'], 'string', 'max' => 255],
[['email'], 'email', 'message' => E::EMAIL_INVALID], [['email'], 'email', 'message' => E::EMAIL_INVALID],
[['message'], 'string', 'max' => 65535], [['message'], 'string', 'max' => 65535],
@@ -52,9 +54,7 @@ class FeedbackForm extends ApiForm {
->setFrom([$this->email => $account ? $account->username : $this->email]) ->setFrom([$this->email => $account ? $account->username : $this->email])
->setSubject($this->subject); ->setSubject($this->subject);
if (!$message->send()) { Assert::true($message->send(), 'Unable send feedback email.');
throw new ErrorException('Unable send feedback email.');
}
return true; return true;
} }

10
common/config/config.php
View File

@@ -54,17 +54,11 @@ return [
'viewPath' => '@common/mail', 'viewPath' => '@common/mail',
'transport' => [ 'transport' => [
'class' => Swift_SmtpTransport::class, 'class' => Swift_SmtpTransport::class,
'host' => 'ely.by', 'host' => getenv('SMTP_HOST'),
'username' => getenv('SMTP_USER'), 'username' => getenv('SMTP_USER'),
'password' => getenv('SMTP_PASS'), 'password' => getenv('SMTP_PASS'),
'port' => getenv('SMTP_PORT') ?: 587, 'port' => getenv('SMTP_PORT') ?: 587,
'encryption' => 'tls', 'encryption' => getenv('SMTP_ENCRYPTION') ?: 'tls',
'streamOptions' => [
'ssl' => [
'allow_self_signed' => true,
'verify_peer' => false,
],
],
], ],
], ],
'sentry' => [ 'sentry' => [

71
composer.lock generated
View File

@@ -173,7 +173,7 @@
"version": "3.27.0", "version": "3.27.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/getsentry/raven-js-bower.git", "url": "git@github.com:getsentry/raven-js-bower.git",
"reference": "c8b3a6040be6928e2f57fa5eec4d7afc31750235" "reference": "c8b3a6040be6928e2f57fa5eec4d7afc31750235"
}, },
"dist": { "dist": {
@@ -520,30 +520,35 @@
}, },
{ {
"name": "doctrine/lexer", "name": "doctrine/lexer",
"version": "v1.0.1", "version": "1.2.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/lexer.git", "url": "https://github.com/doctrine/lexer.git",
"reference": "83893c552fd2045dd78aef794c31e694c37c0b8c" "reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c", "url": "https://api.github.com/repos/doctrine/lexer/zipball/5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6",
"reference": "83893c552fd2045dd78aef794c31e694c37c0b8c", "reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.2" "php": "^7.2"
},
"require-dev": {
"doctrine/coding-standard": "^6.0",
"phpstan/phpstan": "^0.11.8",
"phpunit/phpunit": "^8.2"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.0.x-dev" "dev-master": "1.2.x-dev"
} }
}, },
"autoload": { "autoload": {
"psr-0": { "psr-4": {
"Doctrine\\Common\\Lexer\\": "lib/" "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer"
} }
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
@@ -551,26 +556,29 @@
"MIT" "MIT"
], ],
"authors": [ "authors": [
{
"name": "Roman Borschel",
"email": "roman@code-factory.org"
},
{ {
"name": "Guilherme Blanco", "name": "Guilherme Blanco",
"email": "guilhermeblanco@gmail.com" "email": "guilhermeblanco@gmail.com"
}, },
{
"name": "Roman Borschel",
"email": "roman@code-factory.org"
},
{ {
"name": "Johannes Schmitt", "name": "Johannes Schmitt",
"email": "schmittjoh@gmail.com" "email": "schmittjoh@gmail.com"
} }
], ],
"description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.", "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.",
"homepage": "http://www.doctrine-project.org", "homepage": "https://www.doctrine-project.org/projects/lexer.html",
"keywords": [ "keywords": [
"annotations",
"docblock",
"lexer", "lexer",
"parser" "parser",
"php"
], ],
"time": "2014-09-09T13:34:57+00:00" "time": "2019-10-30T14:39:59+00:00"
}, },
{ {
"name": "domnikl/statsd", "name": "domnikl/statsd",
@@ -624,16 +632,16 @@
}, },
{ {
"name": "egulias/email-validator", "name": "egulias/email-validator",
"version": "2.1.7", "version": "2.1.12",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/egulias/EmailValidator.git", "url": "https://github.com/egulias/EmailValidator.git",
"reference": "709f21f92707308cdf8f9bcfa1af4cb26586521e" "reference": "a6255605af39f2db7f5cb62e672bd8a7bad8d208"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/egulias/EmailValidator/zipball/709f21f92707308cdf8f9bcfa1af4cb26586521e", "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/a6255605af39f2db7f5cb62e672bd8a7bad8d208",
"reference": "709f21f92707308cdf8f9bcfa1af4cb26586521e", "reference": "a6255605af39f2db7f5cb62e672bd8a7bad8d208",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -643,7 +651,8 @@
"require-dev": { "require-dev": {
"dominicsayers/isemail": "dev-master", "dominicsayers/isemail": "dev-master",
"phpunit/phpunit": "^4.8.35||^5.7||^6.0", "phpunit/phpunit": "^4.8.35||^5.7||^6.0",
"satooshi/php-coveralls": "^1.0.1" "satooshi/php-coveralls": "^1.0.1",
"symfony/phpunit-bridge": "^4.4@dev"
}, },
"suggest": { "suggest": {
"ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation" "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation"
@@ -651,7 +660,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.0.x-dev" "dev-master": "2.1.x-dev"
} }
}, },
"autoload": { "autoload": {
@@ -677,7 +686,7 @@
"validation", "validation",
"validator" "validator"
], ],
"time": "2018-12-04T22:38:24+00:00" "time": "2019-12-20T12:49:39+00:00"
}, },
{ {
"name": "ely/mojang-api", "name": "ely/mojang-api",
@@ -4776,12 +4785,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Roave/SecurityAdvisories.git", "url": "https://github.com/Roave/SecurityAdvisories.git",
"reference": "a115a278b47739a2f43a42fe8dc657948f256113" "reference": "44a677c8e06241a66409ae6e4820dc166fc09ab2"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/a115a278b47739a2f43a42fe8dc657948f256113", "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/44a677c8e06241a66409ae6e4820dc166fc09ab2",
"reference": "a115a278b47739a2f43a42fe8dc657948f256113", "reference": "44a677c8e06241a66409ae6e4820dc166fc09ab2",
"shasum": "" "shasum": ""
}, },
"conflict": { "conflict": {
@@ -4816,8 +4825,8 @@
"doctrine/mongodb-odm-bundle": ">=2,<3.0.1", "doctrine/mongodb-odm-bundle": ">=2,<3.0.1",
"doctrine/orm": ">=2,<2.4.8|>=2.5,<2.5.1", "doctrine/orm": ">=2,<2.4.8|>=2.5,<2.5.1",
"dompdf/dompdf": ">=0.6,<0.6.2", "dompdf/dompdf": ">=0.6,<0.6.2",
"drupal/core": ">=7,<7.67|>=8,<8.6.16|>=8.7,<8.7.1|>8.7.3,<8.7.5", "drupal/core": ">=7,<8.7.11|>=8.8,<8.8.1",
"drupal/drupal": ">=7,<7.67|>=8,<8.6.16|>=8.7,<8.7.1|>8.7.3,<8.7.5", "drupal/drupal": ">=7,<8.7.11|>=8.8,<8.8.1",
"erusev/parsedown": "<1.7.2", "erusev/parsedown": "<1.7.2",
"ezsystems/ezplatform-admin-ui": ">=1.3,<1.3.5|>=1.4,<1.4.4", "ezsystems/ezplatform-admin-ui": ">=1.3,<1.3.5|>=1.4,<1.4.4",
"ezsystems/ezpublish-kernel": ">=5.3,<5.3.12.1|>=5.4,<5.4.13.1|>=6,<6.7.9.1|>=6.8,<6.13.5.1|>=7,<7.2.4.1|>=7.3,<7.3.2.1", "ezsystems/ezpublish-kernel": ">=5.3,<5.3.12.1|>=5.4,<5.4.13.1|>=6,<6.7.9.1|>=6.8,<6.13.5.1|>=7,<7.2.4.1|>=7.3,<7.3.2.1",
@@ -4872,7 +4881,7 @@
"pusher/pusher-php-server": "<2.2.1", "pusher/pusher-php-server": "<2.2.1",
"robrichards/xmlseclibs": ">=1,<3.0.4", "robrichards/xmlseclibs": ">=1,<3.0.4",
"sabre/dav": ">=1.6,<1.6.99|>=1.7,<1.7.11|>=1.8,<1.8.9", "sabre/dav": ">=1.6,<1.6.99|>=1.7,<1.7.11|>=1.8,<1.8.9",
"scheb/two-factor-bundle": "<3.26|>=4,<4.11", "scheb/two-factor-bundle": ">=0,<3.26|>=4,<4.11",
"sensiolabs/connect": "<4.2.3", "sensiolabs/connect": "<4.2.3",
"serluck/phpwhois": "<=4.2.6", "serluck/phpwhois": "<=4.2.6",
"shopware/shopware": "<5.3.7", "shopware/shopware": "<5.3.7",
@@ -4987,7 +4996,7 @@
} }
], ],
"description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it", "description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it",
"time": "2019-12-20T16:49:07+00:00" "time": "2019-12-26T14:16:40+00:00"
}, },
{ {
"name": "sebastian/code-unit-reverse-lookup", "name": "sebastian/code-unit-reverse-lookup",