diff --git a/.env b/.env index e96a94ad..dfe3cdd5 100644 --- a/.env +++ b/.env @@ -29,7 +29,7 @@ APP_HOME=pc.zaakonline.nl # The urls on wich this api is available TRUSTED_PROXIES=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16 -TRUSTED_HOSTS=^(.+\.)?conduction\.nl$|^(.+\.)?vng\.cloud$|^(.+\.)?huwelijksplanner\.online$|^(.+\.)?larping\.eu$|^(.+\.)?common-ground\.dev$|^(.+\.)?trouwplanner\.online$|^(.+\.)?zaakonline\.nl$|localhost +TRUSTED_HOSTS=^(.+\.)?conduction\.nl$|^(.+\.)?huwelijksplanner\.online$|^(.+\.)?larping\.eu$|^(.+\.)?common-ground\.dev$|^(.+\.)?trouwplanner\.online$|^(.+\.)?zaakonline\.nl$|localhost ################################################## # Orgization details @@ -81,7 +81,7 @@ NOTIFICATION_ENABLED_AUTHORIZATION=sasd ################################################## AUTH_ENABLED=false -AUTH_PROVIDER=sasd +AUTH_PROVIDER=sasdadad AUTH_AUTHORIZATION=sasd ################################################## diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 5be324ee..96e29ebb 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -34,6 +34,7 @@ jobs: if: contains( github.ref, 'master' ) || contains( github.base_ref, 'master' ) run: | echo ::set-env name=APP_ENV::prod + echo ::set-env name=APP_BUILD::prod echo "set APP_ENV to $APP_ENV" - name: Set APP_BUILD to APP_VERSION if: contains( github.ref, 'master' ) diff --git a/api/Dockerfile b/api/Dockerfile index 24fae412..5036a777 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -117,8 +117,7 @@ CMD ["php-fpm"] # Let update the docs to show the latest chages # RUN bin/console api:swagger:export --output=/srv/api/public/schema/openapi.yaml --yaml --spec-version=3 - -RUN bin/console app:publiccode:update --location=/srv/api/public/schema/ --spec-version=0.2 +# RUN bin/console app:publiccode:update --location=/srv/api/public/schema/ --spec-version=0.2 ############################# # "nginx" stage # diff --git a/api/composer.json b/api/composer.json index d04d452a..b69f6993 100644 --- a/api/composer.json +++ b/api/composer.json @@ -29,9 +29,9 @@ "webonyx/graphql-php": "^0.13.8" }, "require-dev" : { - "api-platform/schema-generator" : "^2.1", - "symfony/maker-bundle" : "^1.11", - "symfony/profiler-pack" : "^1.0" + "api-platform/schema-generator": "^2.1", + "symfony/maker-bundle": "^1.11", + "symfony/profiler-pack": "^1.0" }, "config" : { "preferred-install" : { diff --git a/api/config/packages/twig.yaml b/api/config/packages/twig.yaml index 0f182e22..5a403c45 100644 --- a/api/config/packages/twig.yaml +++ b/api/config/packages/twig.yaml @@ -57,7 +57,7 @@ twig: app_env: '%env(APP_ENV)%' app_debug: '%env(APP_DEBUG)%' app_subdomain: '%env(APP_SUBDOMAIN)%' - app_domains: '%env(json:APP_DOMAINS)%' + app_domains: '%env(json:APP_DOMAINS)%' app_demo: '%env(APP_DEMO)%' app_repro: '%env(APP_REPRO)%' app_description: '%env(APP_DESCRIPTION)%' diff --git a/api/helm/templates/configmap.yaml b/api/helm/templates/configmap.yaml index 41f37e42..77e68c78 100644 --- a/api/helm/templates/configmap.yaml +++ b/api/helm/templates/configmap.yaml @@ -16,7 +16,8 @@ data: app-version: {{ .Values.settings.version | quote }} app-repro: {{ .Values.settings.repro | quote }} app-demo: {{ .Values.settings.demo | quote }} - app-domain: {{ .Values.settings.domain | quote }} + app-domains: {{ .Values.settings.domains | quote }} + app-domains-json: {{ .Values.settings.domainsJson | quote }} app-description: {{ .Values.settings.description | quote }} app-auth: {{ .Values.settings.authorisationEnabled | quote }} diff --git a/api/helm/templates/php-deployment.yaml b/api/helm/templates/php-deployment.yaml index 2d5df508..347f1381 100644 --- a/api/helm/templates/php-deployment.yaml +++ b/api/helm/templates/php-deployment.yaml @@ -77,11 +77,6 @@ spec: configMapKeyRef: name: {{ template "fullname" . }} key: app-demo - - name: APP_DOMAIN - valueFrom: - configMapKeyRef: - name: {{ template "fullname" . }} - key: app-domain # organization - name: ORGANIZATION_NAME valueFrom: diff --git a/api/helm/values.yaml b/api/helm/values.yaml index c9735c5b..4ebf495f 100644 --- a/api/helm/values.yaml +++ b/api/helm/values.yaml @@ -16,6 +16,7 @@ settings: - zaakonline.nl - huwelijksplanner.online - common-ground.dev + domainsJson: ["conduction.nl","zaakonline.nl","huwelijksplanner.online","common-ground.dev"] organisationName: Conduction email: info@conduction.nl country: Netherlands diff --git a/api/public/schema/publiccode.yaml b/api/public/schema/publiccode.yaml index 67ea1827..66f44a92 100644 --- a/api/public/schema/publiccode.yaml +++ b/api/public/schema/publiccode.yaml @@ -6,7 +6,7 @@ url: "https://github.com/ConductionNL/Proto-component-commonground" landingURL: "pc.zaakonline.nl" isBasedOn: "https://github.com/ConductionNL/Proto-component-commonground.git" softwareVersion: "V.0.1" -releaseDate: "2019-28-12" +releaseDate: "2020-01-01" logo: pc.zaakonline.nl monochromeLogo: img/logo-mono.svg diff --git a/api/src/Entity/ExampleEntity.php b/api/src/Entity/ExampleEntity.php index 47705b5c..2e65a2ba 100644 --- a/api/src/Entity/ExampleEntity.php +++ b/api/src/Entity/ExampleEntity.php @@ -11,6 +11,7 @@ use Gedmo\Mapping\Annotation as Gedmo; use Symfony\Component\Serializer\Annotation\Groups; use Symfony\Component\Validator\Constraints as Assert; +use Ramsey\Uuid\Uuid; /** * This is an example entity. @@ -91,10 +92,18 @@ class ExampleEntity * @ORM\Column(type="string", length=255, nullable=true) */ private $camelCase; - - public function getId(): ?int + + + public function getId(): Uuid + { + return $this->id; + } + + public function setId(Uuid $id): self { - return $this->id; + $this->id = $id; + + return $this; } public function getName(): ?string diff --git a/api/templates/helm/Values.yaml.twig b/api/templates/helm/Values.yaml.twig index a328bd6b..10375e26 100644 --- a/api/templates/helm/Values.yaml.twig +++ b/api/templates/helm/Values.yaml.twig @@ -15,6 +15,7 @@ settings: {% for domain in app_domains %} - {{ domain }} {% endfor %} + domainsJson: {{ app_domains | json_encode()|raw }} organisationName: {{ organization_name }} email: {{ organization_email }} country: {{ organization_country }}