From 2e8a50181f72407d6b5c7bfbb6c543895a42a068 Mon Sep 17 00:00:00 2001 From: Adrien Crivelli Date: Fri, 11 Oct 2024 18:54:44 +0200 Subject: [PATCH] Add app version to GraphQL URL #10780 --- bin/build.sh | 10 ++++++++++ bin/generate-client-configuration.php | 1 + client/app/shared/config/apollo-options.provider.ts | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/bin/build.sh b/bin/build.sh index 0088f3f78..78680b6a2 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -44,6 +44,16 @@ COMPOSER="$PHP `which composer` --no-interaction --no-plugins" # Exit script on any error set -e +echo "Generate version number..." +echo " '`git describe --tags --always`', +];" > config/autoload/version.local.php + echo "Installing git hooks..." ln -fs ../../bin/pre-commit.sh .git/hooks/pre-commit diff --git a/bin/generate-client-configuration.php b/bin/generate-client-configuration.php index 8c12f1ea9..910ac289d 100644 --- a/bin/generate-client-configuration.php +++ b/bin/generate-client-configuration.php @@ -8,6 +8,7 @@ $config = $container->get('config'); $clientKeys = [ + 'version', 'datatrans', 'accounting', ]; diff --git a/client/app/shared/config/apollo-options.provider.ts b/client/app/shared/config/apollo-options.provider.ts index ea40c97fb..e267810b8 100644 --- a/client/app/shared/config/apollo-options.provider.ts +++ b/client/app/shared/config/apollo-options.provider.ts @@ -12,6 +12,7 @@ import {NetworkActivityService} from '../services/network-activity.service'; import {createHttpLink, NaturalAlertService} from '@ecodev/natural'; import {APOLLO_OPTIONS} from 'apollo-angular'; import {inject, Provider} from '@angular/core'; +import {localConfig} from '../generated-config'; export const apolloDefaultOptions: DefaultOptions = { query: { @@ -75,7 +76,7 @@ function createApolloLink( return errorLink.concat( createHttpLink(httpLink, httpBatchLink, { - uri: '/graphql', + uri: '/graphql?v=' + localConfig.version, }), ); }