Fixed cloud integration issues (#6627)

keystonejs · Sep 22, 2021 · 47cee8c · 47cee8c
1 parent b0cba17
commit 47cee8c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 39 deletions.
diff --git a/.changeset/two-roses-complain.md b/.changeset/two-roses-complain.md
@@ -0,0 +1,5 @@
+---
+'@keystone-next/keystone': patch
+---
+
+Keystone Cloud assets integration has been fixed
diff --git a/packages/keystone/src/lib/context/createImagesContext.ts b/packages/keystone/src/lib/context/createImagesContext.ts
@@ -50,7 +50,6 @@ export function createImagesContext(config: KeystoneConfig): ImagesContext | und
   const {
     apiKey = '',
     imagesDomain = '',
-    graphqlApiEndpoint = '',
     restApiEndpoint = '',
   } = experimental?.keystoneCloud || {};
 
@@ -66,7 +65,6 @@ export function createImagesContext(config: KeystoneConfig): ImagesContext | und
         return await buildKeystoneCloudImageSrc({
           apiKey,
           imagesDomain,
-          graphqlApiEndpoint,
           filename,
         });
       }

diff --git a/packages/keystone/src/lib/keystone-cloud/assets.ts b/packages/keystone/src/lib/keystone-cloud/assets.ts
@@ -3,40 +3,16 @@ import fetch from 'node-fetch';
 import FormData from 'form-data';
 import { ImageMetadata } from '../../types';
 
-/**
- * This function and request to the cloud API will not be necessary if we can
- * encode the project's image subdomain in the apiKey.
- */
-const getImagesSubdomain = async ({
-  apiKey,
-  graphqlApiEndpoint,
-}: {
-  apiKey: string;
-  graphqlApiEndpoint: string;
-}): Promise<string> => {
-  const response = await fetch(graphqlApiEndpoint, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify({
-      query: `
-        query($apiKey:String) {
-          allImgixSources(where: { project: { apiKeys: { apiKey: $apiKey } } }) {
-            domain
-          }
-        }
-      `,
-      variables: {
-        apiKey,
-      },
-    }),
-  });
-  const json = await response.json();
-  const { data } = json;
-  const { allImgixSources } = data;
+const getImagesSubdomain = ({ apiKey }: { apiKey: string }): string => {
+  const [, domain] = apiKey.split('__IMAGES_DOMAIN__');
 
-  return allImgixSources[0].domain;
+  if (!domain) {
+    throw new Error(
+      'Your API key is outdated, please regenerate it and add the new key to your Keystone config'
+    );
+  }
+
+  return domain;
 };
 
 const getS3Bucket = async ({
@@ -54,7 +30,7 @@ const getS3Bucket = async ({
     body: JSON.stringify({
       query: `
         query($apiKey:String) {
-          allAmazonS3Buckets(where: { project: { apiKeys: { apiKey: $apiKey } } }) {
+          allAmazonS3Buckets(where: { project: { apiKey: { apiKey: $apiKey } } }) {
             bucketName,
             prefix,
             region
@@ -105,16 +81,14 @@ const uploadAsset = async ({
 
 export const buildKeystoneCloudImageSrc = async ({
   apiKey,
-  graphqlApiEndpoint,
   filename,
   imagesDomain,
 }: {
   apiKey: string;
-  graphqlApiEndpoint: string;
   filename: string;
   imagesDomain: string;
 }) => {
-  const imagesSubdomain = await getImagesSubdomain({ apiKey, graphqlApiEndpoint });
+  const imagesSubdomain = getImagesSubdomain({ apiKey });
 
   return `http://${imagesSubdomain}.${imagesDomain}/${filename}`;
 };