From 4433ebc1f274b998ef17da5c89c8ebe29b680126 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Thu, 13 Jan 2022 17:24:52 +0000 Subject: [PATCH] Handle 403 when loading templates --- packages/builder/src/builderStore/api.js | 7 +++++++ packages/server/src/integrations/s3.ts | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/builderStore/api.js b/packages/builder/src/builderStore/api.js index 4bcb9b74c6..62ddfaeaa5 100644 --- a/packages/builder/src/builderStore/api.js +++ b/packages/builder/src/builderStore/api.js @@ -1,6 +1,7 @@ import { store } from "./index" import { get as svelteGet } from "svelte/store" import { removeCookie, Cookies } from "./cookies" +import { notifications } from "@budibase/bbui" const apiCall = method => @@ -13,6 +14,12 @@ const apiCall = headers, }) if (resp.status === 403) { + if (url.includes("/api/templates")) { + notifications.error( + "There was a problem loading quick start templates." + ) + return { json: () => [] } + } removeCookie(Cookies.Auth) // reload after removing cookie, go to login if (!url.includes("self") && !url.includes("login")) { diff --git a/packages/server/src/integrations/s3.ts b/packages/server/src/integrations/s3.ts index 25b439fd58..273f221575 100644 --- a/packages/server/src/integrations/s3.ts +++ b/packages/server/src/integrations/s3.ts @@ -38,7 +38,7 @@ module S3Module { signatureVersion: { type: "string", required: false, - default: "v4" + default: "v4", }, }, query: {