Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: move config behind checks #1211

Merged
merged 1 commit into from
Aug 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/backend/src/graphql/mutation-resolvers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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[];
Expand All @@ -10,6 +11,8 @@ const getConfig = async (
params: Params,
context: Context
) => {
if (!await hasValidLicense()) return {};

const configQuery = Config
.query();

Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/graphql/query-resolvers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
10 changes: 6 additions & 4 deletions packages/backend/src/models/user.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
}

Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/hooks/useConfig.ts
Original file line number Diff line number Diff line change
@@ -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;
Expand Down