From ff8760e86083f77bce81319453e27d081fa49cd9 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Thu, 15 Sep 2022 11:23:51 +0100
Subject: [PATCH] Pre-review tidy, add new badge to plugins

---
 packages/backend-core/src/constants.js               |  1 +
 .../backend-core/src/middleware/authenticated.ts     | 12 ++----------
 .../builder/src/pages/builder/portal/_layout.svelte  |  6 +++++-
 packages/server/src/api/routes/tests/user.spec.js    |  2 --
 packages/types/src/sdk/licensing/billing.ts          |  8 ++++----
 5 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/packages/backend-core/src/constants.js b/packages/backend-core/src/constants.js
index e1901986b4..89d4fd33e6 100644
--- a/packages/backend-core/src/constants.js
+++ b/packages/backend-core/src/constants.js
@@ -6,6 +6,7 @@ exports.UserStatus = {
 exports.Cookies = {
   CurrentApp: "budibase:currentapp",
   Auth: "budibase:auth",
+  Init: "budibase:init",
   RETURN_URL: "budibase:returnurl",
   DatasourceAuth: "budibase:datasourceauth",
   OIDC_CONFIG: "budibase:oidc:config",
diff --git a/packages/backend-core/src/middleware/authenticated.ts b/packages/backend-core/src/middleware/authenticated.ts
index 0e1b31b9b7..a3c6b67cde 100644
--- a/packages/backend-core/src/middleware/authenticated.ts
+++ b/packages/backend-core/src/middleware/authenticated.ts
@@ -10,7 +10,6 @@ import { getGlobalDB, doInTenant } from "../tenancy"
 import { decrypt } from "../security/encryption"
 const identity = require("../context/identity")
 const env = require("../environment")
-import { User } from "@budibase/types"
 
 const ONE_MINUTE = env.SESSION_UPDATE_PERIOD || 60 * 1000
 
@@ -68,11 +67,7 @@ async function checkApiKey(apiKey: string, populateUser?: Function) {
  */
 export = (
   noAuthPatterns = [],
-  opts: {
-    publicAllowed: boolean
-    populateUser?: Function
-    checkDayPass?: (ctx: any, user: User, tenantId: string) => Promise<void>
-  } = {
+  opts: { publicAllowed: boolean; populateUser?: Function } = {
     publicAllowed: false,
   }
 ) => {
@@ -112,10 +107,7 @@ export = (
           }
           user.csrfToken = session.csrfToken
 
-          if (
-            !session.lastAccessedAt ||
-            session.lastAccessedAt < timeMinusOneMinute()
-          ) {
+          if (session?.lastAccessedAt < timeMinusOneMinute()) {
             // make sure we denote that the session is still in use
             await updateSessionTTL(session)
           }
diff --git a/packages/builder/src/pages/builder/portal/_layout.svelte b/packages/builder/src/pages/builder/portal/_layout.svelte
index 69dfa646b5..ff653c4cb7 100644
--- a/packages/builder/src/pages/builder/portal/_layout.svelte
+++ b/packages/builder/src/pages/builder/portal/_layout.svelte
@@ -54,7 +54,11 @@
           : undefined,
         { title: "Auth", href: "/builder/portal/manage/auth" },
         { title: "Email", href: "/builder/portal/manage/email" },
-        { title: "Plugins", href: "/builder/portal/manage/plugins" },
+        {
+          title: "Plugins",
+          href: "/builder/portal/manage/plugins",
+          badge: "New",
+        },
 
         {
           title: "Organisation",
diff --git a/packages/server/src/api/routes/tests/user.spec.js b/packages/server/src/api/routes/tests/user.spec.js
index 8436b80152..29c33b3899 100644
--- a/packages/server/src/api/routes/tests/user.spec.js
+++ b/packages/server/src/api/routes/tests/user.spec.js
@@ -2,8 +2,6 @@ const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles")
 const { checkPermissionsEndpoint } = require("./utilities/TestFunctions")
 const setup = require("./utilities")
 
-jest.setTimeout(100000)
-
 jest.mock("../../../utilities/workerRequests", () => ({
   getGlobalUsers: jest.fn(() => {
     return {}
diff --git a/packages/types/src/sdk/licensing/billing.ts b/packages/types/src/sdk/licensing/billing.ts
index 6743b9cb17..da2aca1615 100644
--- a/packages/types/src/sdk/licensing/billing.ts
+++ b/packages/types/src/sdk/licensing/billing.ts
@@ -1,11 +1,11 @@
 import { PriceDuration } from "./plan"
 
-export interface CustomerBilling {
+export interface Customer {
   balance: number | null | undefined
   currency: string | null | undefined
 }
 
-export interface SubscriptionBilling {
+export interface Subscription {
   amount: number
   quantity: number
   duration: PriceDuration
@@ -15,6 +15,6 @@ export interface SubscriptionBilling {
 }
 
 export interface Billing {
-  customer: CustomerBilling
-  subscription?: SubscriptionBilling
+  customer: Customer
+  subscription?: Subscription
 }