fix: ensure GQL schema cache key also includes current tenant ID and …

…locale code

packages/handler-graphql/src/createGraphQLHandler.ts

@@ -13,9 +13,22 @@ const DEFAULT_CACHE_MAX_AGE = 30758400; // 1 year
 
 const createCacheKey = (context: Context) => {
     const plugins = getSchemaPlugins(context);
-    // TODO: in the near future, we have to assign a fixed name to every GraphQLSchema plugin,
-    // to be able to create a reliable cache key.
-    return plugins.length.toString();
+    // TODO: in the near future, we have to assign a fixed name to every
+    // TODO: GraphQLSchema plugin, to be able to create a reliable cache key.
+
+    // @ts-ignore TODO: `getCurrentTenant` should be injected as a parameter.
+    // @ts-ignore TODO: We should not be accessing `context` like this here.
+    const { getCurrentTenant } = context.tenancy;
+
+    // @ts-ignore TODO: `getContentLocale` should be injected as a parameter.
+    // @ts-ignore TODO: We should not be accessing `context` like this here.
+    const { getContentLocale } = context.i18n;
+
+    return [
+        `tenant:${getCurrentTenant().id}`,
+        `locale:${getContentLocale().code}`,
+        plugins.length.toString()
+    ].join("#");
 };
 
 const createRequestBody = (body: unknown): GraphQLRequestBody | GraphQLRequestBody[] => {