mirror of
https://github.com/Part-DB/Part-DB-server.git
synced 2026-07-14 13:21:40 +00:00
Compare commits
No commits in common. "247fed7d742e705d036d51467c7aee8b27954e24" and "496df89e0bfa9662f45bee266e59cf9b97a14170" have entirely different histories.
247fed7d74
...
496df89e0b
11 changed files with 243 additions and 1318 deletions
|
|
@ -12,11 +12,9 @@
|
||||||
"ext-json": "*",
|
"ext-json": "*",
|
||||||
"ext-mbstring": "*",
|
"ext-mbstring": "*",
|
||||||
"amphp/http-client": "^5.1",
|
"amphp/http-client": "^5.1",
|
||||||
"api-platform/doctrine-orm": "^4.1",
|
"api-platform/core": "^3.1",
|
||||||
"api-platform/symfony": "^4.0.0",
|
|
||||||
"api-platform/json-api": "^4.0.0",
|
|
||||||
"beberlei/doctrineextensions": "^1.2",
|
"beberlei/doctrineextensions": "^1.2",
|
||||||
"brick/math": "^0.13.1",
|
"brick/math": "0.12.1 as 0.11.0",
|
||||||
"composer/ca-bundle": "^1.5",
|
"composer/ca-bundle": "^1.5",
|
||||||
"composer/package-versions-deprecated": "^1.11.99.5",
|
"composer/package-versions-deprecated": "^1.11.99.5",
|
||||||
"doctrine/data-fixtures": "^2.0.0",
|
"doctrine/data-fixtures": "^2.0.0",
|
||||||
|
|
@ -43,7 +41,7 @@
|
||||||
"nelmio/cors-bundle": "^2.3",
|
"nelmio/cors-bundle": "^2.3",
|
||||||
"nelmio/security-bundle": "^3.0",
|
"nelmio/security-bundle": "^3.0",
|
||||||
"nyholm/psr7": "^1.1",
|
"nyholm/psr7": "^1.1",
|
||||||
"omines/datatables-bundle": "^0.10.0",
|
"omines/datatables-bundle": "^0.9.1",
|
||||||
"paragonie/sodium_compat": "^1.21",
|
"paragonie/sodium_compat": "^1.21",
|
||||||
"part-db/label-fonts": "^1.0",
|
"part-db/label-fonts": "^1.0",
|
||||||
"rhukster/dom-sanitizer": "^1.0",
|
"rhukster/dom-sanitizer": "^1.0",
|
||||||
|
|
@ -86,7 +84,6 @@
|
||||||
"symfony/web-link": "7.3.*",
|
"symfony/web-link": "7.3.*",
|
||||||
"symfony/webpack-encore-bundle": "^v2.0.1",
|
"symfony/webpack-encore-bundle": "^v2.0.1",
|
||||||
"symfony/yaml": "7.3.*",
|
"symfony/yaml": "7.3.*",
|
||||||
"symplify/easy-coding-standard": "^12.5.20",
|
|
||||||
"tecnickcom/tc-lib-barcode": "^2.1.4",
|
"tecnickcom/tc-lib-barcode": "^2.1.4",
|
||||||
"twig/cssinliner-extra": "^3.0",
|
"twig/cssinliner-extra": "^3.0",
|
||||||
"twig/extra-bundle": "^3.8",
|
"twig/extra-bundle": "^3.8",
|
||||||
|
|
@ -95,7 +92,8 @@
|
||||||
"twig/intl-extra": "^3.8",
|
"twig/intl-extra": "^3.8",
|
||||||
"twig/markdown-extra": "^3.8",
|
"twig/markdown-extra": "^3.8",
|
||||||
"twig/string-extra": "^3.8",
|
"twig/string-extra": "^3.8",
|
||||||
"web-auth/webauthn-symfony-bundle": "^4.0.0"
|
"web-auth/webauthn-symfony-bundle": "^4.0.0",
|
||||||
|
"symplify/easy-coding-standard": "^12.5.20"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"dama/doctrine-test-bundle": "^v8.0.0",
|
"dama/doctrine-test-bundle": "^v8.0.0",
|
||||||
|
|
|
||||||
1499
composer.lock
generated
1499
composer.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -30,7 +30,7 @@ return [
|
||||||
Jbtronics\DompdfFontLoaderBundle\DompdfFontLoaderBundle::class => ['all' => true],
|
Jbtronics\DompdfFontLoaderBundle\DompdfFontLoaderBundle::class => ['all' => true],
|
||||||
KnpU\OAuth2ClientBundle\KnpUOAuth2ClientBundle::class => ['all' => true],
|
KnpU\OAuth2ClientBundle\KnpUOAuth2ClientBundle::class => ['all' => true],
|
||||||
Nelmio\CorsBundle\NelmioCorsBundle::class => ['all' => true],
|
Nelmio\CorsBundle\NelmioCorsBundle::class => ['all' => true],
|
||||||
|
ApiPlatform\Symfony\Bundle\ApiPlatformBundle::class => ['all' => true],
|
||||||
Jbtronics\SettingsBundle\JbtronicsSettingsBundle::class => ['all' => true],
|
Jbtronics\SettingsBundle\JbtronicsSettingsBundle::class => ['all' => true],
|
||||||
Jbtronics\TranslationEditorBundle\JbtronicsTranslationEditorBundle::class => ['dev' => true],
|
Jbtronics\TranslationEditorBundle\JbtronicsTranslationEditorBundle::class => ['dev' => true],
|
||||||
\ApiPlatform\Symfony\Bundle\ApiPlatformBundle::class => ['all' => true],
|
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -32,6 +32,7 @@ api_platform:
|
||||||
|
|
||||||
pagination_client_items_per_page: true # Allow clients to override the default items per page
|
pagination_client_items_per_page: true # Allow clients to override the default items per page
|
||||||
|
|
||||||
|
keep_legacy_inflector: false
|
||||||
# Need to be true, or some tests will fail
|
# Need to be true, or some tests will fail
|
||||||
use_symfony_listeners: true
|
use_symfony_listeners: true
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -28,11 +28,6 @@ framework:
|
||||||
#esi: true
|
#esi: true
|
||||||
#fragments: true
|
#fragments: true
|
||||||
|
|
||||||
|
|
||||||
form: { csrf_protection: { token_id: 'submit' } }
|
|
||||||
csrf_protection:
|
|
||||||
stateless_token_ids: ['submit', 'authenticate', 'logout']
|
|
||||||
|
|
||||||
when@test:
|
when@test:
|
||||||
framework:
|
framework:
|
||||||
test: true
|
test: true
|
||||||
|
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
# Enable stateless CSRF protection for forms and logins/logouts
|
|
||||||
framework:
|
|
||||||
csrf_protection:
|
|
||||||
check_header: true
|
|
||||||
|
|
@ -24,7 +24,7 @@ declare(strict_types=1);
|
||||||
namespace App\Serializer\APIPlatform;
|
namespace App\Serializer\APIPlatform;
|
||||||
|
|
||||||
use ApiPlatform\Metadata\Exception\ResourceClassNotFoundException;
|
use ApiPlatform\Metadata\Exception\ResourceClassNotFoundException;
|
||||||
use ApiPlatform\Metadata\IriConverterInterface;
|
use ApiPlatform\Api\IriConverterInterface;
|
||||||
use ApiPlatform\Metadata\Operation;
|
use ApiPlatform\Metadata\Operation;
|
||||||
use ApiPlatform\Metadata\Post;
|
use ApiPlatform\Metadata\Post;
|
||||||
use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
|
use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
|
||||||
|
|
|
||||||
|
|
@ -92,7 +92,7 @@ class PartNormalizer implements NormalizerInterface, DenormalizerInterface, Norm
|
||||||
return $data;
|
return $data;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function supportsDenormalization($data, string $type, ?string $format = null, array $context = []): bool
|
public function supportsDenormalization($data, string $type, string $format = null, array $context = []): bool
|
||||||
{
|
{
|
||||||
//Only denormalize if we are doing a file import operation
|
//Only denormalize if we are doing a file import operation
|
||||||
if (!($context['partdb_import'] ?? false)) {
|
if (!($context['partdb_import'] ?? false)) {
|
||||||
|
|
|
||||||
23
symfony.lock
23
symfony.lock
|
|
@ -1,16 +1,16 @@
|
||||||
{
|
{
|
||||||
"api-platform/symfony": {
|
"api-platform/core": {
|
||||||
"version": "4.1",
|
"version": "3.4",
|
||||||
"recipe": {
|
"recipe": {
|
||||||
"repo": "github.com/symfony/recipes",
|
"repo": "github.com/symfony/recipes",
|
||||||
"branch": "main",
|
"branch": "main",
|
||||||
"version": "4.0",
|
"version": "3.3",
|
||||||
"ref": "e9952e9f393c2d048f10a78f272cd35e807d972b"
|
"ref": "74b45ac570c57eb1fbe56c984091a9ff87e18bab"
|
||||||
},
|
},
|
||||||
"files": [
|
"files": [
|
||||||
"./config/packages/api_platform.yaml",
|
"config/packages/api_platform.yaml",
|
||||||
"./config/routes/api_platform.yaml",
|
"config/routes/api_platform.yaml",
|
||||||
"./src/ApiResource/.gitignore"
|
"src/ApiResource/.gitignore"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"beberlei/assert": {
|
"beberlei/assert": {
|
||||||
|
|
@ -748,16 +748,13 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"symfony/ux-turbo": {
|
"symfony/ux-turbo": {
|
||||||
"version": "2.28",
|
"version": "2.27",
|
||||||
"recipe": {
|
"recipe": {
|
||||||
"repo": "github.com/symfony/recipes",
|
"repo": "github.com/symfony/recipes",
|
||||||
"branch": "main",
|
"branch": "main",
|
||||||
"version": "2.20",
|
"version": "2.20",
|
||||||
"ref": "287f7c6eb6e9b65e422d34c00795b360a787380b"
|
"ref": "e4b951d7de760751e170c6d2e3b565cf9ed5182f"
|
||||||
},
|
}
|
||||||
"files": [
|
|
||||||
"config/packages/ux_turbo.yaml"
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
"symfony/validator": {
|
"symfony/validator": {
|
||||||
"version": "7.3",
|
"version": "7.3",
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,8 @@
|
||||||
{% block card_content %}
|
{% block card_content %}
|
||||||
<form action="{{ path('login') }}" method="post" data-turbo="false" class="form-horizontal">
|
<form action="{{ path('login') }}" method="post" data-turbo="false" class="form-horizontal">
|
||||||
|
|
||||||
<input type="hidden" name="_csrf_token" data-controller="csrf-protection" value="{{ csrf_token('authenticate') }}">
|
<input type="hidden" name="_csrf_token"
|
||||||
|
value="{{ csrf_token('authenticate') }}">
|
||||||
|
|
||||||
<input type="hidden" name="_target_path" value="{{ app.request.query.get('_target_path') }}" />
|
<input type="hidden" name="_target_path" value="{{ app.request.query.get('_target_path') }}" />
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue