From 7a732b8155d217c5e3910b2d9ee8682ce0a28332 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 22 Sep 2022 15:18:10 +0100
Subject: [PATCH] Fixing issue that refactoring file caused (some strings
 renamed to ts rather than js).

---
 packages/bbui/README.md                             |  2 +-
 packages/bbui/rollup.config.js                      |  2 +-
 packages/builder/cypress/plugins/index.js           |  2 +-
 packages/builder/cypress/support/index.js           |  2 +-
 packages/client/README.md                           |  2 +-
 packages/client/rollup.config.js                    |  2 +-
 .../devtools/DevToolsComponentContextTab.svelte     |  2 +-
 .../devtools/DevToolsComponentSettingsTab.svelte    |  2 +-
 packages/server/src/api/controllers/auth.ts         | 13 +++++++++++--
 packages/worker/pm2.config.js                       |  2 +-
 10 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/packages/bbui/README.md b/packages/bbui/README.md
index 3920626d99..9b71a86cab 100644
--- a/packages/bbui/README.md
+++ b/packages/bbui/README.md
@@ -15,7 +15,7 @@ A package that handles all common components across the Budibase organisation. Y
 1. Create a file: `Headline.svelte`
 2. Create a Svench file: `Headline.svench`
 3. Build component and add variants to the Svench file.
-4. Once done, re-export the file in `src/index.ts`.
+4. Once done, re-export the file in `src/index.js`.
 5. Publish, update the package in the main project and profit. 
 
 ## Guidelines
diff --git a/packages/bbui/rollup.config.js b/packages/bbui/rollup.config.js
index 1645339014..e285d548d6 100644
--- a/packages/bbui/rollup.config.js
+++ b/packages/bbui/rollup.config.js
@@ -6,7 +6,7 @@ import { terser } from "rollup-plugin-terser"
 import postcss from "rollup-plugin-postcss"
 
 export default {
-  input: "src/index.ts",
+  input: "src/index.js",
   output: {
     sourcemap: true,
     format: "esm",
diff --git a/packages/builder/cypress/plugins/index.js b/packages/builder/cypress/plugins/index.js
index 0b38f6351a..771ba886b5 100644
--- a/packages/builder/cypress/plugins/index.js
+++ b/packages/builder/cypress/plugins/index.js
@@ -1,6 +1,6 @@
 /// <reference types="cypress" />
 // ***********************************************************
-// This example plugins/index.ts can be used to load plugins
+// This example plugins/index.js can be used to load plugins
 //
 // You can change the location of this file or turn off loading
 // the plugins file with the 'pluginsFile' configuration option.
diff --git a/packages/builder/cypress/support/index.js b/packages/builder/cypress/support/index.js
index c916520a30..acd53a1592 100644
--- a/packages/builder/cypress/support/index.js
+++ b/packages/builder/cypress/support/index.js
@@ -1,5 +1,5 @@
 // ***********************************************************
-// This example support/index.ts is processed and
+// This example support/index.js is processed and
 // loaded automatically before your test files.
 //
 // This is a great place to put global configuration and
diff --git a/packages/client/README.md b/packages/client/README.md
index 5c9ba977cd..335dcbd3e6 100644
--- a/packages/client/README.md
+++ b/packages/client/README.md
@@ -8,7 +8,7 @@ their settings, and know how to correctly interact with them.
 
 ### Component Definitions
 
-The object key is the name of the component, as exported by `index.ts`.
+The object key is the name of the component, as exported by `index.js`.
 
 - **name** - the name displayed in the builder
 - **description** - not currently used
diff --git a/packages/client/rollup.config.js b/packages/client/rollup.config.js
index 98bcfb77f0..5206b63884 100644
--- a/packages/client/rollup.config.js
+++ b/packages/client/rollup.config.js
@@ -19,7 +19,7 @@ const ignoredWarnings = [
 ]
 
 export default {
-  input: "src/index.ts",
+  input: "src/index.js",
   output: [
     {
       sourcemap: false,
diff --git a/packages/client/src/components/devtools/DevToolsComponentContextTab.svelte b/packages/client/src/components/devtools/DevToolsComponentContextTab.svelte
index 6e020c06f4..3b4c426851 100644
--- a/packages/client/src/components/devtools/DevToolsComponentContextTab.svelte
+++ b/packages/client/src/components/devtools/DevToolsComponentContextTab.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Layout, Select, Body } from "@budibase/bbui"
-  import { componentStore } from "stores/index.ts"
+  import { componentStore } from "stores/index.js"
   import DevToolsStat from "./DevToolsStat.svelte"
 
   const ReadableBindingMap = {
diff --git a/packages/client/src/components/devtools/DevToolsComponentSettingsTab.svelte b/packages/client/src/components/devtools/DevToolsComponentSettingsTab.svelte
index 9f8c0b9761..63cecab7ef 100644
--- a/packages/client/src/components/devtools/DevToolsComponentSettingsTab.svelte
+++ b/packages/client/src/components/devtools/DevToolsComponentSettingsTab.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Layout, Toggle } from "@budibase/bbui"
   import DevToolsStat from "./DevToolsStat.svelte"
-  import { componentStore } from "stores/index.ts"
+  import { componentStore } from "stores/index.js"
   import { getSettingsDefinition } from "utils/componentProps.js"
 
   let showEnrichedSettings = true
diff --git a/packages/server/src/api/controllers/auth.ts b/packages/server/src/api/controllers/auth.ts
index 4512d228b9..3a5e44c8bb 100644
--- a/packages/server/src/api/controllers/auth.ts
+++ b/packages/server/src/api/controllers/auth.ts
@@ -2,6 +2,9 @@ import { outputProcessing } from "../../utilities/rowProcessor"
 import { InternalTables } from "../../db/utils"
 import { getFullUser } from "../../utilities/users"
 import { roles, context } from "@budibase/backend-core"
+import { groups } from "@budibase/pro"
+
+const PUBLIC_ROLE = roles.BUILTIN_ROLE_IDS.PUBLIC
 
 /**
  * Add the attributes that are session based to the current user.
@@ -26,8 +29,14 @@ export async function fetchSelf(ctx: any) {
   // forward the csrf token from the session
   user.csrfToken = ctx.user.csrfToken
 
-  if (context.getAppId()) {
+  const appId = context.getAppId()
+  if (appId) {
     const db = context.getAppDB()
+    // check for group permissions
+    if (!user.roleId || user.roleId === PUBLIC_ROLE) {
+      const groupRoleId = await groups.getGroupRoleId(user, appId)
+      user.roleId = groupRoleId || user.roleId
+    }
     // remove the full roles structure
     delete user.roles
     try {
@@ -43,7 +52,7 @@ export async function fetchSelf(ctx: any) {
     } catch (err: any) {
       let response
       // user didn't exist in app, don't pretend they do
-      if (user.roleId === roles.BUILTIN_ROLE_IDS.PUBLIC) {
+      if (user.roleId === PUBLIC_ROLE) {
         response = {}
       }
       // user has a role of some sort, return them
diff --git a/packages/worker/pm2.config.js b/packages/worker/pm2.config.js
index 93976c082b..b5fb1880ef 100644
--- a/packages/worker/pm2.config.js
+++ b/packages/worker/pm2.config.js
@@ -1,7 +1,7 @@
 module.exports = {
   apps: [
     {
-      script: "./dist/index.ts",
+      script: "./dist/index.js",
       instances: "max",
       exec_mode: "cluster",
     },