From 099cc145bf52c480a5958db7afaa482f6b00b6c3 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Mon, 27 Mar 2023 11:10:30 +0100
Subject: [PATCH] Clean code

---
 packages/backend-core/src/context/identity.ts         | 8 +-------
 packages/backend-core/src/middleware/authenticated.ts | 5 +----
 packages/backend-core/src/utils/endpointUtils.ts      | 6 ------
 packages/backend-core/src/utils/index.ts              | 1 -
 packages/types/src/sdk/context.ts                     | 1 -
 5 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 packages/backend-core/src/utils/endpointUtils.ts

diff --git a/packages/backend-core/src/context/identity.ts b/packages/backend-core/src/context/identity.ts
index 76540c262e..84de3b68c9 100644
--- a/packages/backend-core/src/context/identity.ts
+++ b/packages/backend-core/src/context/identity.ts
@@ -19,12 +19,7 @@ export function doInIdentityContext(identity: IdentityContext, task: any) {
 }
 
 // used in server/worker
-export function doInUserContext(
-  user: User,
-  ctx: Ctx,
-  task: any,
-  isScim: boolean
-) {
+export function doInUserContext(user: User, ctx: Ctx, task: any) {
   const userContext: UserContext = {
     ...user,
     _id: user._id as string,
@@ -34,7 +29,6 @@ export function doInUserContext(
       // filled in by koa-useragent package
       userAgent: ctx.userAgent._agent.source,
     },
-    isScimCall: isScim,
   }
   return doInIdentityContext(userContext, task)
 }
diff --git a/packages/backend-core/src/middleware/authenticated.ts b/packages/backend-core/src/middleware/authenticated.ts
index be854aded5..f877985ee0 100644
--- a/packages/backend-core/src/middleware/authenticated.ts
+++ b/packages/backend-core/src/middleware/authenticated.ts
@@ -4,7 +4,6 @@ import {
   clearCookie,
   openJwt,
   isValidInternalAPIKey,
-  isScimEndpoint,
 } from "../utils"
 import { getUser } from "../cache/user"
 import { getSession, updateSessionTTL } from "../security/sessions"
@@ -106,8 +105,6 @@ export default function (
         apiKey = ctx.request.headers[Header.AUTHORIZATION].split(" ")[1]
       }
 
-      const isScimCall = isScimEndpoint(ctx)
-
       const tenantId = ctx.request.headers[Header.TENANT_ID]
       let authenticated = false,
         user = null,
@@ -171,7 +168,7 @@ export default function (
       finalise(ctx, { authenticated, user, internal, version, publicEndpoint })
 
       if (user && user.email) {
-        return identity.doInUserContext(user, ctx, next, isScimCall)
+        return identity.doInUserContext(user, ctx, next)
       } else {
         return next()
       }
diff --git a/packages/backend-core/src/utils/endpointUtils.ts b/packages/backend-core/src/utils/endpointUtils.ts
deleted file mode 100644
index b92ef846d8..0000000000
--- a/packages/backend-core/src/utils/endpointUtils.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { Ctx } from "@budibase/types"
-
-const SCIM_ENDPOINTS = new RegExp(["scim/"].join("|"))
-export function isScimEndpoint(ctx: Ctx): boolean {
-  return SCIM_ENDPOINTS.test(ctx.request.url)
-}
diff --git a/packages/backend-core/src/utils/index.ts b/packages/backend-core/src/utils/index.ts
index 5495f2c403..8e663bce52 100644
--- a/packages/backend-core/src/utils/index.ts
+++ b/packages/backend-core/src/utils/index.ts
@@ -1,3 +1,2 @@
 export * from "./hashing"
 export * from "./utils"
-export * from "./endpointUtils"
diff --git a/packages/types/src/sdk/context.ts b/packages/types/src/sdk/context.ts
index 1db6d8e24e..c8345de196 100644
--- a/packages/types/src/sdk/context.ts
+++ b/packages/types/src/sdk/context.ts
@@ -17,7 +17,6 @@ export interface UserContext extends BaseContext, User {
   tenantId: string
   account?: Account
   hostInfo: HostInfo
-  isScimCall?: boolean
 }
 
 export type IdentityContext = BaseContext | AccountUserContext | UserContext