chore: move config behind checks (#1211)

automatisch · Aug 11, 2023 · 25983e0 · 25983e0
1 parent a6a124d
commit 25983e0
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 8 deletions.
diff --git a/packages/backend/src/graphql/mutation-resolvers.ts b/packages/backend/src/graphql/mutation-resolvers.ts
@@ -17,7 +17,7 @@ import login from './mutations/login';
 import registerUser from './mutations/register-user.ee';
 import resetConnection from './mutations/reset-connection';
 import resetPassword from './mutations/reset-password.ee';
-import updateConfig from './mutations/update-config';
+import updateConfig from './mutations/update-config.ee';
 import updateConnection from './mutations/update-connection';
 import updateCurrentUser from './mutations/update-current-user';
 import updateFlow from './mutations/update-flow';

diff --git a/...nd/src/graphql/mutations/update-config.ts → ...src/graphql/mutations/update-config.ee.ts b/...nd/src/graphql/mutations/update-config.ts → ...src/graphql/mutations/update-config.ee.ts
diff --git a/...backend/src/graphql/queries/get-config.ts → ...kend/src/graphql/queries/get-config.ee.ts b/...backend/src/graphql/queries/get-config.ts → ...kend/src/graphql/queries/get-config.ee.ts
@@ -1,5 +1,6 @@
-import Context from '../../types/express/context';
+import { hasValidLicense } from '../../helpers/license.ee';
 import Config from '../../models/config';
+import Context from '../../types/express/context';
 
 type Params = {
   keys: string[];
@@ -10,6 +11,8 @@ const getConfig = async (
   params: Params,
   context: Context
 ) => {
+  if (!await hasValidLicense()) return {};
+
   const configQuery = Config
     .query();
 

diff --git a/packages/backend/src/graphql/query-resolvers.ts b/packages/backend/src/graphql/query-resolvers.ts
@@ -3,7 +3,7 @@ import getApps from './queries/get-apps';
 import getAutomatischInfo from './queries/get-automatisch-info';
 import getBillingAndUsage from './queries/get-billing-and-usage.ee';
 import getConnectedApps from './queries/get-connected-apps';
-import getConfig from './queries/get-config';
+import getConfig from './queries/get-config.ee';
 import getCurrentUser from './queries/get-current-user';
 import getDynamicData from './queries/get-dynamic-data';
 import getDynamicFields from './queries/get-dynamic-fields';

diff --git a/packages/backend/src/models/user.ts b/packages/backend/src/models/user.ts
@@ -293,11 +293,13 @@ class User extends Base {
 
     if (Array.isArray(this.permissions)) {
       this.permissions = this.permissions.filter((permission) => {
-        const isRolePermission = permission.subject === 'Role';
-        const isSamlAuthProviderPermission =
-          permission.subject === 'SamlAuthProvider';
+        const restrictedSubjects = [
+          'Role',
+          'SamlAuthProvider',
+          'Config',
+        ];
 
-        return !isRolePermission && !isSamlAuthProviderPermission;
+        return !restrictedSubjects.includes(permission.subject);
       });
     }
 

diff --git a/...eb/src/graphql/mutations/update-config.ts → ...src/graphql/mutations/update-config.ee.ts b/...eb/src/graphql/mutations/update-config.ts → ...src/graphql/mutations/update-config.ee.ts
diff --git a/...ges/web/src/graphql/queries/get-config.ts → .../web/src/graphql/queries/get-config.ee.ts b/...ges/web/src/graphql/queries/get-config.ts → .../web/src/graphql/queries/get-config.ee.ts
diff --git a/packages/web/src/hooks/useConfig.ts b/packages/web/src/hooks/useConfig.ts
@@ -1,7 +1,7 @@
 import { useQuery } from '@apollo/client';
 import { IJSONObject } from '@automatisch/types';
 
-import { GET_CONFIG } from 'graphql/queries/get-config';
+import { GET_CONFIG } from 'graphql/queries/get-config.ee';
 
 type QueryResponse = {
   getConfig: IJSONObject;