From e12a95f5a0275f93007a9c2ed05b7be9bcf72a81 Mon Sep 17 00:00:00 2001 From: sova-ci Date: Wed, 3 Jun 2026 17:06:19 +0300 Subject: [PATCH] chore(#27): sync issues/27 from monorepo (dad8c16 issues/27: verify MIS session before online visit and payment) --- .env | 52 +++++++++++++++++++++ .gitignore | 1 - assets/components/record.js | 15 +++--- src/Controller/PublicAPIController.php | 3 +- src/Controller/SpecialistController.php | 3 +- src/Repository/SpecialistViewRepository.php | 11 +---- src/Twig/AppExtension.php | 8 +--- 7 files changed, 66 insertions(+), 27 deletions(-) create mode 100644 .env diff --git a/.env b/.env new file mode 100644 index 0000000..fb97408 --- /dev/null +++ b/.env @@ -0,0 +1,52 @@ +# In all environments, the following files are loaded if they exist, +# the latter taking precedence over the former: +# +# * .env contains default values for the environment variables needed by the app +# * .env.local uncommitted file with local overrides +# * .env.$APP_ENV committed environment-specific defaults +# * .env.$APP_ENV.local uncommitted environment-specific overrides +# +# Real environment variables win over .env files. +# +# DO NOT DEFINE PRODUCTION SECRETS IN THIS FILE NOR IN ANY OTHER COMMITTED FILES. +# +# Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2). +# https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration + +###> symfony/framework-bundle ### +APP_ENV=prod +APP_SECRET=60c125f1b185d683df10d02b53c043bc +TRUSTED_PROXIES=127.0.0.1,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16 +TRUSTED_HEADERS='["x-forwarded-for","x-forwarded-host","x-forwarded-proto","x-forwarded-port","x-forwarded-prefix"]' +###< symfony/framework-bundle ### + +###> symfony/mailer ### +# MAILER_DSN=smtp://localhost +###< symfony/mailer ### + +###> doctrine/doctrine-bundle ### +# Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url +# IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml +# +# DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db" +# DATABASE_URL="mysql://cabinet_sova_:rP1bX9dG3sfJ5r@mysql:3306/cabinet_sova_?serverVersion=5.6" +DATABASE_BITRIX_URL="mysql://ivan:oE2tM9dI5t@77.106.69.11:3306/sovamed?serverVersion=8.3" +DATABASE_URL="postgresql://cabinet:zd3Ry-08Htrf-6ggkn@pgsql:5432/cabinet?serverVersion=13&charset=utf8" +###< doctrine/doctrine-bundle ### + +###> Redis ### +REDIS_URL="redis://Hgty-Gmmi-7655f-4zSd@redis:6379?timeout=2&dbindex=2" +###> Redis ### +SMSRU_KEY_API="B58070E1-E89B-95B0-D9BA-37A108868CAF" +SMSRU_FROM_SOVAMED="sovamed" +SMS4B_TOKEN="1334180305d8462dd9887f981fd3d05635c161c8a1bcda45" +SMS4B_FROM_WMTMED="Clinic_WMT" +MIS="https://widget.sovamed.ru" +BITRIX24_URL="/rest/10998/3hrv38rzo3khchj3/crm.lead.add.json" +SMARTCAPTCHA_SERVER_KEY="ysc2_EaQp6z8UPPQAIfHLm8mllruHsN3j42qGAz8VFY5l694a51cc" +###> nelmio/cors-bundle ### +CORS_ALLOW_ORIGIN='^https?://(localhost|127\.0\.0\.1|.*\.sovamed\.ru|.*\.wmtmed\.ru|sovamed\.ru|wmtmed\.ru)(:[0-9]+)?$' +###< nelmio/cors-bundle ### + +# Показ баннера «технические работы» (1/true/on/yes — включено) +TECH_MAINTENANCE=true diff --git a/.gitignore b/.gitignore index 1bcbb9b..328e463 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ ###> symfony/framework-bundle ### -/.env /.env.local /.env.local.php /.env.*.local diff --git a/assets/components/record.js b/assets/components/record.js index dd06990..5b06534 100644 --- a/assets/components/record.js +++ b/assets/components/record.js @@ -1,7 +1,6 @@ const loader = require("./loader.js"); const validator = require("./validator.js"); const helper = require("./helper.js"); -const onlineModeUtil = require("./onlineMode.js"); const Cookies = require('js-cookie'); function renderFormRecord(userInfo, params) { @@ -22,9 +21,9 @@ function renderFormRecord(userInfo, params) { popup.dataset.company = company; popup.dataset.comment = comment; popup.dataset.rnum = params.rnum; - popup.querySelector('.modal-title').innerHTML = onlineModeUtil.isOnlineMode(params.onlinemode) - ? 'Запись на онлайн-консультацию' - : 'Записаться к врачу' + popup.querySelector('.modal-title').innerHTML = (params.onlinemode === 'false') + ? 'Записаться к врачу' + : 'Запись на онлайн-консультацию' ; popup.querySelector('.modal-dialog').classList.remove('modal-lg'); @@ -36,7 +35,7 @@ function renderFormRecord(userInfo, params) { var licenseLink = helper.getLicenseLink(Cookies.get('region')); - if (!onlineModeUtil.isOnlineMode(params.onlinemode)) { + if (params.onlinemode === 'false') { var license = document.createElement('a'); license.classList = "staff-info__review license-link"; license.href = licenseLink; @@ -882,7 +881,11 @@ function validateData(data) { } function sendReserve(el) { - var onlineMode = onlineModeUtil.toOnlineType(el.dataset.onlinemode); + if (el.dataset.onlinemode === 'true') { + var onlineMode = 1; + } else { + var onlineMode = 0; + } var workDate = new Date(el.dataset.workDate); var time = el.dataset.time.split('-'); diff --git a/src/Controller/PublicAPIController.php b/src/Controller/PublicAPIController.php index a3c402a..36ab584 100644 --- a/src/Controller/PublicAPIController.php +++ b/src/Controller/PublicAPIController.php @@ -3,7 +3,6 @@ namespace App\Controller; use App\Bundle\Infoclinica\Region; -use App\Support\OnlineMode; use App\Entity\Record; use App\Entity\PriceDepartment; use App\Entity\PriceList; @@ -227,7 +226,7 @@ class PublicAPIController extends AbstractController $doctor = $request->query->get('doctor'); $department = $request->query->get('department'); $filial = $request->query->get('filial'); - $onlineMode = OnlineMode::isOnline($request->query->get('onlineMode')); + $onlineMode = $request->query->get('onlineMode')? true: false; $isFree = true; $nearestDate = NULL; diff --git a/src/Controller/SpecialistController.php b/src/Controller/SpecialistController.php index c6ea098..952d98a 100644 --- a/src/Controller/SpecialistController.php +++ b/src/Controller/SpecialistController.php @@ -119,7 +119,7 @@ SpecialistService $specialistService, $kinder = ($kinder == 1) ? 1 : null; $searchForm = $this->createForm(SpecialistSearchType::class, new SpecialistView(), [ - 'action' => $this->generateUrl('specialist_online_index'), + 'action' => $this->generateUrl('specialist_index'), 'method' => 'GET', 'regionId' => $regionId, 'kinder' => $kinder, @@ -128,7 +128,6 @@ SpecialistService $specialistService, $searchForm->handleRequest($request); $filters = $request->query->get('specialist_search', ['onlineMode' => 1]); - $filters['onlineMode'] = 1; if ($regionId > 0) { $filters['regionId'] = $regionId; diff --git a/src/Repository/SpecialistViewRepository.php b/src/Repository/SpecialistViewRepository.php index 985f319..e28854f 100644 --- a/src/Repository/SpecialistViewRepository.php +++ b/src/Repository/SpecialistViewRepository.php @@ -3,7 +3,6 @@ namespace App\Repository; use App\Entity\SpecialistView; -use App\Support\OnlineMode; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\Persistence\ManagerRegistry; use Doctrine\ORM\QueryBuilder; @@ -29,20 +28,12 @@ class SpecialistViewRepository extends ServiceEntityRepository private function applyFilters(QueryBuilder $qb, array $filters): void { foreach ($filters as $key => $value) { - // onlineMode=0 — валидный фильтр; empty(0) в PHP === true, поэтому обрабатываем отдельно. - if ($key === 'onlineMode') { - if ($value === null || $value === '') { - continue; - } - $this->applyOnlineModeFilter($qb, OnlineMode::isOnline($value)); - continue; - } - if (empty($value)) { continue; } match ($key) { + 'onlineMode' => $this->applyOnlineModeFilter($qb, $value), 'regionId' => $this->applyRegionFilter($qb, $value), 'alias' => $this->applyAliasFilter($qb, $value), 'filial' => $this->applyFilialFilter($qb, $value), diff --git a/src/Twig/AppExtension.php b/src/Twig/AppExtension.php index b15d024..4e10e34 100644 --- a/src/Twig/AppExtension.php +++ b/src/Twig/AppExtension.php @@ -180,12 +180,8 @@ class AppExtension extends AbstractExtension } public function isMobile() { - $useragent = $_SERVER['HTTP_USER_AGENT'] ?? ''; - - if ($useragent === '') { - return false; - } - + $useragent = $_SERVER['HTTP_USER_AGENT']; + return preg_match('/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i',$useragent) || preg_match('/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i',substr($useragent,0,4)); }