From 172ed57beb80b46be1989101f6469e13ea8741eb Mon Sep 17 00:00:00 2001 From: Inian Date: Mon, 20 Dec 2021 14:13:12 +0530 Subject: [PATCH 1/3] move pg-meta query to our platform api --- studio/stores/pgmeta/MetaStore.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/studio/stores/pgmeta/MetaStore.ts b/studio/stores/pgmeta/MetaStore.ts index 67cc8c7f27b..6b732d4b473 100644 --- a/studio/stores/pgmeta/MetaStore.ts +++ b/studio/stores/pgmeta/MetaStore.ts @@ -116,6 +116,7 @@ export default class MetaStore implements IMetaStore { connectionString?: string baseUrl: string + queryBaseUrl: string excludedSchemas = [ 'auth', 'extensions', @@ -132,6 +133,7 @@ export default class MetaStore implements IMetaStore { const { projectRef, connectionString } = options this.rootStore = rootStore this.baseUrl = `/api/pg-meta/${projectRef}` + this.queryBaseUrl = `${API_URL}/pg-meta/${projectRef}` const headers: any = {} if (IS_PLATFORM && connectionString) { @@ -166,7 +168,7 @@ export default class MetaStore implements IMetaStore { try { const headers: any = { 'Content-Type': 'application/json' } if (this.connectionString) headers['x-connection-encrypted'] = this.connectionString - const url = `${this.baseUrl}/query` + let url = `${this.queryBaseUrl}/query` const response = await post(url, { query: value }, { headers }) if (response.error) throw response.error From 88d4a980efd398ca38dfbb54ccae7a0fd37cbe40 Mon Sep 17 00:00:00 2001 From: Inian Date: Mon, 20 Dec 2021 14:14:52 +0530 Subject: [PATCH 2/3] let to const --- studio/stores/pgmeta/MetaStore.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/studio/stores/pgmeta/MetaStore.ts b/studio/stores/pgmeta/MetaStore.ts index 6b732d4b473..5638d7ec146 100644 --- a/studio/stores/pgmeta/MetaStore.ts +++ b/studio/stores/pgmeta/MetaStore.ts @@ -168,7 +168,7 @@ export default class MetaStore implements IMetaStore { try { const headers: any = { 'Content-Type': 'application/json' } if (this.connectionString) headers['x-connection-encrypted'] = this.connectionString - let url = `${this.queryBaseUrl}/query` + const url = `${this.queryBaseUrl}/query` const response = await post(url, { query: value }, { headers }) if (response.error) throw response.error From cd1ac62e8498cda4bd0190cbe7b1b6767072a439 Mon Sep 17 00:00:00 2001 From: Inian Date: Mon, 20 Dec 2021 17:42:20 +0530 Subject: [PATCH 3/3] fix auto generated docs --- studio/pages/project/[ref]/api/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/studio/pages/project/[ref]/api/index.tsx b/studio/pages/project/[ref]/api/index.tsx index 49d594eb92c..77a220bb8e1 100644 --- a/studio/pages/project/[ref]/api/index.tsx +++ b/studio/pages/project/[ref]/api/index.tsx @@ -78,7 +78,7 @@ const DocView: FC = observer(({}) => { const swaggerUrl = data?.autoApiService?.restUrl const headers: any = { apikey: API_KEY } - if (API_KEY?.length > 40) headers['authorization'] = `Bearer ${API_KEY}` + if (API_KEY?.length > 40) headers['Authorization'] = `Bearer ${API_KEY}` const { data: jsonSchema, error: jsonSchemaError } = useSWR( () => swaggerUrl,