Commit 631bb433 authored by a.chevordin@iq-adv.ru's avatar a.chevordin@iq-adv.ru
Browse files

fixes

parent 77b9654d

.env.example

+4 −4
Original line number Diff line number Diff line 
APP_ENV=#{prod/dev} тип окружения

APP_SECRET=#Ключ приложения. Генерируется при сборке

APP_SECRET=#Ключ приложения



SERVER_NAME=#{localhost} домен приложения
@@ -9,6 +9,6 @@ DB_PASSWORD=#{password} Пароль для базы данных 


DATABASE_URL=#{"postgresql://test:password@database:5432/database?serverVersion=15&charset=utf8"} строка для подключения БД



JWT_SECRET_KEY=#{%kernel.project_dir%/config/jwt/private.pem} Путь до секретного ключа

JWT_PUBLIC_KEY=#{%kernel.project_dir%/config/jwt/public.pem} Путь до публичного ключа

JWT_PASSPHRASE=#Секретная фраза. Генерируется при сборке
 
 No newline at end of file
 
JWT_SECRET_KEY=#{%kernel.project_dir%/secret/jwt/private.pem} Путь до секретного ключа

JWT_PUBLIC_KEY=#{%kernel.project_dir%/secret/jwt/public.pem} Путь до публичного ключа

JWT_PASSPHRASE=#Секретная фраза
 
 No newline at end of file

.gitignore

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
###< symfony/framework-bundle ###



###> lexik/jwt-authentication-bundle ###

/config/jwt/*.pem

/secret/jwt/*.pem

###< lexik/jwt-authentication-bundle ###



###> phpunit/phpunit ###

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ build-up: 
	docker-compose build --no-cache

	docker-compose up -d

up:

	docker-compose up --build -d

	docker-compose up -d

jwt-generate:

	docker-compose exec php-fpm php ./bin/console lexik:jwt:generate-keypair

migrate:

docker-compose.yaml

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ services: 
      - data

      - server

    volumes:

      - ./:/app/

      - ./secret:/app/secret

    depends_on:

      - database

    restart: always

docs/PostmanCollection.json

+51 −3
Original line number Diff line number Diff line 
{

	"info": {

		"_postman_id": "21ec663a-fa7e-4486-b404-e2cadb8b92a9",

		"_postman_id": "10a88998-eff3-40f8-bf79-ea563480a151",

		"name": "RequestApplication",

		"description": "Generated from Insomnia v8.3.0",

		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json",
@@ -236,6 +236,10 @@ 
								"value": "Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJpYXQiOjE3MDA0Mjc4MzQsImV4cCI6MTcwMDQzMTQzNCwicm9sZXMiOlsiQkFTSUNfVVNFUiJdLCJlbWFpbCI6InRlc3RAZ21haWwuY29tIiwiaWQiOiI3ZjYwYTUyNS1iOWYwLTRlMTMtODZkMy1jZTJjMzIyYzlmNTMifQ.dr0wib8Mk7DXN1jJs8DfZvhywQ5FBP3XQG3YzCppeFAxbIaRd5X5VX120LhvNp7yfy5-rY8bHDI1tmnapGNI5I5O-R93Etpk_JFRxseJTdiPgyp9pPgc3i81AZbf6bgc3mRZGHBMeXkihm_f_6XzkcFR0W1tn8N7samrK87k6a_klq7Vf6pK6u3KrjSz1KhulktBq4w_6Fa1NXTdNNUYaexzTeKskhiw71ONPDqxcZBCLhDPrdZjhOHABf2pmCTMOBQEkABmzh42mFVG7mKC9TCY4VuVy-nxkADt5ZeGBYIvYJn7Ika6vP0rikYF3txTG8fmgtbO6a-sVZos4FkVDQ"

							}

						],

						"body": {

							"mode": "raw",

							"raw": "{\n    \"topic\": \"Тема\",\n    \"message\": \"Сообщение о том, как сложно нынче живётся\"\n}"

						},

						"url": {

							"raw": "{{baseUrl}}/api/user/requests",

							"host": [
@@ -344,7 +348,7 @@ 
							}

						],

						"url": {

							"raw": "{{baseUrl}}/api/user/requests",

							"raw": "{{baseUrl}}/api/user/requests?perPage=10&page=1&status=0&topic=Проверка",

							"host": [

								"{{baseUrl}}"

							],
@@ -352,6 +356,24 @@ 
								"api",

								"user",

								"requests"

							],

							"query": [

								{

									"key": "perPage",

									"value": "10"

								},

								{

									"key": "page",

									"value": "1"

								},

								{

									"key": "status",

									"value": "0"

								},

								{

									"key": "topic",

									"value": "Проверка"

								}

							]

						}

					},
@@ -553,6 +575,10 @@ 
								"value": "Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJpYXQiOjE3MDA0MzE3MDksImV4cCI6MTcwMDQzNTMwOSwicm9sZXMiOlsiTUFOQUdFUiJdLCJlbWFpbCI6InRlc3RBZG1pbkBnbWFpbC5jb20iLCJpZCI6ImFkZmE2MjMxLTVmZGQtNDM4OC05MjIxLTQ2OTdkZGYxMTY5ZSJ9.g5C6il6OLDNQl8RucvfBy1sAdEQ4xr5vw5UnQiKZJFFGTjUqZ7g1StgEPaT0YyWJvPvudTKaw1oKYHhDK9TsTKUiAvQ3CtRApeI4144t3XNHJXaNLBHHc7A3zNaJsyaEMJou3Y8TZOu-_pdmxUodkIAIrjydTv4bxLbjwdtyDo86Q2qkvV0YNz9L9AhofvAg8rB01LPTh7o_i2k1PlAHpMUnTInCGwGhe6AnU2PKLF_r3RntUh8lI-_bMJbe9Lb5IaOGqB_jzvh51Uyy-DDf0AC4y8jhGEf3oQK6RnCOgHU9LIVRQvnP2tO4Zjdn-1kgom_YA4GiQC8mdtIodi0ZQQ"

							}

						],

						"body": {

							"mode": "raw",

							"raw": "{\n    \"status\": 0,\n    \"comment\": \"Ответное сообщение о том, как сложно нынче живётся\"\n}"

						},

						"url": {

							"raw": "{{baseUrl}}/api/requests/2111e1b3-380c-4dc9-a0b1-f1e4c7c235bc",

							"host": [
@@ -657,13 +683,35 @@ 
							}

						],

						"url": {

							"raw": "{{baseUrl}}/api/requests",

							"raw": "{{baseUrl}}/api/requests?perPage=10&page=1&topic=Тема&userId&status=0",

							"host": [

								"{{baseUrl}}"

							],

							"path": [

								"api",

								"requests"

							],

							"query": [

								{

									"key": "perPage",

									"value": "10"

								},

								{

									"key": "page",

									"value": "1"

								},

								{

									"key": "topic",

									"value": "Тема"

								},

								{

									"key": "userId",

									"value": null

								},

								{

									"key": "status",

									"value": "0"

								}

							]

						}

					},