Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update main with latest changes dev branch #1619

Merged
merged 45 commits into from
Feb 12, 2024
Merged

Update main with latest changes dev branch #1619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
0b1870f
Start removing Email BL
WilcoLouwerse Dec 1, 2023
36fbf45
Set Gateway->configuration default value to verify=true
WilcoLouwerse Dec 7, 2023
9c51b7b
Merge pull request #1592 from ConductionNL/feature/MF-81/move-email-BL
WilcoLouwerse Dec 11, 2023
46a9a87
Reference should always be unique
WilcoLouwerse Dec 12, 2023
7ea7fbc
Merge pull request #1594 from ConductionNL/feature/unique-reference
WilcoLouwerse Dec 14, 2023
c35e075
Added version = 0.0.1 as default value for all Entity
WilcoLouwerse Dec 19, 2023
a2b25db
Merge pull request #1596 from ConductionNL/feature/default-version
WilcoLouwerse Dec 19, 2023
c1c40e8
Merge branch 'main' into feature/OP-171/publiccode-update
WilcoLouwerse Dec 21, 2023
39899d2
Merge pull request #1599 from ConductionNL/feature/OP-171/publiccode-…
WilcoLouwerse Dec 22, 2023
ddbe62a
Add trusted proxy config to correct location
rjzondervan Jan 9, 2024
49420df
Merge pull request #1602 from ConductionNL/feature/XW-151/add-trusted…
rjzondervan Jan 9, 2024
a5612bb
Set version default to 0.0.0 instead of 0.0.1
WilcoLouwerse Jan 9, 2024
5e52d7e
Merge pull request #1603 from ConductionNL/feature/default-version-fix
WilcoLouwerse Jan 9, 2024
9b52c30
Assert null for version & reference
WilcoLouwerse Jan 11, 2024
8754efb
Merge pull request #1605 from ConductionNL/feature/assert-null
WilcoLouwerse Jan 11, 2024
bf48bc8
Added @var for the property loggingConfig in Gateway.php
WilcoLouwerse Jan 15, 2024
ff98cc5
Merge pull request #1606 from ConductionNL/fix/gateway-loggingConfig
WilcoLouwerse Jan 15, 2024
c3a9f02
Fix the use of limit and page query param on /admin endpoints
WilcoLouwerse Jan 15, 2024
ba0d031
Merge pull request #1607 from ConductionNL/fix/admin-endpoints-pagina…
WilcoLouwerse Jan 15, 2024
8906eb2
Hotfix for BRK too large objects
rjzondervan Jan 16, 2024
4b00ecb
Merge pull request #1608 from ConductionNL/fix/BRK-54/maxDepth
rjzondervan Jan 16, 2024
aaf6dda
Also run this on multiple
rjzondervan Jan 16, 2024
d779fcd
Merge pull request #1609 from ConductionNL/fix/BRK-54/maxDepth
rjzondervan Jan 16, 2024
def809e
Comment out some deprecated code to fix old sync
WilcoLouwerse Jan 22, 2024
2af0136
Merge pull request #1610 from ConductionNL/feature/PC108-13/deprecate…
WilcoLouwerse Jan 22, 2024
de2382e
No longer use url for sourceId in notifications / syncs when not needed
WilcoLouwerse Jan 23, 2024
1ffc507
Small fix & code cleanup for setting Synchronization Endpoint
WilcoLouwerse Jan 23, 2024
a1e183c
Remove else statements and 1 line if statements
WilcoLouwerse Jan 23, 2024
27d58c1
Merge pull request #1611 from ConductionNL/feature/PC108-13/fix-sourceId
WilcoLouwerse Jan 23, 2024
5a9d88e
Check for an APIKEY_USER when using a api-key auth
WilcoLouwerse Jan 26, 2024
815bc4d
Create default APIKEY_USER during initialize command
WilcoLouwerse Jan 26, 2024
52fcc66
User collection->filter instead of array_filter
WilcoLouwerse Jan 26, 2024
af782d3
Merge pull request #1613 from ConductionNL/feature/PC108-34/api-key-user
WilcoLouwerse Jan 26, 2024
dc8138d
Added array values function for twig
WilcoLouwerse Jan 26, 2024
ab35dd5
Fix test endpoint for mapping
WilcoLouwerse Jan 26, 2024
b1d3e68
Merge pull request #1614 from ConductionNL/feature/PC108-3/twig-array…
WilcoLouwerse Jan 26, 2024
8da748a
Allow syncService->getSourceId $endpoint to be null
WilcoLouwerse Jan 30, 2024
f64a960
Return sourceId = url for syncService->getSourceId if endpoint = null
WilcoLouwerse Jan 30, 2024
8b9fe2d
update docblock
WilcoLouwerse Jan 30, 2024
742f728
Merge pull request #1615 from ConductionNL/feature/PC108-34/subobject…
WilcoLouwerse Jan 30, 2024
3154f1e
Twig getObject extension
bbrands02 Feb 7, 2024
970e2f3
typo fix initialize
bbrands02 Feb 7, 2024
346d2d4
Merge pull request #1616 from ConductionNL/feature/twig-get-object
bbrands02 Feb 9, 2024
dab7204
Fix last version migration to set version fields that are null to: 0.0.0
WilcoLouwerse Feb 12, 2024
42c2553
Merge pull request #1618 from ConductionNL/feature/migration-version-…
WilcoLouwerse Feb 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions api/config/packages/framework.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ framework:
app: cache.adapter.redis
system: cache.adapter.redis
default_redis_provider: "redis://%env(REDIS_HOST)%:%env(int:REDIS_PORT)%"


