fix: remove publicAccess flag

instill-ai · Jul 14, 2024 · 0e138f9 · 0e138f9
1 parent d5f7cef
commit 0e138f9
Show file tree

Hide file tree

Showing 38 changed files with 36 additions and 59 deletions.
diff --git a/packages/sdk/src/main/index.ts b/packages/sdk/src/main/index.ts
@@ -21,21 +21,11 @@ export type RequestOption = {
 
 export class InstillAPIClient {
   baseURL: string;
-  apiToken: string;
-  publicAccess?: boolean;
+  apiToken: string | undefined;
 
-  constructor({
-    baseURL,
-    apiToken,
-    publicAccess,
-  }: {
-    baseURL: string;
-    apiToken: string;
-    publicAccess?: boolean;
-  }) {
+  constructor({ baseURL, apiToken }: { baseURL: string; apiToken?: string }) {
     this.baseURL = baseURL;
     this.apiToken = apiToken;
-    this.publicAccess = publicAccess;
   }
 
   async get<Rsp>(path: string, opt?: RequestOption): Promise<Rsp> {
@@ -66,14 +56,14 @@ export class InstillAPIClient {
     try {
       const response = await fetch(`${this.baseURL}${path}`, {
         method,
-        headers: this.publicAccess
+        headers: this.apiToken
           ? {
               "Content-Type": "application/json",
+              Authorization: `Bearer ${this.apiToken}`,
               ...opt?.additionalHeaders,
             }
           : {
               "Content-Type": "application/json",
-              Authorization: `Bearer ${this.apiToken}`,
               ...opt?.additionalHeaders,
             },
         body: opt?.body,

diff --git a/packages/toolkit/src/lib/react-query-service/metric/useCreditConsumptionChartRecords.ts b/packages/toolkit/src/lib/react-query-service/metric/useCreditConsumptionChartRecords.ts
@@ -60,7 +60,9 @@ export function useCreditConsumptionChartRecords({
         return Promise.reject(new Error("owner not provided"));
       }
 
-      const client = getInstillAPIClient({ accessToken, publicAccess: false });
+      const client = getInstillAPIClient({
+        accessToken,
+      });
 
       const data =
         await client.core.metric.listInstillCreditConsumptionTimeChart({

diff --git a/...ges/toolkit/src/lib/react-query-service/metric/usePipelineTriggerComputationTimeCharts.ts b/...ges/toolkit/src/lib/react-query-service/metric/usePipelineTriggerComputationTimeCharts.ts
@@ -22,7 +22,7 @@ export function usePipelineTriggerComputationTimeCharts({
         return Promise.reject(new Error("accessToken not provided"));
       }
 
-      const client = getInstillAPIClient({ accessToken, publicAccess: false });
+      const client = getInstillAPIClient({ accessToken });
 
       const triggers =
         await client.core.metric.listPipelineTriggerComputationTimeCharts({

diff --git a/packages/toolkit/src/lib/react-query-service/metric/usePipelineTriggerMetric.ts b/packages/toolkit/src/lib/react-query-service/metric/usePipelineTriggerMetric.ts
@@ -22,7 +22,7 @@ export function usePipelineTriggerMetric({
         return Promise.reject(new Error("accessToken not provided"));
       }
 
-      const client = getInstillAPIClient({ accessToken, publicAccess: false });
+      const client = getInstillAPIClient({ accessToken });
 
       const triggerMetric = await client.core.metric.listPipelineTriggerMetric({
         pageSize: env("NEXT_PUBLIC_QUERY_PAGE_SIZE"),

diff --git a/packages/toolkit/src/lib/react-query-service/metric/usePipelineTriggers.ts b/packages/toolkit/src/lib/react-query-service/metric/usePipelineTriggers.ts
@@ -24,7 +24,7 @@ export function usePipelineTriggers({
         return Promise.reject(new Error("accessToken not provided"));
       }
 
-      const client = getInstillAPIClient({ accessToken, publicAccess: false });
+      const client = getInstillAPIClient({ accessToken });
 
       const triggers = await client.core.metric.listPipelineTriggers({
         pageSize: env("NEXT_PUBLIC_QUERY_PAGE_SIZE"),

diff --git a/packages/toolkit/src/lib/react-query-service/mgmt/use-api-tokens/server.ts b/packages/toolkit/src/lib/react-query-service/mgmt/use-api-tokens/server.ts
@@ -14,7 +14,7 @@ export async function fetchApiTokens({
   }
 
   try {
-    const client = getInstillAPIClient({ accessToken, publicAccess: false });
+    const client = getInstillAPIClient({ accessToken });
 
     const apiTokens = await client.core.token.listAPITokens({
       pageSize: env("NEXT_PUBLIC_QUERY_PAGE_SIZE"),

diff --git a/packages/toolkit/src/lib/react-query-service/mgmt/use-authenticated-user/server.ts b/packages/toolkit/src/lib/react-query-service/mgmt/use-authenticated-user/server.ts
@@ -13,7 +13,7 @@ export async function fetchAuthenticatedUser({
   }
 
   try {
-    const client = getInstillAPIClient({ accessToken, publicAccess: false });
+    const client = getInstillAPIClient({ accessToken });
 
     const user = await client.core.user.getAuthenticatedUser();
 

diff --git a/packages/toolkit/src/lib/react-query-service/mgmt/use-namespace-type/server.ts b/packages/toolkit/src/lib/react-query-service/mgmt/use-namespace-type/server.ts
@@ -17,7 +17,6 @@ export async function fetchNamespaceType({
   try {
     const client = getInstillAPIClient({
       accessToken: accessToken ?? undefined,
-      publicAccess: accessToken ? false : true,
     });
 
     const type = await client.core.utils.checkNamespaceType({

diff --git a/packages/toolkit/src/lib/react-query-service/mgmt/use-user/server.ts b/packages/toolkit/src/lib/react-query-service/mgmt/use-user/server.ts
@@ -19,7 +19,7 @@ export async function fetchUser({
   }
 
   try {
-    const client = getInstillAPIClient({ accessToken, publicAccess: false });
+    const client = getInstillAPIClient({ accessToken });
 
     const user = await client.core.user.getUser({ userName });
 

diff --git a/packages/toolkit/src/lib/react-query-service/mgmt/useApiToken.ts b/packages/toolkit/src/lib/react-query-service/mgmt/useApiToken.ts
@@ -21,7 +21,7 @@ export function useApiToken({
         return Promise.reject(new Error("accessToken not provided"));
       }
 
-      const client = getInstillAPIClient({ accessToken, publicAccess: false });
+      const client = getInstillAPIClient({ accessToken });
 
       const token = await client.core.token.getApiToken({
         tokenName,

diff --git a/packages/toolkit/src/lib/react-query-service/mgmt/useAuthenticatedUserSubscription.ts b/packages/toolkit/src/lib/react-query-service/mgmt/useAuthenticatedUserSubscription.ts
@@ -19,7 +19,7 @@ export function useAuthenticatedUserSubscription({
         return Promise.reject(new Error("accessToken not provided"));
       }
 
-      const client = getInstillAPIClient({ accessToken, publicAccess: false });
+      const client = getInstillAPIClient({ accessToken });
 
       const subscription =
         await client.core.subscription.getAuthenticatedUserSubscription();

diff --git a/packages/toolkit/src/lib/react-query-service/mgmt/useCreateApiToken.ts b/packages/toolkit/src/lib/react-query-service/mgmt/useCreateApiToken.ts
@@ -19,7 +19,7 @@ export function useCreateApiToken() {
         return Promise.reject(new Error("accessToken not provided"));
       }
 
-      const client = getInstillAPIClient({ accessToken, publicAccess: false });
+      const client = getInstillAPIClient({ accessToken });
 
       const token = await client.core.token.createApiToken(payload);
 

diff --git a/packages/toolkit/src/lib/react-query-service/mgmt/useDeleteApiToken.ts b/packages/toolkit/src/lib/react-query-service/mgmt/useDeleteApiToken.ts
@@ -18,7 +18,7 @@ export function useDeleteApiToken() {
         return Promise.reject(new Error("accessToken not provided"));
       }
 
-      const client = getInstillAPIClient({ accessToken, publicAccess: false });
+      const client = getInstillAPIClient({ accessToken });
 
       await client.core.token.deleteApiToken({ tokenName });
 

diff --git a/packages/toolkit/src/lib/react-query-service/mgmt/useNamespacesRemainingCredit.ts b/packages/toolkit/src/lib/react-query-service/mgmt/useNamespacesRemainingCredit.ts
@@ -34,7 +34,7 @@ export function useNamespacesRemainingCredit({
 
       const remainingCredits: NamespaceRemainingCredit[] = [];
 
-      const client = getInstillAPIClient({ accessToken, publicAccess: false });
+      const client = getInstillAPIClient({ accessToken });
 
       for (const namespaceName of namespaceNames) {
         try {

diff --git a/packages/toolkit/src/lib/react-query-service/mgmt/useRemainingCredit.ts b/packages/toolkit/src/lib/react-query-service/mgmt/useRemainingCredit.ts
@@ -31,7 +31,7 @@ export function useRemainingCredit({
         return Promise.reject(new Error("ownerName not provided"));
       }
 
-      const client = getInstillAPIClient({ accessToken, publicAccess: false });
+      const client = getInstillAPIClient({ accessToken });
 
       const remainingCredit =
         await client.core.credit.getRemainingInstillCredit({

diff --git a/packages/toolkit/src/lib/react-query-service/mgmt/useUpdateAuthenticatedUser.ts b/packages/toolkit/src/lib/react-query-service/mgmt/useUpdateAuthenticatedUser.ts
@@ -18,7 +18,7 @@ export function useUpdateAuthenticatedUser() {
         return Promise.reject(new Error("accessToken not provided"));
       }
 
-      const client = getInstillAPIClient({ accessToken, publicAccess: false });
+      const client = getInstillAPIClient({ accessToken });
 
       const user = await client.core.user.updateAuthenticatedUser(payload);
 

diff --git a/packages/toolkit/src/lib/react-query-service/mgmt/useUsers.ts b/packages/toolkit/src/lib/react-query-service/mgmt/useUsers.ts
@@ -20,7 +20,7 @@ export function useUsers({
         return Promise.reject(new Error("accessToken not provided"));
       }
 
-      const client = getInstillAPIClient({ accessToken, publicAccess: false });
+      const client = getInstillAPIClient({ accessToken });
 
       const users = await client.core.user.listUsers({
         pageSize: env("NEXT_PUBLIC_QUERY_PAGE_SIZE"),

diff --git a/...es/toolkit/src/lib/react-query-service/pipeline/use-namespace-pipeline-releases/server.ts b/...es/toolkit/src/lib/react-query-service/pipeline/use-namespace-pipeline-releases/server.ts
@@ -18,7 +18,6 @@ export async function fetchNamespacePipelineReleases({
   try {
     const client = getInstillAPIClient({
       accessToken: accessToken ?? undefined,
-      publicAccess: accessToken ? false : true,
     });
 
     const pipelineReleases =

diff --git a/packages/toolkit/src/lib/react-query-service/pipeline/use-namespace-pipeline/server.ts b/packages/toolkit/src/lib/react-query-service/pipeline/use-namespace-pipeline/server.ts
@@ -19,7 +19,6 @@ export async function fetchNamespacePipeline({
   try {
     const client = getInstillAPIClient({
       accessToken: accessToken ?? undefined,
-      publicAccess: accessToken ? false : true,
     });
 
     const pipeline = await client.vdp.pipeline.getNamespacePipeline({

diff --git a/packages/toolkit/src/lib/react-query-service/pipeline/use-namespace-pipelines/server.ts b/packages/toolkit/src/lib/react-query-service/pipeline/use-namespace-pipelines/server.ts
@@ -24,7 +24,6 @@ export async function fetchNamespacePipelines({
   try {
     const client = getInstillAPIClient({
       accessToken: accessToken ?? undefined,
-      publicAccess: accessToken ? false : true,
     });
 
     const pipelines = await client.vdp.pipeline.listNamespacePipelines({

diff --git a/packages/toolkit/src/lib/react-query-service/pipeline/use-namespace-secret/server.ts b/packages/toolkit/src/lib/react-query-service/pipeline/use-namespace-secret/server.ts
@@ -19,7 +19,7 @@ export async function fetchNamespaceSecret({
   }
 
   try {
-    const client = getInstillAPIClient({ accessToken, publicAccess: false });
+    const client = getInstillAPIClient({ accessToken });
 
     const userSecret = await client.vdp.secret.getNamespaceSecret({
       namespaceSecretName,

diff --git a/packages/toolkit/src/lib/react-query-service/pipeline/use-namespace-secrets/server.ts b/packages/toolkit/src/lib/react-query-service/pipeline/use-namespace-secrets/server.ts
@@ -22,7 +22,7 @@ export async function fetchNamespaceSecrets({
   }
 
   try {
-    const client = getInstillAPIClient({ accessToken, publicAccess: false });
+    const client = getInstillAPIClient({ accessToken });
 
     const userSecrets = await client.vdp.secret.listNamespaceSecrets({
       pageSize: pageSize ?? env("NEXT_PUBLIC_QUERY_PAGE_SIZE"),

diff --git a/packages/toolkit/src/lib/react-query-service/pipeline/useCloneNamespacePipeline.ts b/packages/toolkit/src/lib/react-query-service/pipeline/useCloneNamespacePipeline.ts
@@ -21,7 +21,7 @@ export function useCloneNamespacePipeline() {
         return Promise.reject(new Error("accessToken not provided"));
       }
 
-      const client = getInstillAPIClient({ accessToken, publicAccess: false });
+      const client = getInstillAPIClient({ accessToken });
 
       await client.vdp.pipeline.cloneNamespacePipeline(payload);
 

diff --git a/packages/toolkit/src/lib/react-query-service/pipeline/useCreateNamespacePipeline.ts b/packages/toolkit/src/lib/react-query-service/pipeline/useCreateNamespacePipeline.ts
@@ -22,7 +22,7 @@ export function useCreateNamespacePipeline() {
         return Promise.reject(new Error("accessToken not provided"));
       }
 
-      const client = getInstillAPIClient({ accessToken, publicAccess: false });
+      const client = getInstillAPIClient({ accessToken });
 
       const pipeline =
         await client.vdp.pipeline.createNamespacePipeline(payload);

diff --git a/packages/toolkit/src/lib/react-query-service/pipeline/useCreateNamespacePipelineRelease.ts b/packages/toolkit/src/lib/react-query-service/pipeline/useCreateNamespacePipelineRelease.ts
@@ -22,7 +22,7 @@ export function useCreateNamespacePipelineRelease() {
         return Promise.reject(new Error("accessToken not provided"));
       }
 
-      const client = getInstillAPIClient({ accessToken, publicAccess: false });
+      const client = getInstillAPIClient({ accessToken });
 
       const pipelineRelease =
         await client.vdp.release.createNamespacePipelineRelease(payload);

diff --git a/packages/toolkit/src/lib/react-query-service/pipeline/useCreateNamespaceSecret.ts b/packages/toolkit/src/lib/react-query-service/pipeline/useCreateNamespaceSecret.ts
@@ -26,7 +26,7 @@ export function useCreateNamespaceSecret() {
         return Promise.reject(new Error("accessToken not provided"));
       }
 
-      const client = getInstillAPIClient({ accessToken, publicAccess: false });
+      const client = getInstillAPIClient({ accessToken });
 
       const secret = await client.vdp.secret.createNamespaceSecret(payload);
 

diff --git a/packages/toolkit/src/lib/react-query-service/pipeline/useDeleteNamespacePipeline.ts b/packages/toolkit/src/lib/react-query-service/pipeline/useDeleteNamespacePipeline.ts
@@ -20,7 +20,7 @@ export function useDeleteNamespacePipeline() {
         return Promise.reject(new Error("accessToken not provided"));
       }
 
-      const client = getInstillAPIClient({ accessToken, publicAccess: false });
+      const client = getInstillAPIClient({ accessToken });
 
       await client.vdp.pipeline.deleteNamespacePipeline({
         namespacePipelineName,

diff --git a/packages/toolkit/src/lib/react-query-service/pipeline/useDeleteNamespacePipelineRelease.ts b/packages/toolkit/src/lib/react-query-service/pipeline/useDeleteNamespacePipelineRelease.ts
@@ -21,7 +21,7 @@ export function useDeleteNamespacePipelineRelease() {
         return Promise.reject(new Error("accessToken not provided"));
       }
 
-      const client = getInstillAPIClient({ accessToken, publicAccess: false });
+      const client = getInstillAPIClient({ accessToken });
 
       await client.vdp.release.deleteNamespacePipelineRelease({
         namespacePipelineReleaseName,

diff --git a/packages/toolkit/src/lib/react-query-service/pipeline/useDeleteNamespaceSecret.ts b/packages/toolkit/src/lib/react-query-service/pipeline/useDeleteNamespaceSecret.ts
@@ -22,7 +22,7 @@ export function useDeleteNamespaceSecret() {
         return Promise.reject(new Error("accessToken not provided"));
       }
 
-      const client = getInstillAPIClient({ accessToken, publicAccess: false });
+      const client = getInstillAPIClient({ accessToken });
 
       await client.vdp.secret.deleteNamespaceSecret({
         namespaceSecretName,

diff --git a/packages/toolkit/src/lib/react-query-service/pipeline/useInfiniteNamespacePipelines.ts b/packages/toolkit/src/lib/react-query-service/pipeline/useInfiniteNamespacePipelines.ts
@@ -53,7 +53,6 @@ export function useInfiniteNamespacePipelines({
 
       const client = getInstillAPIClient({
         accessToken: accessToken ?? undefined,
-        publicAccess: accessToken ? false : true,
       });
 
       const pipelines = await client.vdp.pipeline.listNamespacePipelines({

diff --git a/packages/toolkit/src/lib/react-query-service/pipeline/useInfinitePipelines.ts b/packages/toolkit/src/lib/react-query-service/pipeline/useInfinitePipelines.ts
@@ -47,7 +47,6 @@ export function useInfinitePipelines({
     queryFn: async ({ pageParam }) => {
       const client = getInstillAPIClient({
         accessToken: accessToken ?? undefined,
-        publicAccess: accessToken ? false : true,
       });
 
       const pipelines = await client.vdp.pipeline.listAccessiblePipelines({

diff --git a/packages/toolkit/src/lib/react-query-service/pipeline/useOperatorDefinition.ts b/packages/toolkit/src/lib/react-query-service/pipeline/useOperatorDefinition.ts
@@ -35,7 +35,7 @@ export function useOperatorDefinition({
         return Promise.reject(new Error("accessToken not provided"));
       }
 
-      const client = getInstillAPIClient({ accessToken, publicAccess: false });
+      const client = getInstillAPIClient({ accessToken });
 
       const operatorDefinition =
         await client.vdp.component.getOperatorDefinition({

diff --git a/packages/toolkit/src/lib/react-query-service/pipeline/useOperatorDefinitions.ts b/packages/toolkit/src/lib/react-query-service/pipeline/useOperatorDefinitions.ts
@@ -24,7 +24,7 @@ export function useOperatorDefinitions({
         return Promise.reject(new Error("accessToken not provided"));
       }
 
-      const client = getInstillAPIClient({ accessToken, publicAccess: false });
+      const client = getInstillAPIClient({ accessToken });
 
       const operatorDefinitions =
         await client.vdp.component.listOperatorDefinitions({

diff --git a/packages/toolkit/src/lib/react-query-service/pipeline/useRenameNamespacePipeline.tsx b/packages/toolkit/src/lib/react-query-service/pipeline/useRenameNamespacePipeline.tsx
@@ -21,7 +21,7 @@ export function useRenameNamespacePipeline() {
         return Promise.reject(new Error("accessToken not provided"));
       }
 
-      const client = getInstillAPIClient({ accessToken, publicAccess: false });
+      const client = getInstillAPIClient({ accessToken });
 
       const pipeline =
         await client.vdp.pipeline.renameNamespacePipeline(payload);

diff --git a/packages/toolkit/src/lib/react-query-service/pipeline/useTriggerNamespacePipeline.tsx b/packages/toolkit/src/lib/react-query-service/pipeline/useTriggerNamespacePipeline.tsx
@@ -17,7 +17,6 @@ export function useTriggerNamespacePipeline() {
 
       const client = getInstillAPIClient({
         accessToken: accessToken ?? undefined,
-        publicAccess: accessToken ? false : true,
       });
 
       const response =

diff --git a/packages/toolkit/src/lib/react-query-service/pipeline/useTriggerNamespacePipelineRelease.tsx b/packages/toolkit/src/lib/react-query-service/pipeline/useTriggerNamespacePipelineRelease.tsx
@@ -17,7 +17,6 @@ export function useTriggerNamespacePipelineRelease() {
 
       const client = getInstillAPIClient({
         accessToken: accessToken ?? undefined,
-        publicAccess: accessToken ? false : true,
       });
 
       const pipelineRelease =

diff --git a/packages/toolkit/src/lib/react-query-service/pipeline/useUpdateNamespacePipeline.ts b/packages/toolkit/src/lib/react-query-service/pipeline/useUpdateNamespacePipeline.ts
@@ -21,7 +21,7 @@ export function useUpdateNamespacePipeline() {
         return Promise.reject(new Error("accessToken not provided"));
       }
 
-      const client = getInstillAPIClient({ accessToken, publicAccess: false });
+      const client = getInstillAPIClient({ accessToken });
 
       const pipeline =
         await client.vdp.pipeline.updateNamespacePipeline(payload);

diff --git a/packages/toolkit/src/lib/vdp-sdk/index.ts b/packages/toolkit/src/lib/vdp-sdk/index.ts
@@ -18,13 +18,7 @@ export * from "./helper";
 
 let instillAPIClient: Nullable<InstillAPIClient> = null;
 
-export function getInstillAPIClient({
-  accessToken,
-  publicAccess,
-}: {
-  accessToken?: string;
-  publicAccess: boolean;
-}) {
+export function getInstillAPIClient({ accessToken }: { accessToken?: string }) {
   if (!instillAPIClient) {
     const baseURL = `${
       process.env.NEXT_SERVER_API_GATEWAY_URL ??
@@ -35,8 +29,7 @@ export function getInstillAPIClient({
       baseURL,
 
       // When non logged in user is viewing some pages, accessToken will be null
-      apiToken: accessToken ?? "",
-      publicAccess,
+      apiToken: accessToken,
     });
   }