trusted_hosts: "%env(TRUSTED_HOSTS)%"
trusted_proxies: "%env(TRUSTED_PROXIES)%"
trusted_headers: ['x-forwarded-for', 'x-forwarded-host', 'x-forwarded-proto', 'x-forwarded-port', 'x-forwarded-prefix']

parameters:
samesite: none
when@test:
Expand Down
51 changes: 51 additions & 0 deletions api/migrations/Version20231219151046.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<?php

declare(strict_types=1);

namespace DoctrineMigrations;

use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;

/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20231219151046 extends AbstractMigration
{
public function getDescription(): string
{
return 'Set version default to 0.0.1';
}

public function up(Schema $schema): void
{
$this->addSql('ALTER TABLE action ALTER version SET DEFAULT \'0.0.1\'');
$this->addSql('ALTER TABLE application ALTER version SET DEFAULT \'0.0.1\'');
$this->addSql('ALTER TABLE collection_entity ALTER version SET DEFAULT \'0.0.1\'');
$this->addSql('ALTER TABLE cronjob ALTER version SET DEFAULT \'0.0.1\'');
$this->addSql('ALTER TABLE endpoint ALTER version SET DEFAULT \'0.0.1\'');
$this->addSql('ALTER TABLE entity ALTER version SET DEFAULT \'0.0.1\'');
$this->addSql('ALTER TABLE gateway ALTER version SET DEFAULT \'0.0.1\'');
$this->addSql('ALTER TABLE mapping ALTER version SET DEFAULT \'0.0.1\'');
$this->addSql('ALTER TABLE organization ALTER version SET DEFAULT \'0.0.1\'');
$this->addSql('ALTER TABLE security_group ALTER version SET DEFAULT \'0.0.1\'');
$this->addSql('ALTER TABLE template ALTER version SET DEFAULT \'0.0.1\'');
$this->addSql('ALTER TABLE "user" ALTER version SET DEFAULT \'0.0.1\'');
}

public function down(Schema $schema): void
{
$this->addSql('ALTER TABLE action ALTER version SET DEFAULT NULL');
$this->addSql('ALTER TABLE application ALTER version SET DEFAULT NULL');
$this->addSql('ALTER TABLE collection_entity ALTER version SET DEFAULT NULL');
$this->addSql('ALTER TABLE cronjob ALTER version SET DEFAULT NULL');
$this->addSql('ALTER TABLE endpoint ALTER version SET DEFAULT NULL');
$this->addSql('ALTER TABLE entity ALTER version SET DEFAULT NULL');
$this->addSql('ALTER TABLE gateway ALTER version SET DEFAULT NULL');
$this->addSql('ALTER TABLE mapping ALTER version SET DEFAULT NULL');
$this->addSql('ALTER TABLE organization ALTER version SET DEFAULT NULL');
$this->addSql('ALTER TABLE security_group ALTER version SET DEFAULT NULL');
$this->addSql('ALTER TABLE template ALTER version SET DEFAULT NULL');
$this->addSql('ALTER TABLE "user" ALTER version SET DEFAULT NULL');
}
}
63 changes: 63 additions & 0 deletions api/migrations/Version20240109135300.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
<?php

declare(strict_types=1);

namespace DoctrineMigrations;

use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;

/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20240109135300 extends AbstractMigration
{
public function getDescription(): string
{
return 'Set version default to 0.0.0 (and not nullable)';
}

public function up(Schema $schema): void
{
$this->addSql('UPDATE action SET version = \'0.0.0\' WHERE version IS NULL');
$this->addSql('ALTER TABLE action ALTER version SET DEFAULT \'0.0.0\'');
$this->addSql('UPDATE application SET version = \'0.0.0\' WHERE version IS NULL');
$this->addSql('ALTER TABLE application ALTER version SET DEFAULT \'0.0.0\'');
$this->addSql('UPDATE collection_entity SET version = \'0.0.0\' WHERE version IS NULL');
$this->addSql('ALTER TABLE collection_entity ALTER version SET DEFAULT \'0.0.0\'');
$this->addSql('UPDATE cronjob SET version = \'0.0.0\' WHERE version IS NULL');
$this->addSql('ALTER TABLE cronjob ALTER version SET DEFAULT \'0.0.0\'');
$this->addSql('UPDATE endpoint SET version = \'0.0.0\' WHERE version IS NULL');
$this->addSql('ALTER TABLE endpoint ALTER version SET DEFAULT \'0.0.0\'');
$this->addSql('UPDATE entity SET version = \'0.0.0\' WHERE version IS NULL');
$this->addSql('ALTER TABLE entity ALTER version SET DEFAULT \'0.0.0\'');
$this->addSql('UPDATE gateway SET version = \'0.0.0\' WHERE version IS NULL');
$this->addSql('ALTER TABLE gateway ALTER version SET DEFAULT \'0.0.0\'');
$this->addSql('UPDATE mapping SET version = \'0.0.0\' WHERE version IS NULL');
$this->addSql('ALTER TABLE mapping ALTER version SET DEFAULT \'0.0.0\'');
$this->addSql('UPDATE organization SET version = \'0.0.0\' WHERE version IS NULL');
$this->addSql('ALTER TABLE organization ALTER version SET DEFAULT \'0.0.0\'');
$this->addSql('UPDATE security_group SET version = \'0.0.0\' WHERE version IS NULL');
$this->addSql('ALTER TABLE security_group ALTER version SET DEFAULT \'0.0.0\'');
$this->addSql('UPDATE template SET version = \'0.0.0\' WHERE version IS NULL');
$this->addSql('ALTER TABLE template ALTER version SET DEFAULT \'0.0.0\'');
$this->addSql('UPDATE "user" SET version = \'0.0.0\' WHERE version IS NULL');
$this->addSql('ALTER TABLE "user" ALTER version SET DEFAULT \'0.0.0\'');
}

public function down(Schema $schema): void
{
$this->addSql('ALTER TABLE action ALTER version SET DEFAULT \'0.0.1\'');
$this->addSql('ALTER TABLE application ALTER version SET DEFAULT \'0.0.1\'');
$this->addSql('ALTER TABLE collection_entity ALTER version SET DEFAULT \'0.0.1\'');
$this->addSql('ALTER TABLE cronjob ALTER version SET DEFAULT \'0.0.1\'');
$this->addSql('ALTER TABLE endpoint ALTER version SET DEFAULT \'0.0.1\'');
$this->addSql('ALTER TABLE entity ALTER version SET DEFAULT \'0.0.1\'');
$this->addSql('ALTER TABLE gateway ALTER version SET DEFAULT \'0.0.1\'');
$this->addSql('ALTER TABLE mapping ALTER version SET DEFAULT \'0.0.1\'');
$this->addSql('ALTER TABLE organization ALTER version SET DEFAULT \'0.0.1\'');
$this->addSql('ALTER TABLE security_group ALTER version SET DEFAULT \'0.0.1\'');
$this->addSql('ALTER TABLE template ALTER version SET DEFAULT \'0.0.1\'');
$this->addSql('ALTER TABLE "user" ALTER version SET DEFAULT \'0.0.1\'');
}
}
Loading
Loading