diff --git a/docs/docs/sso/github.md b/docs/docs/sso/github.md
index 1d5aa22e2f..a7faf8bb4c 100644
--- a/docs/docs/sso/github.md
+++ b/docs/docs/sso/github.md
@@ -5,7 +5,7 @@ title: GitHub
# GitHub Single Sign-on
-Select `Manage SSO` from organization options
+Select `Manage SSO` from workspace options
@@ -55,4 +55,4 @@ Go to [GitHub Developer settings](https://github.com/settings/developers) and na
Lastly, enter `Client Id` and `Client Secret` in Git manage SSO page and save.
-The GitHub sign-in button will now be available in your ToolJet login screen if you have not enabled multiple organization.
+The GitHub sign-in button will now be available in your ToolJet login screen if you have not enabled Multi-Workspace.
diff --git a/docs/docs/sso/google.md b/docs/docs/sso/google.md
index b7a1988265..43c25cbe3d 100644
--- a/docs/docs/sso/google.md
+++ b/docs/docs/sso/google.md
@@ -5,7 +5,7 @@ title: Google
# Google Single Sign-on
-Select `Manage SSO` from organization options
+Select `Manage SSO` from workspace options
@@ -45,7 +45,7 @@ Go to [Google cloud console](https://console.cloud.google.com/) and create a pro
-- You'll be asked to select user type in consent screen. To allow only users within your organization, select 'Internal', otherwise,
+- You'll be asked to select user type in consent screen. To allow only users within your workspace, select 'Internal', otherwise,
select 'External'.
@@ -82,4 +82,4 @@ Set the `Redirect URL` generated at manage SSO `Google` page under Authorised re
Lastly, set the `client id` in google manage SSO page. This value will be available from your [Google cloud console credentials page](https://console.cloud.google.com/apis/credentials)
-The Google sign-in button will now be available in your ToolJet login screen, if you are not enabled multiple organization.
+The Google sign-in button will now be available in your ToolJet login screen, if you are not enabled Multi-Workspace.
diff --git a/docs/docs/tutorial/adding-a-datasource.md b/docs/docs/tutorial/adding-a-datasource.md
index 2d46d1e914..75a1d2be88 100644
--- a/docs/docs/tutorial/adding-a-datasource.md
+++ b/docs/docs/tutorial/adding-a-datasource.md
@@ -6,7 +6,7 @@ title: Adding a data source
# Adding a data source
:::tip
-The data sources are created on app level and not on organization level.
+The data sources are created on app level and not on workspace level.
:::
**Datasource manager** is on the left-sidebar of the app builder. To add a new data source, click on the `Add datasource` button.
diff --git a/docs/docs/tutorial/manage-users-groups.md b/docs/docs/tutorial/manage-users-groups.md
index 9c3bf778ee..f1d62f21e1 100644
--- a/docs/docs/tutorial/manage-users-groups.md
+++ b/docs/docs/tutorial/manage-users-groups.md
@@ -7,7 +7,7 @@ title: Managing Users and Groups
## Managing Users
-Admin of an organization can add users to the organization. To manage the users in your organization, just go to the **Account menu** on top right corner and click on the **Manage Users**.
+Admin of a workspace can add users to the workspace. To manage the users in your workspace, just go to the **Workspace menu** on top right corner and click on the **Manage Users**.
@@ -17,7 +17,7 @@ Admin of an organization can add users to the organization. To manage the users
### Inviting users
-Admins can invite anyone to a ToolJet organization using the email address. To invite a user:
+Admins can invite anyone to a workspace using the email address. To invite a user:
- On the **Manage Users** page click on the `Invite new user` button.
@@ -35,7 +35,7 @@ Admins can invite anyone to a ToolJet organization using the email address. To i
-- An email including the **Invite Link** to join your organization will be send to the created user. The status will turn from **invited** to **active** after the user successfully joins your organization using the invite link.
+- An email including the **Invite Link** to join your workspace will be send to the created user. The status will turn from **invited** to **active** after the user successfully joins your workspace using the invite link.
:::tip
@@ -51,7 +51,7 @@ You can also copy the invitation url by clicking on the copy icon next to `invit
### Disabling a user's access
-You can disable any active user's access to your organization by clicking on the **Archive** and then the status of the user will change from **active** to **archived**.
+You can disable any active user's access to your workspace by clicking on the **Archive** and then the status of the user will change from **active** to **archived**.
@@ -71,7 +71,7 @@ Similar to archiving a user's access, you can enable it again by clicking on **U
## Managing Groups
-On ToolJet, Admins can create groups for users added in an organization and grant them access to particular app(s) with specific permissions. To manage groups, just go to the **Account menu** on top right corner and click on the **Manage Groups**.
+On ToolJet, Admins can create groups for users added in a workspace and grant them access to particular app(s) with specific permissions. To manage groups, just go to the **Account menu** on top right corner and click on the **Manage Groups**.
@@ -115,13 +115,13 @@ Admins can set granular permission like creating/deleting apps or creating folde
:::tip
-All the activities performed by any Admin or any user in a ToolJet organization is logged in `Audit logs` - including any activity related with managing users and groups.
+All the activities performed by any Admin or any user in a workspace is logged in `Audit logs` - including any activity related with managing users and groups.
:::
### Predefined Groups
-By default, every organization will have two User Groups:
+By default, every workspace will have two User Groups:
**1. All Users**
@@ -129,7 +129,7 @@ This group contains all the users and admins.
| Apps | Users | Permissions |
| ----------- | ----------- | ----------- |
-| You can add or remove apps. | Modification is disabled. This group will have all the users and admins added in an organization. | You can edit permissions for all the users globally. |
+| You can add or remove apps. | Modification is disabled. This group will have all the users and admins added in a workspace. | You can edit permissions for all the users globally. |
@@ -143,7 +143,7 @@ This group contains admins by default. Admins can add more admins or remove the
| Apps | Users | Permissions |
| ----------- | ----------- | ----------- |
-| Modification is disabled. By default, this group has `Edit` permission for all the apps in an organization | Admins can add or remove users in this group. | Modification is disabled. By default, all the admins can create and delete apps or create folders. |
+| Modification is disabled. By default, this group has `Edit` permission for all the apps in a workspace | Admins can add or remove users in this group. | Modification is disabled. By default, all the admins can create and delete apps or create folders. |
diff --git a/docs/docs/widgets/custom-component.md b/docs/docs/widgets/custom-component.md
new file mode 100644
index 0000000000..fa9affbee6
--- /dev/null
+++ b/docs/docs/widgets/custom-component.md
@@ -0,0 +1,92 @@
+---
+id: custom-component
+title: Custom Component
+---
+
+# Custom Component
+
+Custom Component can be used to do create your own React component when the needed functionality isn't available in other components.
+
+
+
+);
+
+const ConnectedComponent = Tooljet.connectComponent(MyCustomComponent);
+
+ReactDOM.render(
+
+
+
+
+
+## Properties
+
+### Data
+
+The data needs to be an objects which needs to be passed as `data` props to the custom component
+
+**Example:**
+
+```json
+{{{
+ title: "Hi! There",
+ buttonText: "Updated Text",
+ queryName: "runjs1"
+}}}
+```
+
+### Code
+
+This field is used to add a React code for your custom component. The packages for the custom component can be imported from [Skypack](https://www.skypack.dev/). For example, to import `React` package into the custom component it can be imported as `import React from 'https://cdn.skypack.dev/react'`.
+
+Tooljet provides 3 props to interact with the app: `data`, `updateData` and `runQuery`.
+
+- `data` is a shared object between custom component and Tooljet app.
+- `updateData` is a function which accepts a single object used to update the data passed to the custom component.
+- `runQuery` is a function which accepts a query name as a string used to run the query from the custom component.
+
+**Example:**
+
+```json
+import React from "https://cdn.skypack.dev/react";
+import ReactDOM from "https://cdn.skypack.dev/react-dom";
+import { Button, Container, Link } from "https://cdn.skypack.dev/@material-ui/core";
+
+const MyCustomComponent = ({data, updateData, runQuery}) => (
+ {data.title}
+ + +
-
+
{
@@ -49,7 +49,7 @@ class OrganizationInvitationPage extends React.Component {
})
.then(() => {
this.setState({ isLoading: false });
- toast.success(`Added to the organization${isSetPassword ? ' and password has been set ' : ' '}successfully.`, {
+ toast.success(`Added to the workspace${isSetPassword ? ' and password has been set ' : ' '}successfully.`, {
position: 'top-center',
});
this.props.history.push('/login');
diff --git a/frontend/src/Editor/AppVersionsManager.jsx b/frontend/src/Editor/AppVersionsManager.jsx
index 514aa5581f..b338b0f6c0 100644
--- a/frontend/src/Editor/AppVersionsManager.jsx
+++ b/frontend/src/Editor/AppVersionsManager.jsx
@@ -132,7 +132,7 @@ export const AppVersionsManager = function AppVersionsManager({
return (
- App Version
+ Version
{
@@ -149,49 +149,58 @@ export const AppVersionsManager = function AppVersionsManager({
{appVersions.map((version) =>
releasedVersionId == version.id ? (
-
selectVersion(version)}>
-
{version.name}
-
- 
- Currently Released
+ <>
+
+
+
) : (
-
- Currently Released
+ <>
+ selectVersion(version)}
+ >
+
- {version.name}
+
+
+ Currently Released
+
+ Currently Released
+ selectVersion(version)}
- onMouseEnter={() => setMouseHoveredOnVersion(version.id)}
- onMouseLeave={() => setMouseHoveredOnVersion(null)}
- >
-
{version.name}
+ <>
+ selectVersion(version)}
+ onMouseEnter={() => setMouseHoveredOnVersion(version.id)}
+ onMouseLeave={() => setMouseHoveredOnVersion(null)}
+ >
+
+
+
)
)}
-
{version.name}
-
-
+
-
+
+
setShowModal(true)}>
Create Version
diff --git a/frontend/src/Editor/Box.jsx b/frontend/src/Editor/Box.jsx
index b2b7a2ab72..977b1a9810 100644
--- a/frontend/src/Editor/Box.jsx
+++ b/frontend/src/Editor/Box.jsx
@@ -38,7 +38,9 @@ import { renderTooltip } from '@/_helpers/appUtils';
import { RangeSlider } from './Components/RangeSlider';
import { Timeline } from './Components/Timeline';
import { SvgImage } from './Components/SvgImage';
+import { CustomComponent } from './Components/CustomComponent/CustomComponent';
import { VerticalDivider } from './Components/verticalDivider';
+import { PDF } from './Components/PDF';
import OverlayTrigger from 'react-bootstrap/OverlayTrigger';
import '@/_styles/custom.scss';
import { resolveProperties, resolveStyles } from './component-properties-resolution';
@@ -83,7 +85,9 @@ const AllComponents = {
RangeSlider,
Timeline,
SvgImage,
+ CustomComponent,
VerticalDivider,
+ PDF,
};
export const Box = function Box({
@@ -110,6 +114,7 @@ export const Box = function Box({
parentId,
allComponents,
extraProps,
+ dataQueries,
}) {
const backgroundColor = yellow ? 'yellow' : '';
@@ -214,6 +219,7 @@ export const Box = function Box({
validate={validate}
parentId={parentId}
customResolvables={customResolvables}
+ dataQueries={dataQueries}
>
) : (
+
diff --git a/frontend/src/Editor/CodeBuilder/CodeHinter.jsx b/frontend/src/Editor/CodeBuilder/CodeHinter.jsx
index 6c0967fcfb..c792037ce2 100644
--- a/frontend/src/Editor/CodeBuilder/CodeHinter.jsx
+++ b/frontend/src/Editor/CodeBuilder/CodeHinter.jsx
@@ -112,6 +112,7 @@ export function CodeHinter({
};
const getPreview = () => {
+ if (!enablePreview) return;
const [preview, error] = resolveReferences(currentValue, realState, null, {}, true);
const themeCls = darkMode ? 'bg-dark py-1' : 'bg-light py-1';
@@ -181,7 +182,8 @@ export function CodeHinter({
};
const [, forceUpdate] = React.useReducer((x) => x + 1, 0);
- const defaultClassName = className === 'query-hinter' || undefined ? '' : 'code-hinter';
+ const defaultClassName =
+ className === 'query-hinter' || className === 'custom-component' || undefined ? '' : 'code-hinter';
const ElementToRender = AllElements[TypeMapping[type]];
diff --git a/frontend/src/Editor/CodeBuilder/utils.js b/frontend/src/Editor/CodeBuilder/utils.js
index f439f6a51f..54b602439b 100644
--- a/frontend/src/Editor/CodeBuilder/utils.js
+++ b/frontend/src/Editor/CodeBuilder/utils.js
@@ -2,18 +2,43 @@ import _ from 'lodash';
import Fuse from 'fuse.js';
export function getSuggestionKeys(currentState) {
- let suggestions = [];
- _.keys(currentState).forEach((key) => {
- _.keys(currentState[key]).forEach((key2) => {
- if (key === 'variables') {
- return suggestions.push(`${key}.${key2}`);
+ const suggestionList = [];
+
+ const map = new Map();
+
+ const buildMap = (data, path = '') => {
+ const keys = Object.keys(data);
+ keys.forEach((key, index) => {
+ const value = data[key];
+ const _type = Object.prototype.toString.call(value).slice(8, -1);
+ const prevType = map.get(path)?.type;
+
+ let newPath = '';
+ if (path === '') {
+ newPath = key;
+ } else if (prevType === 'Array') {
+ newPath = `${path}[${index}]`;
+ } else {
+ newPath = `${path}.${key}`;
+ }
+
+ if (_type === 'Object') {
+ map.set(newPath, { type: _type });
+ buildMap(value, newPath);
+ }
+ if (_type === 'Array') {
+ map.set(newPath, { type: _type });
+ buildMap(value, newPath);
+ } else {
+ map.set(newPath, { type: _type });
}
- _.keys(currentState[key][key2]).forEach((key3) => {
- suggestions.push(`${key}.${key2}.${key3}`);
- });
});
- });
- return suggestions;
+ };
+
+ buildMap(currentState, '');
+ map.forEach((__, key) => suggestionList.push(key));
+
+ return suggestionList;
}
export function generateHints(word, suggestions) {
diff --git a/frontend/src/Editor/Components/CustomComponent/CustomComponent.jsx b/frontend/src/Editor/Components/CustomComponent/CustomComponent.jsx
new file mode 100644
index 0000000000..9d8ff33c6e
--- /dev/null
+++ b/frontend/src/Editor/Components/CustomComponent/CustomComponent.jsx
@@ -0,0 +1,105 @@
+import React, { useEffect, useState, useRef } from 'react';
+import { isEqual } from 'lodash';
+import iframeContent from './iframe.html';
+
+export const CustomComponent = (props) => {
+ const { height, properties, styles, id, setExposedVariable, exposedVariables, fireEvent, dataQueries } = props;
+ const { visibility } = styles;
+ const { code, data } = properties;
+ const [customProps, setCustomProps] = useState(data);
+ const iFrameRef = useRef(null);
+ const dataQueryRef = useRef(dataQueries);
+ const customPropRef = useRef(data);
+
+ useEffect(() => {
+ setCustomProps(data);
+ customPropRef.current = data;
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [JSON.stringify(data)]);
+
+ useEffect(() => {
+ if (!isEqual(exposedVariables.data, customProps)) {
+ setExposedVariable('data', customProps);
+ sendMessageToIframe({ message: 'DATA_UPDATED' });
+ }
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [setExposedVariable, customProps, exposedVariables.data]);
+
+ useEffect(() => {
+ sendMessageToIframe({ message: 'CODE_UPDATED' });
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [code]);
+
+ useEffect(() => {
+ dataQueryRef.current = dataQueries;
+ }, [dataQueries]);
+
+ useEffect(() => {
+ window.addEventListener('message', (e) => {
+ try {
+ if (e.data.from === 'customComponent' && e.data.componentId === id) {
+ if (e.data.message === 'UPDATE_DATA') {
+ setCustomProps({ ...customPropRef.current, ...e.data.updatedObj });
+ } else if (e.data.message === 'RUN_QUERY') {
+ const filteredQuery = dataQueryRef.current.filter((query) => query.name === e.data.queryName);
+ filteredQuery.length === 1 &&
+ fireEvent('onTrigger', { queryId: filteredQuery[0].id, queryName: filteredQuery[0].name });
+ } else {
+ sendMessageToIframe(e.data);
+ }
+ }
+ } catch (err) {
+ console.log(err);
+ }
+ });
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, []);
+
+ const sendMessageToIframe = ({ message }) => {
+ if (!iFrameRef.current) return;
+ switch (message) {
+ case 'INIT':
+ return iFrameRef.current.contentWindow.postMessage(
+ {
+ message: 'INIT_RESPONSE',
+ componentId: id,
+ data: customProps,
+ code: code,
+ },
+ '*'
+ );
+ case 'CODE_UPDATED':
+ return iFrameRef.current.contentWindow.postMessage(
+ {
+ message: 'CODE_UPDATED',
+ componentId: id,
+ data: customProps,
+ code: code,
+ },
+ '*'
+ );
+ case 'DATA_UPDATED':
+ return iFrameRef.current.contentWindow.postMessage(
+ {
+ message: 'DATA_UPDATED',
+ componentId: id,
+ data: customProps,
+ },
+ '*'
+ );
+ default:
+ return;
+ }
+ };
+
+ return (
+
+
+
+ );
+};
diff --git a/frontend/src/Editor/Components/CustomComponent/iframe.html b/frontend/src/Editor/Components/CustomComponent/iframe.html
new file mode 100644
index 0000000000..19aa58b78f
--- /dev/null
+++ b/frontend/src/Editor/Components/CustomComponent/iframe.html
@@ -0,0 +1,86 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/frontend/src/Editor/Components/PDF.jsx b/frontend/src/Editor/Components/PDF.jsx
new file mode 100644
index 0000000000..442c4e7b75
--- /dev/null
+++ b/frontend/src/Editor/Components/PDF.jsx
@@ -0,0 +1,93 @@
+import React, { useState, useCallback, useRef, useEffect } from 'react';
+import { Document, Page } from 'react-pdf/dist/esm/entry.webpack';
+
+export const PDF = React.memo(({ styles, properties, width, height }) => {
+ const { visibility } = styles;
+ const { url, scale, pageControls } = properties;
+ const [numPages, setNumPages] = useState(null);
+ const [pageNumber, setPageNumber] = useState(null);
+ const pageRef = useRef([]);
+
+ const onDocumentLoadSuccess = (document) => {
+ const { numPages: nextNumPages } = document;
+ setNumPages(nextNumPages);
+ setPageNumber(1);
+ };
+
+ const options = {
+ root: document.querySelector('#pdf-wrapper'),
+ rootMargin: '0px',
+ threshold: 0.5,
+ };
+
+ const trackIntersection = (entries) => {
+ entries.forEach((entry) => {
+ if (entry.isIntersecting) {
+ const currentPage = parseInt(entry.target.getAttribute('data-page-number'));
+ if (pageNumber !== currentPage) setPageNumber(currentPage);
+ }
+ });
+ };
+
+ useEffect(() => {
+ if (numPages === 0 || numPages === null) return;
+ const observer = new IntersectionObserver(trackIntersection, options);
+ document.querySelectorAll('.react-pdf__Page').forEach((elem) => {
+ if (elem) observer.observe(elem);
+ });
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [numPages, options]);
+
+ const updatePage = useCallback(
+ (offset) => {
+ pageRef.current[pageNumber + offset - 1].scrollIntoView({ block: 'nearest' });
+ setPageNumber((prevPageNumber) => (prevPageNumber || 1) + offset);
+ },
+ [pageNumber]
+ );
+
+ return (
+
+
+ );
+});
diff --git a/frontend/src/Editor/Components/Statistics.jsx b/frontend/src/Editor/Components/Statistics.jsx
index b3686db46d..21c8c97237 100644
--- a/frontend/src/Editor/Components/Statistics.jsx
+++ b/frontend/src/Editor/Components/Statistics.jsx
@@ -1,7 +1,14 @@
import React from 'react';
-export const Statistics = function Statistics({ height, properties, styles, darkMode }) {
- const { primaryValueLabel, primaryValue, secondaryValueLabel, secondaryValue, secondarySignDisplay, hideSecondary } =
- properties;
+export const Statistics = function Statistics({ width, height, properties, styles, darkMode }) {
+ const {
+ primaryValueLabel,
+ primaryValue,
+ secondaryValueLabel,
+ secondaryValue,
+ secondarySignDisplay,
+ hideSecondary,
+ loadingState,
+ } = properties;
const { primaryLabelColour, primaryTextColour, secondaryLabelColour, secondaryTextColour, visibility } = styles;
const baseStyle = {
@@ -64,45 +71,55 @@ export const Statistics = function Statistics({ height, properties, styles, dark
return (
+
+
+
+ {Array.from(new Array(numPages), (el, index) => (
+ (pageRef.current[index] = el)}
+ />
+ ))}
+ {pageControls && (
+ <>
+
+
+
+
+
+ {pageNumber} of {numPages}
+
+
+
+
+ )}
+
-
);
diff --git a/frontend/src/Editor/Components/Text.jsx b/frontend/src/Editor/Components/Text.jsx
index 63cd592c21..48089dfd8e 100644
--- a/frontend/src/Editor/Components/Text.jsx
+++ b/frontend/src/Editor/Components/Text.jsx
@@ -4,7 +4,7 @@ import DOMPurify from 'dompurify';
export const Text = function Text({ height, properties, styles, darkMode }) {
const [loadingState, setLoadingState] = useState(false);
- const { textColor, textAlign, visibility, disabledState } = styles;
+ const { textSize, textColor, textAlign, visibility, disabledState } = styles;
const text = properties.text === 0 || properties.text === false ? properties.text?.toString() : properties.text;
@@ -27,7 +27,10 @@ export const Text = function Text({ height, properties, styles, darkMode }) {
return (
- {primaryValueLabel} -
-{primaryValue}
- {hideSecondary ? ( - '' + {loadingState === true ? ( +
+
+
+
+
) : (
-
-
+
- {secondarySignDisplay !== 'negative' ? (
- 
- ) : (
- 
- )}
-
+ <>
- ) : (
-
- )}
- {secondaryValue}
-- {secondaryValueLabel} + {primaryValueLabel}
-{primaryValue}
+ {hideSecondary ? ( + '' + ) : ( +
+
+ )}
+
)}
+ {secondarySignDisplay !== 'negative' ? (
+
+ ) : (
+
+ )}
+
+
+ ) : (
+
+ )}
+ {secondaryValue}
++ {secondaryValueLabel} +
+
{!loadingState && (
-
+
)}
{loadingState === true && (
paramUpdated({ name: 'data' }, 'value', value, 'properties')}
+ componentName={`widget/${component.component.name}/data`}
+ />
+ ),
+ });
+
+ items.push({
+ title: 'Code',
+ children: (
+ paramUpdated({ name: 'code' }, 'value', value, 'properties')}
+ componentName={`widget/${component.component.name}/code`}
+ enablePreview={false}
+ height={400}
+ />
+ ),
+ });
+
+ items.push({
+ title: 'Layout',
+ isOpen: false,
+ children: (
+ <>
+ {renderElement(
+ component,
+ componentMeta,
+ layoutPropertyChanged,
+ dataQueries,
+ 'showOnDesktop',
+ 'others',
+ currentState,
+ components
+ )}
+ {renderElement(
+ component,
+ componentMeta,
+ layoutPropertyChanged,
+ dataQueries,
+ 'showOnMobile',
+ 'others',
+ currentState,
+ components
+ )}
+
+ ),
+ });
+ return {
const [open, trigger, content] = usePopover(false);
- const { hideHeader, canvasMaxWidth, canvasBackgroundColor } = globalSettings;
+ const { hideHeader, canvasMaxWidth, canvasMaxHeight, canvasBackgroundColor } = globalSettings;
const [showPicker, setShowPicker] = React.useState(false);
const [showConfirmation, setConfirmationShow] = React.useState(false);
const coverStyles = {
@@ -75,7 +75,7 @@ export const LeftSidebarGlobalSettings = ({
{
globalSettingsChanged('canvasMaxWidth', e.target.value);
}}
@@ -85,6 +85,24 @@ export const LeftSidebarGlobalSettings = ({
diff --git a/frontend/src/Editor/Components/Timeline.jsx b/frontend/src/Editor/Components/Timeline.jsx
index dd14ceebd6..e1f6ad4f91 100644
--- a/frontend/src/Editor/Components/Timeline.jsx
+++ b/frontend/src/Editor/Components/Timeline.jsx
@@ -8,7 +8,10 @@ export const Timeline = function Timeline({ height, darkMode, properties, styles
const darkModeStyle = darkMode && 'text-white-50';
return (
-
Preview
@@ -1109,7 +1229,7 @@ class Editor extends React.Component {
appDefinition={{
components: appDefinition.components,
queries: dataQueries,
- selectedComponent: this.state?.selectedComponent,
+ selectedComponent: selectedComponents ? selectedComponents[selectedComponents.length - 1] : {},
}}
setSelectedComponent={this.setSelectedComponent}
removeComponent={this.removeComponent}
@@ -1123,7 +1243,7 @@ class Editor extends React.Component {
style={{ transform: `scale(${zoomLevel})` }}
onClick={(e) => {
if (['real-canvas', 'modal'].includes(e.target.className)) {
- this.switchSidebarTab(2);
+ this.setState({ selectedComponents: [], currentSidebarTab: 2 });
}
}}
>
@@ -1131,7 +1251,9 @@ class Editor extends React.Component {
className="canvas-area"
style={{
width: currentLayout === 'desktop' ? '100%' : '450px',
+ minHeight: +this.state.appDefinition.globalSettings.canvasMaxHeight,
maxWidth: +this.state.appDefinition.globalSettings.canvasMaxWidth,
+ maxHeight: +this.state.appDefinition.globalSettings.canvasMaxHeight,
backgroundColor: this.state.appDefinition.globalSettings.canvasBackgroundColor,
}}
>
@@ -1145,6 +1267,7 @@ class Editor extends React.Component {
<>
+
+
+
);
diff --git a/frontend/src/Editor/Container.jsx b/frontend/src/Editor/Container.jsx
index 0bac6ff30e..6250787fab 100644
--- a/frontend/src/Editor/Container.jsx
+++ b/frontend/src/Editor/Container.jsx
@@ -1,3 +1,4 @@
+/* eslint-disable import/no-named-as-default */
import React, { useCallback, useState, useEffect, useRef } from 'react';
import cx from 'classnames';
import { v4 as uuidv4 } from 'uuid';
@@ -14,9 +15,11 @@ import { commentsService } from '@/_services';
import config from 'config';
import Spinner from '@/_ui/Spinner';
import { useHotkeys } from 'react-hotkeys-hook';
+import produce from 'immer';
export const Container = ({
canvasWidth,
+ canvasHeight,
mode,
snapToGrid,
onComponentClick,
@@ -32,7 +35,7 @@ export const Container = ({
currentLayout,
removeComponent,
deviceWindowWidth,
- selectedComponent,
+ selectedComponents,
darkMode,
showComments,
appVersionsId,
@@ -41,11 +44,13 @@ export const Container = ({
handleRedo,
onComponentHover,
hoveredComponent,
+ dataQueries,
}) => {
const styles = {
width: currentLayout === 'mobile' ? deviceWindowWidth : '100%',
- height: 2400,
+ height: '100%',
maxWidth: `${canvasWidth}px`,
+ maxHeight: `${canvasHeight}px`,
position: 'absolute',
backgroundSize: `${canvasWidth / 43}px 10px`,
};
@@ -208,7 +213,7 @@ export const Container = ({
);
function onDragStop(e, componentId, direction, currentLayout) {
- const id = componentId ? componentId : uuidv4();
+ // const id = componentId ? componentId : uuidv4();
// Get the width of the canvas
const canvasBounds = document.getElementsByClassName('real-canvas')[0].getBoundingClientRect();
@@ -217,25 +222,24 @@ export const Container = ({
// Computing the left offset
const leftOffset = nodeBounds.x - canvasBounds.x;
- const left = convertXToPercentage(leftOffset, canvasWidth);
+ const currentLeftOffset = boxes[componentId].layouts[currentLayout].left;
+ const leftDiff = currentLeftOffset - convertXToPercentage(leftOffset, canvasWidth);
// Computing the top offset
- const top = nodeBounds.y - canvasBounds.y;
+ // const currentTopOffset = boxes[componentId].layouts[currentLayout].top;
+ const topDiff = boxes[componentId].layouts[currentLayout].top - (nodeBounds.y - canvasBounds.y);
- let newBoxes = {
- ...boxes,
- [id]: {
- ...boxes[id],
- layouts: {
- ...boxes[id]['layouts'],
- [currentLayout]: {
- ...boxes[id]['layouts'][currentLayout],
- top: top,
- left: left,
- },
- },
- },
- };
+ let newBoxes = { ...boxes };
+
+ for (const selectedComponent of selectedComponents) {
+ newBoxes = produce(newBoxes, (draft) => {
+ const topOffset = draft[selectedComponent.id].layouts[currentLayout].top;
+ const leftOffset = draft[selectedComponent.id].layouts[currentLayout].left;
+
+ draft[selectedComponent.id].layouts[currentLayout].top = topOffset - topDiff;
+ draft[selectedComponent.id].layouts[currentLayout].left = leftOffset - leftDiff;
+ });
+ }
setBoxes(newBoxes);
}
@@ -307,7 +311,7 @@ export const Container = ({
}
}
- React.useEffect(() => {}, [selectedComponent]);
+ React.useEffect(() => {}, [selectedComponents]);
const handleAddThread = async (e) => {
e.stopPropogation && e.stopPropogation();
@@ -463,10 +467,14 @@ export const Container = ({
removeComponent={removeComponent}
currentLayout={currentLayout}
deviceWindowWidth={deviceWindowWidth}
- isSelectedComponent={selectedComponent ? selectedComponent.id === key : false}
+ isSelectedComponent={
+ mode === 'edit' ? selectedComponents.find((component) => component.id === key) : false
+ }
darkMode={darkMode}
onComponentHover={onComponentHover}
hoveredComponent={hoveredComponent}
+ isMultipleComponentsSelected={selectedComponents?.length > 1 ? true : false}
+ dataQueries={dataQueries}
containerProps={{
mode,
snapToGrid,
@@ -483,10 +491,11 @@ export const Container = ({
removeComponent,
currentLayout,
deviceWindowWidth,
- selectedComponent,
+ selectedComponents,
darkMode,
onComponentHover,
hoveredComponent,
+ dataQueries,
}}
/>
);
diff --git a/frontend/src/Editor/DraggableBox.jsx b/frontend/src/Editor/DraggableBox.jsx
index 1d53b0f88c..6a634fe6ef 100644
--- a/frontend/src/Editor/DraggableBox.jsx
+++ b/frontend/src/Editor/DraggableBox.jsx
@@ -95,6 +95,8 @@ export const DraggableBox = function DraggableBox({
parentId,
hoveredComponent,
onComponentHover,
+ isMultipleComponentsSelected,
+ dataQueries,
}) {
const [isResizing, setResizing] = useState(false);
const [isDragging2, setDragging] = useState(false);
@@ -219,7 +221,7 @@ export const DraggableBox = function DraggableBox({
mouseOver || isResizing || isDragging2 || isSelectedComponent ? 'resizer-active' : ''
} `}
onResize={() => setResizing(true)}
- onDrag={(e) => {
+ onDrag={(e, direction) => {
e.preventDefault();
e.stopImmediatePropagation();
if (!isDragging2) {
@@ -251,7 +253,10 @@ export const DraggableBox = function DraggableBox({
position={currentLayoutOptions.top < 15 ? 'bottom' : 'top'}
widgetTop={currentLayoutOptions.top}
widgetHeight={currentLayoutOptions.height}
- setSelectedComponent={(id, component) => setSelectedComponent(id, component)}
+ setSelectedComponent={(id, component, multiSelect) =>
+ setSelectedComponent(id, component, multiSelect)
+ }
+ isMultipleComponentsSelected={isMultipleComponentsSelected}
/>
)}
@@ -278,6 +283,7 @@ export const DraggableBox = function DraggableBox({
parentId={parentId}
allComponents={allComponents}
extraProps={extraProps}
+ dataQueries={dataQueries}
/>
diff --git a/frontend/src/Editor/Editor.jsx b/frontend/src/Editor/Editor.jsx
index c2b89cf93b..a01121e183 100644
--- a/frontend/src/Editor/Editor.jsx
+++ b/frontend/src/Editor/Editor.jsx
@@ -7,6 +7,7 @@ import { HTML5Backend } from 'react-dnd-html5-backend';
import { computeComponentName } from '@/_helpers/utils';
import { defaults, cloneDeep, isEqual, isEmpty, debounce } from 'lodash';
import { Container } from './Container';
+import { EditorKeyHooks } from './EditorKeyHooks';
import { CustomDragLayer } from './CustomDragLayer';
import { LeftSidebar } from './LeftSidebar';
import { componentTypes } from './Components/components';
@@ -41,6 +42,7 @@ import RunjsIcon from './Icons/runjs.svg';
import EditIcon from './Icons/edit.svg';
import MobileSelectedIcon from './Icons/mobile-selected.svg';
import DesktopSelectedIcon from './Icons/desktop-selected.svg';
+import Spinner from '@/_ui/Spinner';
import { AppVersionsManager } from './AppVersionsManager';
import { SearchBoxComponent } from '@/_ui/Search';
import { createWebsocketConnection } from '@/_helpers/websocketConnection';
@@ -82,6 +84,7 @@ class Editor extends React.Component {
hideHeader: false,
appInMaintenance: false,
canvasMaxWidth: 1292,
+ canvasMaxHeight: 2400,
canvasBackgroundColor: props.darkMode ? '#2f3c4c' : '#edeff5',
},
};
@@ -126,6 +129,8 @@ class Editor extends React.Component {
showInitVersionCreateModal: false,
showCreateVersionModalPrompt: false,
isSourceSelected: false,
+ isSaving: false,
+ saveError: false,
};
this.autoSave = debounce(this.saveEditingVersion, 3000);
@@ -144,7 +149,7 @@ class Editor extends React.Component {
this.initEventListeners();
this.setState({
currentSidebarTab: 2,
- selectedComponent: null,
+ selectedComponents: [],
});
}
@@ -169,6 +174,12 @@ class Editor extends React.Component {
if (!isEqual(prevState.appDefinition, this.state.appDefinition)) {
computeComponentState(this, this.state.appDefinition.components);
}
+
+ if (config.ENABLE_MULTIPLAYER_EDITING) {
+ if (this.props.othersOnSameVersion.length !== prevProps.othersOnSameVersion.length) {
+ ReactTooltip.rebuild();
+ }
+ }
}
isVersionReleased = (version = this.state.editingVersion) => {
@@ -179,7 +190,7 @@ class Editor extends React.Component {
};
closeCreateVersionModalPrompt = () => {
- this.setState({ showCreateVersionModalPrompt: false });
+ this.setState({ isSaving: false, showCreateVersionModalPrompt: false });
};
onMouseMove = (e) => {
@@ -389,6 +400,7 @@ class Editor extends React.Component {
});
this.setState({
editingVersion: version,
+ isSaving: false,
});
this.fetchDataSources();
@@ -425,9 +437,6 @@ class Editor extends React.Component {
};
switchSidebarTab = (tabIndex) => {
- if (tabIndex === 2) {
- this.setState({ selectedComponent: null });
- }
this.setState({
currentSidebarTab: tabIndex,
});
@@ -525,26 +534,55 @@ class Editor extends React.Component {
},
this.handleAddPatch
);
- this.setState({ appDefinition: newDefinition }, () => {
+ this.setState({ isSaving: true, appDefinition: newDefinition }, () => {
if (!opts.skipAutoSave) this.autoSave();
});
computeComponentState(this, newDefinition.components);
};
- handleInspectorView = (component) => {
- if (this.state.selectedComponent?.hasOwnProperty('component')) {
- const { id: selectedComponentId } = this.state.selectedComponent;
- if (selectedComponentId === component.id) {
- this.setState({ selectedComponent: null });
- this.switchSidebarTab(2);
- }
- }
+ handleInspectorView = () => {
+ this.switchSidebarTab(2);
};
handleSlugChange = (newSlug) => {
this.setState({ slug: newSlug });
};
+ removeComponents = () => {
+ if (!this.isVersionReleased() && this.state?.selectedComponents?.length > 1) {
+ let newDefinition = cloneDeep(this.state.appDefinition);
+ const selectedComponents = this.state?.selectedComponents;
+
+ selectedComponents.forEach((component) => {
+ let childComponents = [];
+
+ if (newDefinition.components[component.id].component.component === 'Tabs') {
+ childComponents = Object.keys(newDefinition.components).filter((key) =>
+ newDefinition.components[key].parent?.startsWith(component.id)
+ );
+ } else {
+ childComponents = Object.keys(newDefinition.components).filter(
+ (key) => newDefinition.components[key].parent === component.id
+ );
+ }
+
+ childComponents.forEach((componentId) => {
+ delete newDefinition.components[componentId];
+ });
+
+ delete newDefinition.components[component.id];
+ });
+
+ toast('Selected components deleted! (⌘Z to undo)', {
+ icon: '🗑️',
+ });
+ this.appDefinitionChanged(newDefinition, {
+ skipAutoSave: this.isVersionReleased(),
+ });
+ this.handleInspectorView();
+ }
+ };
+
removeComponent = (component) => {
if (!this.isVersionReleased()) {
let newDefinition = cloneDeep(this.state.appDefinition);
@@ -573,7 +611,7 @@ class Editor extends React.Component {
this.appDefinitionChanged(newDefinition, {
skipAutoSave: this.isVersionReleased(),
});
- this.handleInspectorView(component);
+ this.handleInspectorView();
}
};
@@ -595,6 +633,7 @@ class Editor extends React.Component {
);
setStateAsync(_self, newDefinition).then(() => {
computeComponentState(_self, _self.state.appDefinition.components);
+ this.setState({ isSaving: true });
this.autoSave();
this.props.ymap?.set('appDef', {
newDefinition: newDefinition.appDefinition,
@@ -603,6 +642,47 @@ class Editor extends React.Component {
});
};
+ handleEditorEscapeKeyPress = () => {
+ if (this.state?.selectedComponents?.length > 0) {
+ this.setState({ selectedComponents: [] });
+ this.handleInspectorView();
+ }
+ };
+
+ moveComponents = (direction) => {
+ let appDefinition = JSON.parse(JSON.stringify(this.state.appDefinition));
+ let newComponents = appDefinition.components;
+
+ for (const selectedComponent of this.state.selectedComponents) {
+ newComponents = produce(newComponents, (draft) => {
+ let top = draft[selectedComponent.id].layouts[this.state.currentLayout].top;
+ let left = draft[selectedComponent.id].layouts[this.state.currentLayout].left;
+
+ const gridWidth = (1 * 100) / 43; // width of the canvas grid in percentage
+
+ switch (direction) {
+ case 'ArrowLeft':
+ left = left - gridWidth;
+ break;
+ case 'ArrowRight':
+ left = left + gridWidth;
+ break;
+ case 'ArrowDown':
+ top = top + 10;
+ break;
+ case 'ArrowUp':
+ top = top - 10;
+ break;
+ }
+
+ draft[selectedComponent.id].layouts[this.state.currentLayout].top = top;
+ draft[selectedComponent.id].layouts[this.state.currentLayout].left = left;
+ });
+ }
+ appDefinition.components = newComponents;
+ this.appDefinitionChanged(appDefinition);
+ };
+
cloneComponent = (newComponent) => {
const appDefinition = JSON.parse(JSON.stringify(this.state.appDefinition));
@@ -617,6 +697,7 @@ class Editor extends React.Component {
appDefinition.globalSettings[key] = value;
this.setState(
{
+ isSaving: true,
appDefinition,
},
() => {
@@ -811,9 +892,22 @@ class Editor extends React.Component {
this.setState({ showComments: !this.state.showComments });
};
- setSelectedComponent = (id, component) => {
- this.switchSidebarTab(1);
- this.setState({ selectedComponent: { id, component } });
+ setSelectedComponent = (id, component, multiSelect = false) => {
+ if (this.state.selectedComponents.length === 0 || !multiSelect) {
+ this.switchSidebarTab(1);
+ } else {
+ this.switchSidebarTab(2);
+ }
+
+ const isAlreadySelected = this.state.selectedComponents.find((component) => component.id === id);
+
+ if (!isAlreadySelected) {
+ this.setState((prevState) => {
+ return {
+ selectedComponents: [...(multiSelect ? prevState.selectedComponents : []), { id, component }],
+ };
+ });
+ }
};
filterQueries = (value) => {
@@ -867,6 +961,11 @@ class Editor extends React.Component {
return canvasBoundingRect?.width;
};
+ getCanvasHeight = () => {
+ const canvasBoundingRect = document.getElementsByClassName('canvas-area')[0].getBoundingClientRect();
+ return canvasBoundingRect?.height;
+ };
+
renderLayoutIcon = (isDesktopSelected) => {
if (isDesktopSelected)
return (
@@ -896,21 +995,31 @@ class Editor extends React.Component {
saveEditingVersion = () => {
if (this.isVersionReleased()) {
- this.setState({ showCreateVersionModalPrompt: true });
+ this.setState({ isSaving: false, showCreateVersionModalPrompt: true });
} else if (!isEmpty(this.state.editingVersion)) {
- toast.promise(appVersionService.save(this.state.appId, this.state.editingVersion.id, this.state.appDefinition), {
- loading: 'Saving...',
- success: () => {
- this.setState({
- editingVersion: {
- ...this.state.editingVersion,
- ...{ definition: this.state.appDefinition },
+ appVersionService
+ .save(this.state.appId, this.state.editingVersion.id, this.state.appDefinition)
+ .then(() => {
+ this.setState(
+ {
+ saveError: false,
+ editingVersion: {
+ ...this.state.editingVersion,
+ ...{ definition: this.state.appDefinition },
+ },
},
+ () => {
+ this.setState({
+ isSaving: false,
+ });
+ }
+ );
+ })
+ .catch(() => {
+ this.setState({ saveError: true, isSaving: false }, () => {
+ toast.error('App could not save.');
});
- return 'Saved!';
- },
- error: 'App could not save.',
- });
+ });
}
};
@@ -954,7 +1063,7 @@ class Editor extends React.Component {
render() {
const {
currentSidebarTab,
- selectedComponent = {},
+ selectedComponents = [],
appDefinition,
appId,
slug,
@@ -1034,6 +1143,15 @@ class Editor extends React.Component {
)}
+
+ {this.state.isSaving ? -
{(isArray(data) ? data : []).map((item, index) => (
diff --git a/frontend/src/Editor/Components/components.js b/frontend/src/Editor/Components/components.js
index 2a30fb0560..af5fe1342a 100644
--- a/frontend/src/Editor/Components/components.js
+++ b/frontend/src/Editor/Components/components.js
@@ -762,6 +762,7 @@ export const componentTypes = [
},
events: [],
styles: {
+ textSize: { type: 'number', displayName: 'Text Size' },
textColor: { type: 'color', displayName: 'Text Color' },
textAlign: { type: 'alignButtons', displayName: 'Align Text' },
visibility: { type: 'toggle', displayName: 'Visibility' },
@@ -781,6 +782,7 @@ export const componentTypes = [
events: [],
styles: {
groupActions: { value: 'left' },
+ textSize: { value: 14 },
textColor: { value: '#000' },
textAlign: { value: 'left' },
visibility: { value: '{{true}}' },
@@ -1854,6 +1856,7 @@ export const componentTypes = [
secondaryValueLabel: { type: 'code', displayName: 'Secondary value label' },
secondaryValue: { type: 'code', displayName: 'Secondary value' },
secondarySignDisplay: { type: 'code', displayName: 'Secondary sign display' },
+ loadingState: { type: 'toggle', displayName: 'Loading State' },
},
events: {},
styles: {
@@ -1874,6 +1877,7 @@ export const componentTypes = [
secondaryValueLabel: { value: 'Last month' },
secondaryValue: { value: '2.85' },
secondarySignDisplay: { value: 'positive' },
+ loadingState: { value: `{{false}}` },
},
events: [],
styles: {
@@ -2058,4 +2062,110 @@ export const componentTypes = [
},
},
},
+ {
+ name: 'CustomComponent',
+ displayName: 'Custom Component',
+ description: 'Visual representation of a sequence of events',
+ component: 'CustomComponent',
+ properties: {
+ data: { type: 'code', displayName: 'Data' },
+ code: { type: 'code', displayName: 'Code' },
+ },
+ defaultSize: {
+ width: 20,
+ height: 140,
+ },
+ others: {
+ showOnDesktop: { type: 'toggle', displayName: 'Show on desktop' },
+ showOnMobile: { type: 'toggle', displayName: 'Show on mobile' },
+ },
+ events: {},
+ styles: {
+ visibility: { type: 'toggle', displayName: 'Visibility' },
+ },
+ exposedVariables: {
+ data: { value: `{{{ title: 'Hi! There', buttonText: 'Update Title'}}}` },
+ },
+ definition: {
+ others: {
+ showOnDesktop: { value: '{{true}}' },
+ showOnMobile: { value: '{{false}}' },
+ },
+ properties: {
+ visible: { value: '{{true}}' },
+ data: {
+ value: `{{{ title: 'Hi! There', buttonText: 'Update Title'}}}`,
+ },
+ code: {
+ value: `import React from 'https://cdn.skypack.dev/react';
+import ReactDOM from 'https://cdn.skypack.dev/react-dom';
+import { Button, Container } from 'https://cdn.skypack.dev/@material-ui/core';
+const MyCustomComponent = ({data, updateData, runQuery}) => (
+
{data.title}
+ + {
e.preventDefault();
e.stopPropagation();
- setSelectedComponent(id, component);
+ setSelectedComponent(id, component, e.shiftKey);
}}
role="button"
>
@@ -37,17 +38,19 @@ export const ConfigHandle = function ConfigHandle({
/>
{component.name}
-
- 
removeComponent({ id })}
- />
-
+ {!isMultipleComponentsSelected && (
+ removeComponent({ id })}
- />
-
+ removeComponent({ id })}
+ />
+
+ )}
removeComponent({ id })}
+ />
+
- {selectedComponent &&
+ {selectedComponents.length === 1 &&
!isEmpty(appDefinition.components) &&
- !isEmpty(appDefinition.components[selectedComponent.id]) ? (
+ !isEmpty(appDefinition.components[selectedComponents[0].id]) ? (
Please select a component to inspect
)}
)}
diff --git a/frontend/src/Editor/EditorKeyHooks.jsx b/frontend/src/Editor/EditorKeyHooks.jsx
new file mode 100644
index 0000000000..09ce9f3742
--- /dev/null
+++ b/frontend/src/Editor/EditorKeyHooks.jsx
@@ -0,0 +1,21 @@
+import React from 'react';
+import useKeyHooks from '@/_hooks/useKeyHooks';
+
+export const EditorKeyHooks = ({ moveComponents, handleEditorEscapeKeyPress, removeMultipleComponents }) => {
+ const handleHotKeysCallback = (key) => {
+ switch (key) {
+ case 'Escape':
+ handleEditorEscapeKeyPress();
+ break;
+ case 'Backspace':
+ removeMultipleComponents();
+ break;
+ default:
+ moveComponents(key);
+ }
+ };
+
+ useKeyHooks(['up, down, left, right', 'esc', 'backspace'], handleHotKeysCallback);
+
+ return <>;
+};
diff --git a/frontend/src/Editor/Inspector/Components/CustomComponent.jsx b/frontend/src/Editor/Inspector/Components/CustomComponent.jsx
new file mode 100644
index 0000000000..260d3b00d7
--- /dev/null
+++ b/frontend/src/Editor/Inspector/Components/CustomComponent.jsx
@@ -0,0 +1,81 @@
+import React from 'react';
+import { renderElement } from '../Utils';
+import { CodeHinter } from '../../CodeBuilder/CodeHinter';
+import Accordion from '@/_ui/Accordion';
+
+export const CustomComponent = function CustomComponent({
+ dataQueries,
+ component,
+ paramUpdated,
+ componentMeta,
+ components,
+ darkMode,
+ currentState,
+ layoutPropertyChanged,
+}) {
+ const code = component.component.definition.properties.code;
+ const args = component.component.definition.properties.data;
+
+ let items = [];
+
+ items.push({
+ title: 'Data',
+ children: (
+ Please select a component to inspect
+
+ Max height of canvas
+
+
+
+ {
+ const height = e.target.value;
+ if (!Number.isNaN(height) && height <= 2400) globalSettingsChanged('canvasMaxHeight', height);
+ }}
+ value={canvasMaxHeight}
+ />
+ px
+
+
Background color of canvas
diff --git a/frontend/src/Editor/ManageAppUsers.jsx b/frontend/src/Editor/ManageAppUsers.jsx
index afe9055894..0296b97bc1 100644
--- a/frontend/src/Editor/ManageAppUsers.jsx
+++ b/frontend/src/Editor/ManageAppUsers.jsx
@@ -306,7 +306,7 @@ class ManageAppUsers extends React.Component {
- Manage Organization Users
+ Manage Users
diff --git a/frontend/src/Editor/RealtimeAvatars.jsx b/frontend/src/Editor/RealtimeAvatars.jsx
index b23da766af..7f9687a01b 100644
--- a/frontend/src/Editor/RealtimeAvatars.jsx
+++ b/frontend/src/Editor/RealtimeAvatars.jsx
@@ -1,6 +1,5 @@
/* eslint-disable import/no-unresolved */
import React from 'react';
-import config from 'config';
import Avatar from '@/_ui/Avatar';
import { useOthers } from 'y-presence';
diff --git a/frontend/src/Editor/SubContainer.jsx b/frontend/src/Editor/SubContainer.jsx
index d98ea21f5f..78e4724ffc 100644
--- a/frontend/src/Editor/SubContainer.jsx
+++ b/frontend/src/Editor/SubContainer.jsx
@@ -7,6 +7,7 @@ import { snapToGrid as doSnapToGrid } from './snapToGrid';
import update from 'immutability-helper';
import { componentTypes } from './Components/components';
import { computeComponentName } from '@/_helpers/utils';
+import produce from 'immer';
export const SubContainer = ({
mode,
@@ -35,6 +36,7 @@ export const SubContainer = ({
listViewItemOptions,
onComponentHover,
hoveredComponent,
+ selectedComponents,
}) => {
const [_containerCanvasWidth, setContainerCanvasWidth] = useState(0);
@@ -251,9 +253,6 @@ export const SubContainer = ({
}
function onDragStop(e, componentId, direction, currentLayout) {
- const id = componentId ? componentId : uuidv4();
-
- // Get the width of the canvas
const canvasWidth = getContainerCanvasWidth();
const nodeBounds = direction.node.getBoundingClientRect();
@@ -261,25 +260,24 @@ export const SubContainer = ({
// Computing the left offset
const leftOffset = nodeBounds.x - canvasBounds.x;
- const left = convertXToPercentage(leftOffset, canvasWidth);
+ const currentLeftOffset = boxes[componentId].layouts[currentLayout].left;
+ const leftDiff = currentLeftOffset - convertXToPercentage(leftOffset, canvasWidth);
- // Computing the top offset
- const top = nodeBounds.y - canvasBounds.y;
+ const topDiff = boxes[componentId].layouts[currentLayout].top - (nodeBounds.y - canvasBounds.y);
- let newBoxes = {
- ...boxes,
- [id]: {
- ...boxes[id],
- layouts: {
- ...boxes[id]['layouts'],
- [currentLayout]: {
- ...boxes[id]['layouts'][currentLayout],
- top: top,
- left: left,
- },
- },
- },
- };
+ let newBoxes = { ...boxes };
+
+ if (selectedComponents) {
+ for (const selectedComponent of selectedComponents) {
+ newBoxes = produce(newBoxes, (draft) => {
+ const topOffset = draft[selectedComponent.id].layouts[currentLayout].top;
+ const leftOffset = draft[selectedComponent.id].layouts[currentLayout].left;
+
+ draft[selectedComponent.id].layouts[currentLayout].top = topOffset - topDiff;
+ draft[selectedComponent.id].layouts[currentLayout].left = leftOffset - leftDiff;
+ });
+ }
+ }
setBoxes(newBoxes);
}
@@ -418,7 +416,7 @@ export const SubContainer = ({
currentLayout={currentLayout}
selectedComponent={selectedComponent}
deviceWindowWidth={deviceWindowWidth}
- isSelectedComponent={selectedComponent ? selectedComponent.id === key : false}
+ isSelectedComponent={mode === 'edit' ? selectedComponents.find((component) => component.id === key) : false}
removeComponent={customRemoveComponent}
canvasWidth={_containerCanvasWidth}
readOnly={readOnly}
@@ -427,6 +425,7 @@ export const SubContainer = ({
onComponentHover={onComponentHover}
hoveredComponent={hoveredComponent}
parentId={parentComponent?.name}
+ isMultipleComponentsSelected={selectedComponents?.length > 1 ? true : false}
containerProps={{
mode,
snapToGrid,
diff --git a/frontend/src/Editor/Viewer.jsx b/frontend/src/Editor/Viewer.jsx
index 99ba2323fd..404b06c605 100644
--- a/frontend/src/Editor/Viewer.jsx
+++ b/frontend/src/Editor/Viewer.jsx
@@ -103,6 +103,7 @@ class Viewer extends React.Component {
urlparams: JSON.parse(JSON.stringify(queryString.parse(this.props.location.search))),
},
},
+ dataQueries: data.data_queries,
},
() => {
computeComponentState(this, data?.definition?.components).then(() => {
@@ -185,6 +186,7 @@ class Viewer extends React.Component {
deviceWindowWidth,
defaultComponentStateComputed,
canvasWidth,
+ dataQueries,
} = this.state;
if (this.state.app?.is_maintenance_on) {
@@ -232,7 +234,9 @@ class Viewer extends React.Component {
className="canvas-area"
style={{
width: canvasWidth,
+ minHeight: +appDefinition.globalSettings?.canvasMaxHeight || 2400,
maxWidth: +appDefinition.globalSettings?.canvasMaxWidth || 1292,
+ maxHeight: +appDefinition.globalSettings?.canvasMaxHeight || 2400,
backgroundColor: appDefinition.globalSettings?.canvasBackgroundColor || '#edeff5',
}}
>
@@ -270,6 +274,7 @@ class Viewer extends React.Component {
onComponentOptionsChanged(this, component, options)
}
canvasWidth={this.getCanvasWidth()}
+ dataQueries={dataQueries}
/>
)}
diff --git a/frontend/src/LoginPage/LoginPage.jsx b/frontend/src/LoginPage/LoginPage.jsx
index f422826887..89d581085d 100644
--- a/frontend/src/LoginPage/LoginPage.jsx
+++ b/frontend/src/LoginPage/LoginPage.jsx
@@ -16,7 +16,7 @@ class LoginPage extends React.Component {
isGettingConfigs: true,
configs: undefined,
};
- this.single_organization = window.public_config?.MULTI_ORGANIZATION !== 'true';
+ this.single_organization = window.public_config?.DISABLE_MULTI_WORKSPACE === 'true';
}
componentDidMount() {
@@ -132,7 +132,7 @@ class LoginPage extends React.Component {
this.showLoading()
) : (
- {!configs &&
{!isSingleOrganization && (
No login methods enabled for this organization
}
+ {!configs && No login methods enabled for this workspace
}
{configs?.form?.enabled && (
diff --git a/frontend/src/ManageSSO/Google.jsx b/frontend/src/ManageSSO/Google.jsx index 5c49075383..025b3b3725 100644 --- a/frontend/src/ManageSSO/Google.jsx +++ b/frontend/src/ManageSSO/Google.jsx @@ -77,7 +77,7 @@ export function Google({ settings, updateData }) { setClientId(e.target.value)} /> diff --git a/frontend/src/_components/Organization.jsx b/frontend/src/_components/Organization.jsx index 9b65d3f4a9..8f2d1aa138 100644 --- a/frontend/src/_components/Organization.jsx +++ b/frontend/src/_components/Organization.jsx @@ -6,7 +6,7 @@ import { toast } from 'react-hot-toast'; import { SearchBox } from './SearchBox'; export const Organization = function Organization() { - const isSingleOrganization = window.public_config?.MULTI_ORGANIZATION !== 'true'; + const isSingleOrganization = window.public_config?.DISABLE_MULTI_WORKSPACE === 'true'; const { admin, organization_id } = authenticationService.currentUserValue; const [organization, setOrganization] = useState(authenticationService.currentUserValue?.organization); const [showCreateOrg, setShowCreateOrg] = useState(false); @@ -21,11 +21,13 @@ export const Organization = function Organization() { const getAvatar = (organization) => { if (!organization) return; - const orgName = organization.split(' '); + const orgName = organization.split(' ').filter((e) => e && !!e.trim()); if (orgName.length > 1) { return `${orgName[0]?.[0]}${orgName[1]?.[0]}`; - } else { + } else if (organization.length >= 2) { return `${organization[0]}${organization[1]}`; + } else { + return `${organization[0]}${organization[0]}`; } }; @@ -58,7 +60,7 @@ export const Organization = function Organization() { const createOrganization = () => { if (!(newOrgName && newOrgName.trim())) { - toast.error("organization name can't be empty.", { + toast.error('Workspace name can not be empty.', { position: 'top-center', }); return; @@ -66,21 +68,22 @@ export const Organization = function Organization() { setIsCreating(true); organizationService.createOrganization(newOrgName).then( (data) => { + setIsCreating(false); authenticationService.updateCurrentUserDetails(data); window.location.href = '/'; }, () => { - toast.error('Error while creating organization', { + setIsCreating(false); + toast.error('Error while creating workspace', { position: 'top-center', }); } ); - setIsCreating(false); }; const editOrganization = () => { if (!(newOrgName && newOrgName.trim())) { - toast.error("organization name can't be empty.", { + toast.error('Workspace name can not be empty.', { position: 'top-center', }); return; @@ -89,13 +92,13 @@ export const Organization = function Organization() { organizationService.editOrganization({ name: newOrgName }).then( () => { authenticationService.updateCurrentUserDetails({ organization: newOrgName }); - toast.success('Organization updated', { + toast.success('Workspace updated', { position: 'top-center', }); setOrganization(newOrgName); }, () => { - toast.error('Error while editing organization', { + toast.error('Error while editing workspace', { position: 'top-center', }); } @@ -258,7 +261,7 @@ export const Organization = function Organization() {
-
)}
{admin && (
@@ -281,8 +284,12 @@ export const Organization = function Organization() {
return (
Add Organizations
+ Add workspace
- setShowCreateOrg(false)} title="Create organization">
+ setShowCreateOrg(false)} title="Create workspace">
- setShowEditOrg(false)} title="Edit organization">
+ setShowEditOrg(false)} title="Edit workspace">
setIsListOrganizations(false)}>
-
+
-
+ setIsListOrganizations(false)}
+ >
)}
{organization}
{(!isSingleOrganization || admin) && (
@@ -291,14 +298,14 @@ export const Organization = function Organization() {
setNewOrgName(e.target.value)}
className="form-control"
- placeholder="organization name"
+ placeholder="workspace name"
disabled={isCreating}
maxLength={25}
/>
@@ -314,19 +321,19 @@ export const Organization = function Organization() {
className={`btn btn-primary ${isCreating ? 'btn-loading' : ''}`}
onClick={createOrganization}
>
- Create organization
+ Create workspace
setNewOrgName(e.target.value)}
className="form-control"
- placeholder="organization name"
+ placeholder="workspace name"
disabled={isCreating}
value={newOrgName}
maxLength={25}
diff --git a/frontend/src/_helpers/appUtils.js b/frontend/src/_helpers/appUtils.js
index 372fce26fa..a6dca62333 100644
--- a/frontend/src/_helpers/appUtils.js
+++ b/frontend/src/_helpers/appUtils.js
@@ -323,6 +323,26 @@ export async function onEvent(_ref, eventName, options, mode = 'edit') {
const { customVariables } = options;
+ if (eventName === 'onTrigger') {
+ const { component, queryId, queryName } = options;
+ _self.setState(
+ {
+ currentState: {
+ ..._self.state.currentState,
+ components: {
+ ..._self.state.currentState.components,
+ [component.name]: {
+ ..._self.state.currentState.components[component.name],
+ },
+ },
+ },
+ },
+ () => {
+ runQuery(_ref, queryId, queryName, true, mode);
+ }
+ );
+ }
+
if (eventName === 'onRowClicked') {
const { component, data, rowId } = options;
_self.setState(
diff --git a/frontend/src/_hooks/useKeyHooks.js b/frontend/src/_hooks/useKeyHooks.js
new file mode 100644
index 0000000000..4344adf59b
--- /dev/null
+++ b/frontend/src/_hooks/useKeyHooks.js
@@ -0,0 +1,9 @@
+import { useHotkeys } from 'react-hotkeys-hook';
+
+const useKeyHooks = (hotkeys = [], callback) =>
+ useHotkeys(hotkeys.toString(), (e) => {
+ e.preventDefault();
+ callback(e.code);
+ });
+
+export default useKeyHooks;
diff --git a/frontend/src/_styles/theme.scss b/frontend/src/_styles/theme.scss
index c0e2b1e233..238bc438f4 100644
--- a/frontend/src/_styles/theme.scss
+++ b/frontend/src/_styles/theme.scss
@@ -114,7 +114,7 @@ button {
.editor {
.header-container {
max-width: 100%;
- padding: 0 15px;
+ padding: 0 10px;
}
.resizer-active {
@@ -262,7 +262,7 @@ button {
height: 100%;
width: 76px;
position: fixed;
- z-index: 1;
+ z-index: 2;
left: 0;
overflow-x: hidden;
flex: 1 1 auto;
@@ -3971,7 +3971,7 @@ input[type="text"] {
}
.app-name {
- width: 325px;
+ width: 250px;
left: 150px;
position: absolute;
}
@@ -4010,7 +4010,7 @@ input[type="text"] {
}
.app-version-menu .dropdown-menu {
- left: -90px;
+ left: -65px;
width: 283px;
}
@@ -4021,7 +4021,7 @@ input[type="text"] {
.app-version-menu .released-subtext {
font-size: 12px;
color: #36af8b;
- padding: 0;
+ padding: 0 8px;
}
.app-version-menu .create-link {
@@ -5080,8 +5080,9 @@ div#driver-page-overlay {
.realtime-avatars {
position: absolute;
- left: 35%;
+ left: 50%;
}
+
.widget-style-field-header{
font-family: 'Inter';
font-style: normal;
@@ -5114,4 +5115,69 @@ div#driver-page-overlay {
padding: 5px;
display: flex;
justify-content: end;
-}
\ No newline at end of file
+}
+
+.autosave-indicator {
+ position: absolute;
+ left: 30%;
+ color: #868aa5;
+ white-space: nowrap;
+ font-weight: 400;
+ font-size: 12px;
+ letter-spacing: 0.5px;
+}
+
+.autosave-indicator-saving {
+ left: 34.5%;
+}
+.pdf-page-controls {
+ position: fixed;
+ bottom: 20px;
+ left: 50%;
+ background: white;
+ opacity: 0;
+ transform: translateX(-50%);
+ transition: opacity ease-in-out 0.2s;
+ border-radius: 4px;
+ box-shadow: 0 30px 40px 0 rgba(16, 36, 94, 0.2);
+
+ button {
+ width: 36px;
+ height: 36px;
+ background: white;
+ border: 0;
+ font-size: 1.2em;
+ border-radius: 4px;
+
+ &:first-child {
+ border-top-right-radius: 0;
+ border-bottom-right-radius: 0;
+ }
+
+ &:last-child {
+ border-top-left-radius: 0;
+ border-bottom-left-radius: 0;
+ }
+
+ &:hover {
+ background-color: #e6e6e6;
+ }
+ }
+
+ span {
+ font-family: inherit;
+ font-size: 1em;
+ padding: 0 0.5em;
+ color: #000;
+ }
+}
+.pdf-document{
+ canvas{
+ margin: 0px auto;
+ }
+ &:hover {
+ .pdf-page-controls {
+ opacity: 1;
+ }
+ }
+}
diff --git a/frontend/src/_ui/Avatar/index.jsx b/frontend/src/_ui/Avatar/index.jsx
index a2fdbe0205..a66b22c608 100644
--- a/frontend/src/_ui/Avatar/index.jsx
+++ b/frontend/src/_ui/Avatar/index.jsx
@@ -4,7 +4,7 @@ const Avatar = ({ text, title = '', borderColor = '' }) => {
return (
{text}
diff --git a/frontend/src/_ui/JSONTreeViewer/JSONNode.jsx b/frontend/src/_ui/JSONTreeViewer/JSONNode.jsx
index 97f348e6cd..99223424ab 100644
--- a/frontend/src/_ui/JSONTreeViewer/JSONNode.jsx
+++ b/frontend/src/_ui/JSONTreeViewer/JSONNode.jsx
@@ -327,10 +327,10 @@ export const JSONNode = ({ data, ...restProps }) => {
updateHoveredNode(currentNode, currentNodePath)}
+ onMouseLeave={() => updateHoveredNode(null)}
>
updateHoveredNode(currentNode, currentNodePath)}
- onMouseLeave={() => updateHoveredNode(null)}
className={cx('d-flex', {
'group-object-container': shouldDisplayIntendedBlock,
'mx-2': typeofCurrentNode !== 'Object' && typeofCurrentNode !== 'Array',
diff --git a/frontend/src/_ui/JSONTreeViewer/JSONNodeValue.jsx b/frontend/src/_ui/JSONTreeViewer/JSONNodeValue.jsx
index 1596a50d83..f58ba2b2db 100644
--- a/frontend/src/_ui/JSONTreeViewer/JSONNodeValue.jsx
+++ b/frontend/src/_ui/JSONTreeViewer/JSONNodeValue.jsx
@@ -15,7 +15,11 @@ const JSONTreeValueNode = ({ data, type }) => {
);
}
- const value = type === 'String' ? `"${data}"` : String(data);
+ let value = type === 'String' ? `"${data}"` : String(data);
+ if (value.length > 65) {
+ value = `${value.substring(0, 65)} ... "`;
+ }
+
const clsForUndefinedOrNull = (type === 'Undefined' || type === 'Null') && 'badge badge-secondary';
return (
(
-
+const Spinner = ({ size = 'large', ...props }) => (
+
);
export default Spinner;
diff --git a/frontend/webpack.config.js b/frontend/webpack.config.js
index b5b9c8f36f..af147056c5 100644
--- a/frontend/webpack.config.js
+++ b/frontend/webpack.config.js
@@ -82,6 +82,10 @@ module.exports = {
},
},
},
+ {
+ test: /\.html$/,
+ loader: 'html-loader',
+ },
],
},
plugins: [
diff --git a/netlify.toml b/netlify.toml
index 1a7526debd..af5a71133d 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -1,9 +1,12 @@
[build]
- base = "frontend/"
- publish = "build/"
+ base = "/"
+ publish = "frontend/build/"
+ command = "npm run build:plugins && npm run build:frontend"
[template.environment]
NODE_ENV = "production"
+ NODE_VERSION = "14.17.3"
+ NPM_VERSION = "7.20.0"
[[redirects]]
from = "/*"
diff --git a/plugins/package-lock.json b/plugins/package-lock.json
index 1571570ce3..c55a7d310a 100644
--- a/plugins/package-lock.json
+++ b/plugins/package-lock.json
@@ -16818,6 +16818,7 @@
}
},
"packages/notion": {
+ "name": "@tooljet-plugins/notion",
"version": "1.0.0",
"dependencies": {
"@notionhq/client": "^1.0.4",
diff --git a/plugins/packages/googlesheets/lib/index.ts b/plugins/packages/googlesheets/lib/index.ts
index 195739acd1..1076c7ab45 100644
--- a/plugins/packages/googlesheets/lib/index.ts
+++ b/plugins/packages/googlesheets/lib/index.ts
@@ -130,7 +130,7 @@ export default class GooglesheetsQueryService implements QueryService {
} catch (error) {
console.log(error.response);
- if (error.response.statusCode === 401) {
+ if (error?.response?.statusCode === 401) {
throw new OAuthUnauthorizedClientError('Query could not be completed', error.message, { ...error });
}
throw new QueryError('Query could not be completed', error.message, {});
diff --git a/server/ee/services/oauth/oauth.service.ts b/server/ee/services/oauth/oauth.service.ts
index 969da0625b..e39d262629 100644
--- a/server/ee/services/oauth/oauth.service.ts
+++ b/server/ee/services/oauth/oauth.service.ts
@@ -63,12 +63,12 @@ export class OauthService {
async #findAndActivateUser(email: string, organizationId: string): Promise {
const user = await this.usersService.findByEmail(email, organizationId);
if (!user) {
- throw new UnauthorizedException('User not exist in the organization');
+ throw new UnauthorizedException('User not exist in the workspace');
}
const organizationUser: OrganizationUser = user.organizationUsers?.[0];
if (!organizationUser) {
- throw new UnauthorizedException('User not exist in the organization');
+ throw new UnauthorizedException('User not exist in the workspace');
}
if (organizationUser.status != 'active') await this.organizationUsersService.activate(organizationUser);
return user;
diff --git a/server/migrations/1650485473528-PopulateSSOConfigs.ts b/server/migrations/1650485473528-PopulateSSOConfigs.ts
index d22725d66d..fa35d95b6c 100644
--- a/server/migrations/1650485473528-PopulateSSOConfigs.ts
+++ b/server/migrations/1650485473528-PopulateSSOConfigs.ts
@@ -9,7 +9,7 @@ export class PopulateSSOConfigs1650485473528 implements MigrationInterface {
const encryptionService = new EncryptionService();
const OrganizationRepository = entityManager.getRepository(Organization);
- const isSingleOrganization = process.env.MULTI_ORGANIZATION !== 'true';
+ const isSingleOrganization = process.env.DISABLE_MULTI_WORKSPACE === 'true';
const enableSignUp = process.env.SSO_DISABLE_SIGNUP !== 'true';
const domain = process.env.SSO_RESTRICTED_DOMAIN;
diff --git a/server/migrations/1651820577708-PopulateTextSize.ts b/server/migrations/1651820577708-PopulateTextSize.ts
new file mode 100644
index 0000000000..224897b72c
--- /dev/null
+++ b/server/migrations/1651820577708-PopulateTextSize.ts
@@ -0,0 +1,41 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+import { AppVersion } from '../src/entities/app_version.entity';
+
+export class PopulateTextSize1651820577708 implements MigrationInterface {
+ public async up(queryRunner: QueryRunner): Promise {
+ const entityManager = queryRunner.manager;
+ const appVersions = await entityManager.find(AppVersion);
+
+ for (const version of appVersions) {
+ const definition = version['definition'];
+
+ if (definition) {
+ const components = definition['components'];
+
+ for (const componentId of Object.keys(components)) {
+ const component = components[componentId];
+
+ if (component.component.component === 'Text') {
+ component.component.definition.styles.textSize = { value: 14 };
+ components[componentId] = {
+ ...component,
+ component: {
+ ...component.component,
+ definition: {
+ ...component.component.definition,
+ },
+ },
+ };
+ }
+ }
+
+ definition['components'] = components;
+ version.definition = definition;
+
+ await entityManager.update(AppVersion, { id: version.id }, { definition });
+ }
+ }
+ }
+
+ public async down(queryRunner: QueryRunner): Promise {}
+}
diff --git a/server/src/controllers/organizations.controller.ts b/server/src/controllers/organizations.controller.ts
index ef560507ae..2996810297 100644
--- a/server/src/controllers/organizations.controller.ts
+++ b/server/src/controllers/organizations.controller.ts
@@ -49,7 +49,7 @@ export class OrganizationsController {
@Get(['/:organizationId/public-configs', '/public-configs'])
async getOrganizationDetails(@Param('organizationId') organizationId: string) {
- if (!organizationId && this.configService.get('MULTI_ORGANIZATION') !== 'true') {
+ if (!organizationId && this.configService.get('DISABLE_MULTI_WORKSPACE') === 'true') {
// Request from single organization login page - find one from organization and setting
organizationId = (await this.organizationsService.getSingleOrganization()).id;
}
diff --git a/server/src/main.ts b/server/src/main.ts
index e902fa503c..60878170ec 100644
--- a/server/src/main.ts
+++ b/server/src/main.ts
@@ -40,6 +40,10 @@ async function bootstrap() {
"'unsafe-inline'",
"'unsafe-eval'",
'blob:',
+ 'https://unpkg.com/@babel/standalone@7.17.9/babel.min.js',
+ 'https://unpkg.com/react@16.7.0/umd/react.production.min.js',
+ 'https://unpkg.com/react-dom@16.7.0/umd/react-dom.production.min.js',
+ 'cdn.skypack.dev',
],
'default-src': [
'maps.googleapis.com',
diff --git a/server/src/modules/auth/multi-organization.guard.ts b/server/src/modules/auth/multi-organization.guard.ts
index ef84dbefd4..f2797b7e25 100644
--- a/server/src/modules/auth/multi-organization.guard.ts
+++ b/server/src/modules/auth/multi-organization.guard.ts
@@ -7,6 +7,6 @@ export class MultiOrganizationGuard implements CanActivate {
constructor(private configService: ConfigService) {}
canActivate(context: ExecutionContext): boolean | Promise | Observable {
- return this.configService.get('MULTI_ORGANIZATION') === 'true';
+ return this.configService.get('DISABLE_MULTI_WORKSPACE') !== 'true';
}
}
diff --git a/server/src/services/app_config.service.ts b/server/src/services/app_config.service.ts
index 066c7b43e2..52fa315d4f 100644
--- a/server/src/services/app_config.service.ts
+++ b/server/src/services/app_config.service.ts
@@ -23,7 +23,7 @@ export class AppConfigService {
'SENTRY_DNS',
'SENTRY_DEBUG',
'DISABLE_SIGNUPS',
- 'MULTI_ORGANIZATION',
+ 'DISABLE_MULTI_WORKSPACE',
];
}
diff --git a/server/src/services/auth.service.ts b/server/src/services/auth.service.ts
index 61653c45b3..92a7a6ed22 100644
--- a/server/src/services/auth.service.ts
+++ b/server/src/services/auth.service.ts
@@ -51,7 +51,7 @@ export class AuthService {
if (!organizationId) {
// Global login
// Determine the organization to be loaded
- if (this.configService.get('MULTI_ORGANIZATION') !== 'true') {
+ if (this.configService.get('DISABLE_MULTI_WORKSPACE') === 'true') {
// Single organization
organization = await this.organizationsService.getSingleOrganization();
if (!organization?.ssoConfigs?.find((oc) => oc.sso == 'form' && oc.enabled)) {
@@ -72,7 +72,7 @@ export class AuthService {
organization = organizationList[0];
} else {
// no form login enabled organization available for user - creating new one
- organization = await this.organizationsService.create('Untitled organization', user);
+ organization = await this.organizationsService.create('Untitled workspace', user);
}
}
user.organizationId = organization.id;
@@ -122,7 +122,7 @@ export class AuthService {
if (!(isNewOrganization || user.isPasswordLogin)) {
throw new UnauthorizedException();
}
- if (this.configService.get('MULTI_ORGANIZATION') !== 'true') {
+ if (this.configService.get('DISABLE_MULTI_WORKSPACE') === 'true') {
throw new UnauthorizedException();
}
const newUser = await this.usersService.findByEmail(user.email, newOrganizationId);
@@ -174,7 +174,7 @@ export class AuthService {
let organization: Organization;
// Check if the configs allows user signups
- if (this.configService.get('MULTI_ORGANIZATION') !== 'true') {
+ if (this.configService.get('DISABLE_MULTI_WORKSPACE') === 'true') {
// Single organization checking if organization exist
organization = await this.organizationsService.getSingleOrganization();
@@ -188,7 +188,7 @@ export class AuthService {
}
}
// Create default organization
- organization = await this.organizationsService.create('Untitled organization');
+ organization = await this.organizationsService.create('Untitled workspace');
const user = await this.usersService.create({ email }, organization.id, ['all_users', 'admin'], existingUser, true);
await this.organizationUsersService.create(user, organization, true);
await this.emailService.sendWelcomeEmail(user.email, user.firstName, user.invitationToken);
diff --git a/server/src/services/email.service.ts b/server/src/services/email.service.ts
index 5a0a6dfd05..e6f90229d0 100644
--- a/server/src/services/email.service.ts
+++ b/server/src/services/email.service.ts
@@ -100,7 +100,7 @@ export class EmailService {
- ${sender} has invited you to use ToolJet organisation ${organisationName}. Use the link below to set up your account and get started. + ${sender} has invited you to use ToolJet workspace ${organisationName}. Use the link below to set up your account and get started.
${inviteUrl} diff --git a/server/src/services/seeds.service.ts b/server/src/services/seeds.service.ts index fe8599e721..e4938c596f 100644 --- a/server/src/services/seeds.service.ts +++ b/server/src/services/seeds.service.ts @@ -30,7 +30,7 @@ export class SeedsService { sso: 'form', }, ], - name: 'My organization', + name: 'My workspace', }); await manager.save(organization); diff --git a/server/test/controllers/app.e2e-spec.ts b/server/test/controllers/app.e2e-spec.ts index 74f9fa4f75..a712fcb4eb 100644 --- a/server/test/controllers/app.e2e-spec.ts +++ b/server/test/controllers/app.e2e-spec.ts @@ -38,6 +38,18 @@ describe('Authentication', () => { }); describe('Single organization', () => { + beforeEach(async () => { + jest.spyOn(mockConfig, 'get').mockImplementation((key: string) => { + switch (key) { + case 'DISABLE_SIGNUPS': + return 'false'; + case 'DISABLE_MULTI_WORKSPACE': + return 'true'; + default: + return process.env[key]; + } + }); + }); it('should create new users and organization', async () => { const response = await request(app.getHttpServer()).post('/api/signup').send({ email: 'test@tooljet.io' }); expect(response.statusCode).toBe(201); @@ -52,7 +64,7 @@ describe('Authentication', () => { }); expect(user.defaultOrganizationId).toBe(user?.organizationUsers?.[0]?.organizationId); - expect(organization.name).toBe('Untitled organization'); + expect(organization.name).toBe('Untitled workspace'); const groupPermissions = await user.groupPermissions; const groupNames = groupPermissions.map((x) => x.group); @@ -142,8 +154,6 @@ describe('Authentication', () => { switch (key) { case 'DISABLE_SIGNUPS': return 'false'; - case 'MULTI_ORGANIZATION': - return 'true'; default: return process.env[key]; } @@ -155,8 +165,6 @@ describe('Authentication', () => { switch (key) { case 'DISABLE_SIGNUPS': return 'true'; - case 'MULTI_ORGANIZATION': - return 'true'; default: return process.env[key]; } @@ -182,7 +190,7 @@ describe('Authentication', () => { }); expect(user.defaultOrganizationId).toBe(user?.organizationUsers?.[0]?.organizationId); - expect(organization?.name).toBe('Untitled organization'); + expect(organization?.name).toBe('Untitled workspace'); const groupPermissions = await user.groupPermissions; const groupNames = groupPermissions.map((x) => x.group); @@ -255,7 +263,7 @@ describe('Authentication', () => { .send({ email: 'admin@tooljet.io', password: 'password' }); expect(response.statusCode).toBe(201); expect(response.body.organization_id).not.toBe(current_organization.id); - expect(response.body.organization).toBe('Untitled organization'); + expect(response.body.organization).toBe('Untitled workspace'); }); it('should be able to switch between organizations with admin privilage', async () => { const { organization: invited_organization } = await createUser( diff --git a/server/test/controllers/oauth.e2e-spec.ts b/server/test/controllers/oauth.e2e-spec.ts index 1d043ee4d0..5ea15f6438 100644 --- a/server/test/controllers/oauth.e2e-spec.ts +++ b/server/test/controllers/oauth.e2e-spec.ts @@ -19,13 +19,6 @@ describe('oauth controller', () => { beforeEach(async () => { await clearDB(); - jest.spyOn(mockConfig, 'get').mockImplementation((key: string) => { - if (key === 'MULTI_ORGANIZATION') { - return 'false'; - } else { - return process.env[key]; - } - }); }); beforeAll(async () => { @@ -57,917 +50,1844 @@ describe('oauth controller', () => { current_organization = organization; }); - describe('sign in via Google OAuth', () => { - let sso_configs; - const token = 'some-Token'; - beforeEach(() => { - sso_configs = current_organization.ssoConfigs.find((conf) => conf.sso === 'google'); - }); - it('should return 401 if google sign in is disabled', async () => { - await ssoConfigsRepository.update(sso_configs.id, { enabled: false }); - await request(app.getHttpServer()) - .post('/api/oauth/sign-in/' + sso_configs.id) - .send({ token }) - .expect(401); - }); - - it('should return 401 when the user does not exist and sign up is disabled', async () => { - await orgRepository.update(current_organization.id, { enableSignUp: false }); - const googleVerifyMock = jest.spyOn(OAuth2Client.prototype, 'verifyIdToken'); - googleVerifyMock.mockImplementation(() => ({ - getPayload: () => ({ - sub: 'someSSOId', - email: 'ssoUser@tooljet.io', - name: 'SSO User', - hd: 'tooljet.io', - }), - })); - await request(app.getHttpServer()) - .post('/api/oauth/sign-in/' + sso_configs.id) - .send({ token }) - .expect(401); - }); - - it('should return 401 when the user does not exist domain mismatch', async () => { - await orgRepository.update(current_organization.id, { domain: 'tooljet.io,tooljet.com' }); - const googleVerifyMock = jest.spyOn(OAuth2Client.prototype, 'verifyIdToken'); - googleVerifyMock.mockImplementation(() => ({ - getPayload: () => ({ - sub: 'someSSOId', - email: 'ssoUser@tooljett.io', - name: 'SSO User', - hd: 'tooljet.io', - }), - })); - await request(app.getHttpServer()) - .post('/api/oauth/sign-in/' + sso_configs.id) - .send({ token }) - .expect(401); - }); - - it('should return login info when the user does not exist and domain matches and sign up is enabled', async () => { - await orgRepository.update(current_organization.id, { domain: 'tooljet.io,tooljet.com' }); - const googleVerifyMock = jest.spyOn(OAuth2Client.prototype, 'verifyIdToken'); - googleVerifyMock.mockImplementation(() => ({ - getPayload: () => ({ - sub: 'someSSOId', - email: 'ssoUser@tooljet.io', - name: 'SSO User', - hd: 'tooljet.io', - }), - })); - - const response = await request(app.getHttpServer()) - .post('/api/oauth/sign-in/' + sso_configs.id) - .send({ token }); - - expect(googleVerifyMock).toHaveBeenCalledWith({ - idToken: token, - audience: sso_configs.configs.clientId, + describe('Multi-Workspace', () => { + describe('sign in via Google OAuth', () => { + let sso_configs; + const token = 'some-Token'; + beforeEach(() => { + sso_configs = current_organization.ssoConfigs.find((conf) => conf.sso === 'google'); + }); + it('should return 401 if google sign in is disabled', async () => { + await ssoConfigsRepository.update(sso_configs.id, { enabled: false }); + await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }) + .expect(401); }); - expect(response.statusCode).toBe(201); - expect(Object.keys(response.body).sort()).toEqual( - [ - 'id', - 'email', - 'first_name', - 'last_name', - 'auth_token', - 'admin', - 'organization_id', - 'organization', - 'group_permissions', - 'app_group_permissions', - ].sort() - ); - - const { - email, - first_name, - last_name, - admin, - group_permissions, - app_group_permissions, - organization_id, - organization, - } = response.body; - - expect(email).toEqual('ssoUser@tooljet.io'); - expect(first_name).toEqual('SSO'); - expect(last_name).toEqual('User'); - expect(admin).toBeFalsy(); - expect(organization_id).toBe(current_organization.id); - expect(organization).toBe(current_organization.name); - expect(group_permissions).toHaveLength(1); - expect(group_permissions[0].group).toEqual('all_users'); - expect(Object.keys(group_permissions[0]).sort()).toEqual( - [ - 'id', - 'organization_id', - 'group', - 'app_create', - 'app_delete', - 'updated_at', - 'created_at', - 'folder_create', - ].sort() - ); - expect(app_group_permissions).toHaveLength(0); - }); - - it('should return login info when the user does not exist and sign up is enabled', async () => { - const googleVerifyMock = jest.spyOn(OAuth2Client.prototype, 'verifyIdToken'); - googleVerifyMock.mockImplementation(() => ({ - getPayload: () => ({ - sub: 'someSSOId', - email: 'ssoUser@tooljet.io', - name: 'SSO User', - hd: 'tooljet.io', - }), - })); - - const response = await request(app.getHttpServer()) - .post('/api/oauth/sign-in/' + sso_configs.id) - .send({ token }); - - expect(googleVerifyMock).toHaveBeenCalledWith({ - idToken: token, - audience: sso_configs.configs.clientId, + it('should return 401 when the user does not exist and sign up is disabled', async () => { + await orgRepository.update(current_organization.id, { enableSignUp: false }); + const googleVerifyMock = jest.spyOn(OAuth2Client.prototype, 'verifyIdToken'); + googleVerifyMock.mockImplementation(() => ({ + getPayload: () => ({ + sub: 'someSSOId', + email: 'ssoUser@tooljet.io', + name: 'SSO User', + hd: 'tooljet.io', + }), + })); + await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }) + .expect(401); }); - expect(response.statusCode).toBe(201); - expect(Object.keys(response.body).sort()).toEqual( - [ - 'id', - 'email', - 'first_name', - 'last_name', - 'auth_token', - 'admin', - 'organization_id', - 'organization', - 'group_permissions', - 'app_group_permissions', - ].sort() - ); - - const { - email, - first_name, - last_name, - admin, - group_permissions, - app_group_permissions, - organization_id, - organization, - } = response.body; - - expect(email).toEqual('ssoUser@tooljet.io'); - expect(first_name).toEqual('SSO'); - expect(last_name).toEqual('User'); - expect(admin).toBeFalsy(); - expect(organization_id).toBe(current_organization.id); - expect(organization).toBe(current_organization.name); - expect(group_permissions).toHaveLength(1); - expect(group_permissions[0].group).toEqual('all_users'); - expect(Object.keys(group_permissions[0]).sort()).toEqual( - [ - 'id', - 'organization_id', - 'group', - 'app_create', - 'app_delete', - 'updated_at', - 'created_at', - 'folder_create', - ].sort() - ); - expect(app_group_permissions).toHaveLength(0); - }); - it('should return login info when the user does not exist and name not available and sign up is enabled', async () => { - const googleVerifyMock = jest.spyOn(OAuth2Client.prototype, 'verifyIdToken'); - googleVerifyMock.mockImplementation(() => ({ - getPayload: () => ({ - sub: 'someSSOId', - email: 'ssoUser@tooljet.io', - name: '', - hd: 'tooljet.io', - }), - })); - - const response = await request(app.getHttpServer()) - .post('/api/oauth/sign-in/' + sso_configs.id) - .send({ token }); - - expect(googleVerifyMock).toHaveBeenCalledWith({ - idToken: token, - audience: sso_configs.configs.clientId, + it('should return 401 when the user does not exist domain mismatch', async () => { + await orgRepository.update(current_organization.id, { domain: 'tooljet.io,tooljet.com' }); + const googleVerifyMock = jest.spyOn(OAuth2Client.prototype, 'verifyIdToken'); + googleVerifyMock.mockImplementation(() => ({ + getPayload: () => ({ + sub: 'someSSOId', + email: 'ssoUser@tooljett.io', + name: 'SSO User', + hd: 'tooljet.io', + }), + })); + await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }) + .expect(401); }); - expect(response.statusCode).toBe(201); - expect(Object.keys(response.body).sort()).toEqual( - [ - 'id', - 'email', - 'first_name', - 'last_name', - 'auth_token', - 'admin', - 'organization_id', - 'organization', - 'group_permissions', - 'app_group_permissions', - ].sort() - ); + it('should return login info when the user does not exist and domain matches and sign up is enabled', async () => { + await orgRepository.update(current_organization.id, { domain: 'tooljet.io,tooljet.com' }); + const googleVerifyMock = jest.spyOn(OAuth2Client.prototype, 'verifyIdToken'); + googleVerifyMock.mockImplementation(() => ({ + getPayload: () => ({ + sub: 'someSSOId', + email: 'ssoUser@tooljet.io', + name: 'SSO User', + hd: 'tooljet.io', + }), + })); - const { email, first_name, admin, group_permissions, app_group_permissions, organization_id, organization } = - response.body; + const response = await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }); - expect(email).toEqual('ssoUser@tooljet.io'); - expect(first_name).toEqual('ssoUser'); - expect(admin).toBeFalsy(); - expect(organization_id).toBe(current_organization.id); - expect(organization).toBe(current_organization.name); - expect(group_permissions).toHaveLength(1); - expect(group_permissions[0].group).toEqual('all_users'); - expect(Object.keys(group_permissions[0]).sort()).toEqual( - [ - 'id', - 'organization_id', - 'group', - 'app_create', - 'app_delete', - 'updated_at', - 'created_at', - 'folder_create', - ].sort() - ); - expect(app_group_permissions).toHaveLength(0); - }); - it('should return login info when the user exist', async () => { - await createUser(app, { - firstName: 'SSO', - lastName: 'userExist', - email: 'anotherUser1@tooljet.io', - groups: ['all_users'], - organization: current_organization, - status: 'active', + expect(googleVerifyMock).toHaveBeenCalledWith({ + idToken: token, + audience: sso_configs.configs.clientId, + }); + + expect(response.statusCode).toBe(201); + expect(Object.keys(response.body).sort()).toEqual( + [ + 'id', + 'email', + 'first_name', + 'last_name', + 'auth_token', + 'admin', + 'organization_id', + 'organization', + 'group_permissions', + 'app_group_permissions', + ].sort() + ); + + const { + email, + first_name, + last_name, + admin, + group_permissions, + app_group_permissions, + organization_id, + organization, + } = response.body; + + expect(email).toEqual('ssoUser@tooljet.io'); + expect(first_name).toEqual('SSO'); + expect(last_name).toEqual('User'); + expect(admin).toBeFalsy(); + expect(organization_id).toBe(current_organization.id); + expect(organization).toBe(current_organization.name); + expect(group_permissions).toHaveLength(1); + expect(group_permissions[0].group).toEqual('all_users'); + expect(Object.keys(group_permissions[0]).sort()).toEqual( + [ + 'id', + 'organization_id', + 'group', + 'app_create', + 'app_delete', + 'updated_at', + 'created_at', + 'folder_create', + ].sort() + ); + expect(app_group_permissions).toHaveLength(0); }); - const googleVerifyMock = jest.spyOn(OAuth2Client.prototype, 'verifyIdToken'); - googleVerifyMock.mockImplementation(() => ({ - getPayload: () => ({ - sub: 'someSSOId', + + it('should return login info when the user does not exist and sign up is enabled', async () => { + const googleVerifyMock = jest.spyOn(OAuth2Client.prototype, 'verifyIdToken'); + googleVerifyMock.mockImplementation(() => ({ + getPayload: () => ({ + sub: 'someSSOId', + email: 'ssoUser@tooljet.io', + name: 'SSO User', + hd: 'tooljet.io', + }), + })); + + const response = await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }); + + expect(googleVerifyMock).toHaveBeenCalledWith({ + idToken: token, + audience: sso_configs.configs.clientId, + }); + + expect(response.statusCode).toBe(201); + expect(Object.keys(response.body).sort()).toEqual( + [ + 'id', + 'email', + 'first_name', + 'last_name', + 'auth_token', + 'admin', + 'organization_id', + 'organization', + 'group_permissions', + 'app_group_permissions', + ].sort() + ); + + const { + email, + first_name, + last_name, + admin, + group_permissions, + app_group_permissions, + organization_id, + organization, + } = response.body; + + expect(email).toEqual('ssoUser@tooljet.io'); + expect(first_name).toEqual('SSO'); + expect(last_name).toEqual('User'); + expect(admin).toBeFalsy(); + expect(organization_id).toBe(current_organization.id); + expect(organization).toBe(current_organization.name); + expect(group_permissions).toHaveLength(1); + expect(group_permissions[0].group).toEqual('all_users'); + expect(Object.keys(group_permissions[0]).sort()).toEqual( + [ + 'id', + 'organization_id', + 'group', + 'app_create', + 'app_delete', + 'updated_at', + 'created_at', + 'folder_create', + ].sort() + ); + expect(app_group_permissions).toHaveLength(0); + }); + it('should return login info when the user does not exist and name not available and sign up is enabled', async () => { + const googleVerifyMock = jest.spyOn(OAuth2Client.prototype, 'verifyIdToken'); + googleVerifyMock.mockImplementation(() => ({ + getPayload: () => ({ + sub: 'someSSOId', + email: 'ssoUser@tooljet.io', + name: '', + hd: 'tooljet.io', + }), + })); + + const response = await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }); + + expect(googleVerifyMock).toHaveBeenCalledWith({ + idToken: token, + audience: sso_configs.configs.clientId, + }); + + expect(response.statusCode).toBe(201); + expect(Object.keys(response.body).sort()).toEqual( + [ + 'id', + 'email', + 'first_name', + 'last_name', + 'auth_token', + 'admin', + 'organization_id', + 'organization', + 'group_permissions', + 'app_group_permissions', + ].sort() + ); + + const { email, first_name, admin, group_permissions, app_group_permissions, organization_id, organization } = + response.body; + + expect(email).toEqual('ssoUser@tooljet.io'); + expect(first_name).toEqual('ssoUser'); + expect(admin).toBeFalsy(); + expect(organization_id).toBe(current_organization.id); + expect(organization).toBe(current_organization.name); + expect(group_permissions).toHaveLength(1); + expect(group_permissions[0].group).toEqual('all_users'); + expect(Object.keys(group_permissions[0]).sort()).toEqual( + [ + 'id', + 'organization_id', + 'group', + 'app_create', + 'app_delete', + 'updated_at', + 'created_at', + 'folder_create', + ].sort() + ); + expect(app_group_permissions).toHaveLength(0); + }); + it('should return login info when the user exist', async () => { + await createUser(app, { + firstName: 'SSO', + lastName: 'userExist', email: 'anotherUser1@tooljet.io', - name: 'SSO User', - hd: 'tooljet.io', - }), - })); + groups: ['all_users'], + organization: current_organization, + status: 'active', + }); + const googleVerifyMock = jest.spyOn(OAuth2Client.prototype, 'verifyIdToken'); + googleVerifyMock.mockImplementation(() => ({ + getPayload: () => ({ + sub: 'someSSOId', + email: 'anotherUser1@tooljet.io', + name: 'SSO User', + hd: 'tooljet.io', + }), + })); - const response = await request(app.getHttpServer()) - .post('/api/oauth/sign-in/' + sso_configs.id) - .send({ token }); + const response = await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }); - expect(googleVerifyMock).toHaveBeenCalledWith({ - idToken: token, - audience: sso_configs.configs.clientId, + expect(googleVerifyMock).toHaveBeenCalledWith({ + idToken: token, + audience: sso_configs.configs.clientId, + }); + + expect(response.statusCode).toBe(201); + expect(Object.keys(response.body).sort()).toEqual( + [ + 'id', + 'email', + 'first_name', + 'last_name', + 'auth_token', + 'admin', + 'organization_id', + 'organization', + 'group_permissions', + 'app_group_permissions', + ].sort() + ); + + const { + email, + first_name, + last_name, + admin, + group_permissions, + app_group_permissions, + organization_id, + organization, + } = response.body; + + expect(email).toEqual('anotherUser1@tooljet.io'); + expect(first_name).toEqual('SSO'); + expect(last_name).toEqual('userExist'); + expect(admin).toBeFalsy(); + expect(organization_id).toBe(current_organization.id); + expect(organization).toBe(current_organization.name); + expect(group_permissions).toHaveLength(1); + expect(group_permissions[0].group).toEqual('all_users'); + expect(Object.keys(group_permissions[0]).sort()).toEqual( + [ + 'id', + 'organization_id', + 'group', + 'app_create', + 'app_delete', + 'updated_at', + 'created_at', + 'folder_create', + ].sort() + ); + expect(app_group_permissions).toHaveLength(0); + }); + }); + describe('sign in via Git OAuth', () => { + let sso_configs; + const token = 'some-Token'; + beforeEach(() => { + sso_configs = current_organization.ssoConfigs.find((conf) => conf.sso === 'git'); + }); + it('should return 401 if git sign in is disabled', async () => { + await ssoConfigsRepository.update(sso_configs.id, { enabled: false }); + await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }) + .expect(401); }); - expect(response.statusCode).toBe(201); - expect(Object.keys(response.body).sort()).toEqual( - [ - 'id', - 'email', - 'first_name', - 'last_name', - 'auth_token', - 'admin', - 'organization_id', - 'organization', - 'group_permissions', - 'app_group_permissions', - ].sort() - ); + it('should return 401 when the user does not exist and sign up is disabled', async () => { + await orgRepository.update(current_organization.id, { enableSignUp: false }); + const gitAuthResponse = jest.fn(); + gitAuthResponse.mockImplementation(() => { + return { + json: () => { + return { + access_token: 'some-access-token', + scope: 'scope', + token_type: 'bearer', + }; + }, + }; + }); + const gitGetUserResponse = jest.fn(); + gitGetUserResponse.mockImplementation(() => { + return { + json: () => { + return { + name: 'SSO UserGit', + email: 'ssoUserGit@tooljet.io', + }; + }, + }; + }); - const { - email, - first_name, - last_name, - admin, - group_permissions, - app_group_permissions, - organization_id, - organization, - } = response.body; + mockedGot.mockImplementationOnce(gitAuthResponse); + mockedGot.mockImplementationOnce(gitGetUserResponse); + await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }) + .expect(401); + }); - expect(email).toEqual('anotherUser1@tooljet.io'); - expect(first_name).toEqual('SSO'); - expect(last_name).toEqual('userExist'); - expect(admin).toBeFalsy(); - expect(organization_id).toBe(current_organization.id); - expect(organization).toBe(current_organization.name); - expect(group_permissions).toHaveLength(1); - expect(group_permissions[0].group).toEqual('all_users'); - expect(Object.keys(group_permissions[0]).sort()).toEqual( - [ - 'id', - 'organization_id', - 'group', - 'app_create', - 'app_delete', - 'updated_at', - 'created_at', - 'folder_create', - ].sort() - ); - expect(app_group_permissions).toHaveLength(0); + it('should return 401 when the user does not exist domain mismatch', async () => { + await orgRepository.update(current_organization.id, { domain: 'tooljet.io,tooljet.com' }); + const gitAuthResponse = jest.fn(); + gitAuthResponse.mockImplementation(() => { + return { + json: () => { + return { + access_token: 'some-access-token', + scope: 'scope', + token_type: 'bearer', + }; + }, + }; + }); + const gitGetUserResponse = jest.fn(); + gitGetUserResponse.mockImplementation(() => { + return { + json: () => { + return { + name: 'SSO UserGit', + email: 'ssoUserGit@tooljett.io', + }; + }, + }; + }); + + mockedGot.mockImplementationOnce(gitAuthResponse); + mockedGot.mockImplementationOnce(gitGetUserResponse); + + await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }) + .expect(401); + }); + + it('should return login info when the user does not exist and domain matches and sign up is enabled', async () => { + await orgRepository.update(current_organization.id, { domain: 'tooljet.io,tooljet.com' }); + const gitAuthResponse = jest.fn(); + gitAuthResponse.mockImplementation(() => { + return { + json: () => { + return { + access_token: 'some-access-token', + scope: 'scope', + token_type: 'bearer', + }; + }, + }; + }); + const gitGetUserResponse = jest.fn(); + gitGetUserResponse.mockImplementation(() => { + return { + json: () => { + return { + name: 'SSO UserGit', + email: 'ssoUserGit@tooljet.io', + }; + }, + }; + }); + + mockedGot.mockImplementationOnce(gitAuthResponse); + mockedGot.mockImplementationOnce(gitGetUserResponse); + + const response = await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }); + + expect(response.statusCode).toBe(201); + expect(Object.keys(response.body).sort()).toEqual( + [ + 'id', + 'email', + 'first_name', + 'last_name', + 'auth_token', + 'admin', + 'organization_id', + 'organization', + 'group_permissions', + 'app_group_permissions', + ].sort() + ); + + const { + email, + first_name, + last_name, + admin, + group_permissions, + app_group_permissions, + organization_id, + organization, + } = response.body; + + expect(email).toEqual('ssoUserGit@tooljet.io'); + expect(first_name).toEqual('SSO'); + expect(last_name).toEqual('UserGit'); + expect(admin).toBeFalsy(); + expect(organization_id).toBe(current_organization.id); + expect(organization).toBe(current_organization.name); + expect(group_permissions).toHaveLength(1); + expect(group_permissions[0].group).toEqual('all_users'); + expect(Object.keys(group_permissions[0]).sort()).toEqual( + [ + 'id', + 'organization_id', + 'group', + 'app_create', + 'app_delete', + 'updated_at', + 'created_at', + 'folder_create', + ].sort() + ); + expect(app_group_permissions).toHaveLength(0); + }); + + it('should return login info when the user does not exist and domain includes spance matches and sign up is enabled', async () => { + await orgRepository.update(current_organization.id, { + domain: ' tooljet.io , tooljet.com, , , gmail.com', + }); + const gitAuthResponse = jest.fn(); + gitAuthResponse.mockImplementation(() => { + return { + json: () => { + return { + access_token: 'some-access-token', + scope: 'scope', + token_type: 'bearer', + }; + }, + }; + }); + const gitGetUserResponse = jest.fn(); + gitGetUserResponse.mockImplementation(() => { + return { + json: () => { + return { + name: 'SSO UserGit', + email: 'ssoUserGit@tooljet.io', + }; + }, + }; + }); + + mockedGot.mockImplementationOnce(gitAuthResponse); + mockedGot.mockImplementationOnce(gitGetUserResponse); + + const response = await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }); + + expect(response.statusCode).toBe(201); + expect(Object.keys(response.body).sort()).toEqual( + [ + 'id', + 'email', + 'first_name', + 'last_name', + 'auth_token', + 'admin', + 'organization_id', + 'organization', + 'group_permissions', + 'app_group_permissions', + ].sort() + ); + + const { + email, + first_name, + last_name, + admin, + group_permissions, + app_group_permissions, + organization_id, + organization, + } = response.body; + + expect(email).toEqual('ssoUserGit@tooljet.io'); + expect(first_name).toEqual('SSO'); + expect(last_name).toEqual('UserGit'); + expect(admin).toBeFalsy(); + expect(organization_id).toBe(current_organization.id); + expect(organization).toBe(current_organization.name); + expect(group_permissions).toHaveLength(1); + expect(group_permissions[0].group).toEqual('all_users'); + expect(Object.keys(group_permissions[0]).sort()).toEqual( + [ + 'id', + 'organization_id', + 'group', + 'app_create', + 'app_delete', + 'updated_at', + 'created_at', + 'folder_create', + ].sort() + ); + expect(app_group_permissions).toHaveLength(0); + }); + + it('should return login info when the user does not exist and sign up is enabled', async () => { + const gitAuthResponse = jest.fn(); + gitAuthResponse.mockImplementation(() => { + return { + json: () => { + return { + access_token: 'some-access-token', + scope: 'scope', + token_type: 'bearer', + }; + }, + }; + }); + const gitGetUserResponse = jest.fn(); + gitGetUserResponse.mockImplementation(() => { + return { + json: () => { + return { + name: 'SSO UserGit', + email: 'ssoUserGit@tooljet.io', + }; + }, + }; + }); + + mockedGot.mockImplementationOnce(gitAuthResponse); + mockedGot.mockImplementationOnce(gitGetUserResponse); + + const response = await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }); + + expect(response.statusCode).toBe(201); + expect(Object.keys(response.body).sort()).toEqual( + [ + 'id', + 'email', + 'first_name', + 'last_name', + 'auth_token', + 'admin', + 'organization_id', + 'organization', + 'group_permissions', + 'app_group_permissions', + ].sort() + ); + + const { + email, + first_name, + last_name, + admin, + group_permissions, + app_group_permissions, + organization_id, + organization, + } = response.body; + + expect(email).toEqual('ssoUserGit@tooljet.io'); + expect(first_name).toEqual('SSO'); + expect(last_name).toEqual('UserGit'); + expect(admin).toBeFalsy(); + expect(organization_id).toBe(current_organization.id); + expect(organization).toBe(current_organization.name); + expect(group_permissions).toHaveLength(1); + expect(group_permissions[0].group).toEqual('all_users'); + expect(Object.keys(group_permissions[0]).sort()).toEqual( + [ + 'id', + 'organization_id', + 'group', + 'app_create', + 'app_delete', + 'updated_at', + 'created_at', + 'folder_create', + ].sort() + ); + expect(app_group_permissions).toHaveLength(0); + }); + it('should return login info when the user does not exist and name not available and sign up is enabled', async () => { + const gitAuthResponse = jest.fn(); + gitAuthResponse.mockImplementation(() => { + return { + json: () => { + return { + access_token: 'some-access-token', + scope: 'scope', + token_type: 'bearer', + }; + }, + }; + }); + const gitGetUserResponse = jest.fn(); + gitGetUserResponse.mockImplementation(() => { + return { + json: () => { + return { + name: '', + email: 'ssoUserGit@tooljet.io', + }; + }, + }; + }); + + mockedGot.mockImplementationOnce(gitAuthResponse); + mockedGot.mockImplementationOnce(gitGetUserResponse); + + const response = await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }); + + expect(response.statusCode).toBe(201); + expect(Object.keys(response.body).sort()).toEqual( + [ + 'id', + 'email', + 'first_name', + 'last_name', + 'auth_token', + 'admin', + 'organization_id', + 'organization', + 'group_permissions', + 'app_group_permissions', + ].sort() + ); + + const { email, first_name, admin, group_permissions, app_group_permissions, organization_id, organization } = + response.body; + + expect(email).toEqual('ssoUserGit@tooljet.io'); + expect(first_name).toEqual('ssoUserGit'); + expect(admin).toBeFalsy(); + expect(organization_id).toBe(current_organization.id); + expect(organization).toBe(current_organization.name); + expect(group_permissions).toHaveLength(1); + expect(group_permissions[0].group).toEqual('all_users'); + expect(Object.keys(group_permissions[0]).sort()).toEqual( + [ + 'id', + 'organization_id', + 'group', + 'app_create', + 'app_delete', + 'updated_at', + 'created_at', + 'folder_create', + ].sort() + ); + expect(app_group_permissions).toHaveLength(0); + }); + it('should return login info when the user does not exist and email id not available and sign up is enabled', async () => { + const gitAuthResponse = jest.fn(); + gitAuthResponse.mockImplementation(() => { + return { + json: () => { + return { + access_token: 'some-access-token', + scope: 'scope', + token_type: 'bearer', + }; + }, + }; + }); + const gitGetUserResponse = jest.fn(); + gitGetUserResponse.mockImplementation(() => { + return { + json: () => { + return { + name: '', + email: '', + }; + }, + }; + }); + const gitGetUserEmailResponse = jest.fn(); + gitGetUserEmailResponse.mockImplementation(() => { + return { + json: () => { + return [ + { + email: 'ssoUserGit@tooljet.io', + primary: true, + verified: true, + }, + { + email: 'ssoUserGit2@tooljet.io', + primary: false, + verified: true, + }, + ]; + }, + }; + }); + + mockedGot.mockImplementationOnce(gitAuthResponse); + mockedGot.mockImplementationOnce(gitGetUserResponse); + mockedGot.mockImplementationOnce(gitGetUserEmailResponse); + + const response = await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }); + + expect(response.statusCode).toBe(201); + expect(Object.keys(response.body).sort()).toEqual( + [ + 'id', + 'email', + 'first_name', + 'last_name', + 'auth_token', + 'admin', + 'organization_id', + 'organization', + 'group_permissions', + 'app_group_permissions', + ].sort() + ); + + const { email, first_name, admin, group_permissions, app_group_permissions, organization_id, organization } = + response.body; + + expect(email).toEqual('ssoUserGit@tooljet.io'); + expect(first_name).toEqual('ssoUserGit'); + expect(admin).toBeFalsy(); + expect(organization_id).toBe(current_organization.id); + expect(organization).toBe(current_organization.name); + expect(group_permissions).toHaveLength(1); + expect(group_permissions[0].group).toEqual('all_users'); + expect(Object.keys(group_permissions[0]).sort()).toEqual( + [ + 'id', + 'organization_id', + 'group', + 'app_create', + 'app_delete', + 'updated_at', + 'created_at', + 'folder_create', + ].sort() + ); + expect(app_group_permissions).toHaveLength(0); + }); + it('should return login info when the user exist', async () => { + await createUser(app, { + firstName: 'SSO', + lastName: 'userExist', + email: 'anotherUser1@tooljet.io', + groups: ['all_users'], + organization: current_organization, + status: 'active', + }); + + const gitAuthResponse = jest.fn(); + gitAuthResponse.mockImplementation(() => { + return { + json: () => { + return { + access_token: 'some-access-token', + scope: 'scope', + token_type: 'bearer', + }; + }, + }; + }); + const gitGetUserResponse = jest.fn(); + gitGetUserResponse.mockImplementation(() => { + return { + json: () => { + return { + name: 'SSO userExist', + email: 'anotherUser1@tooljet.io', + }; + }, + }; + }); + + mockedGot.mockImplementationOnce(gitAuthResponse); + mockedGot.mockImplementationOnce(gitGetUserResponse); + + const response = await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }); + + expect(response.statusCode).toBe(201); + expect(Object.keys(response.body).sort()).toEqual( + [ + 'id', + 'email', + 'first_name', + 'last_name', + 'auth_token', + 'admin', + 'organization_id', + 'organization', + 'group_permissions', + 'app_group_permissions', + ].sort() + ); + + const { + email, + first_name, + last_name, + admin, + group_permissions, + app_group_permissions, + organization_id, + organization, + } = response.body; + + expect(email).toEqual('anotherUser1@tooljet.io'); + expect(first_name).toEqual('SSO'); + expect(last_name).toEqual('userExist'); + expect(admin).toBeFalsy(); + expect(organization_id).toBe(current_organization.id); + expect(organization).toBe(current_organization.name); + expect(group_permissions).toHaveLength(1); + expect(group_permissions[0].group).toEqual('all_users'); + expect(Object.keys(group_permissions[0]).sort()).toEqual( + [ + 'id', + 'organization_id', + 'group', + 'app_create', + 'app_delete', + 'updated_at', + 'created_at', + 'folder_create', + ].sort() + ); + expect(app_group_permissions).toHaveLength(0); + }); }); }); - describe('sign in via Git OAuth', () => { - let sso_configs; - const token = 'some-Token'; - beforeEach(() => { - sso_configs = current_organization.ssoConfigs.find((conf) => conf.sso === 'git'); + + describe('Multi-Workspace Disabled', () => { + beforeEach(async () => { + jest.spyOn(mockConfig, 'get').mockImplementation((key: string) => { + if (key === 'DISABLE_MULTI_WORKSPACE') { + return 'true'; + } else { + return process.env[key]; + } + }); }); - it('should return 401 if git sign in is disabled', async () => { - await ssoConfigsRepository.update(sso_configs.id, { enabled: false }); - await request(app.getHttpServer()) - .post('/api/oauth/sign-in/' + sso_configs.id) - .send({ token }) - .expect(401); + describe('sign in via Google OAuth', () => { + let sso_configs; + const token = 'some-Token'; + beforeEach(() => { + sso_configs = current_organization.ssoConfigs.find((conf) => conf.sso === 'google'); + }); + it('should return 401 if google sign in is disabled', async () => { + await ssoConfigsRepository.update(sso_configs.id, { enabled: false }); + await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }) + .expect(401); + }); + + it('should return 401 when the user does not exist and sign up is disabled', async () => { + await orgRepository.update(current_organization.id, { enableSignUp: false }); + const googleVerifyMock = jest.spyOn(OAuth2Client.prototype, 'verifyIdToken'); + googleVerifyMock.mockImplementation(() => ({ + getPayload: () => ({ + sub: 'someSSOId', + email: 'ssoUser@tooljet.io', + name: 'SSO User', + hd: 'tooljet.io', + }), + })); + await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }) + .expect(401); + }); + + it('should return 401 when the user does not exist domain mismatch', async () => { + await orgRepository.update(current_organization.id, { domain: 'tooljet.io,tooljet.com' }); + const googleVerifyMock = jest.spyOn(OAuth2Client.prototype, 'verifyIdToken'); + googleVerifyMock.mockImplementation(() => ({ + getPayload: () => ({ + sub: 'someSSOId', + email: 'ssoUser@tooljett.io', + name: 'SSO User', + hd: 'tooljet.io', + }), + })); + await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }) + .expect(401); + }); + + it('should return login info when the user does not exist and domain matches and sign up is enabled', async () => { + await orgRepository.update(current_organization.id, { domain: 'tooljet.io,tooljet.com' }); + const googleVerifyMock = jest.spyOn(OAuth2Client.prototype, 'verifyIdToken'); + googleVerifyMock.mockImplementation(() => ({ + getPayload: () => ({ + sub: 'someSSOId', + email: 'ssoUser@tooljet.io', + name: 'SSO User', + hd: 'tooljet.io', + }), + })); + + const response = await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }); + + expect(googleVerifyMock).toHaveBeenCalledWith({ + idToken: token, + audience: sso_configs.configs.clientId, + }); + + expect(response.statusCode).toBe(201); + expect(Object.keys(response.body).sort()).toEqual( + [ + 'id', + 'email', + 'first_name', + 'last_name', + 'auth_token', + 'admin', + 'organization_id', + 'organization', + 'group_permissions', + 'app_group_permissions', + ].sort() + ); + + const { + email, + first_name, + last_name, + admin, + group_permissions, + app_group_permissions, + organization_id, + organization, + } = response.body; + + expect(email).toEqual('ssoUser@tooljet.io'); + expect(first_name).toEqual('SSO'); + expect(last_name).toEqual('User'); + expect(admin).toBeFalsy(); + expect(organization_id).toBe(current_organization.id); + expect(organization).toBe(current_organization.name); + expect(group_permissions).toHaveLength(1); + expect(group_permissions[0].group).toEqual('all_users'); + expect(Object.keys(group_permissions[0]).sort()).toEqual( + [ + 'id', + 'organization_id', + 'group', + 'app_create', + 'app_delete', + 'updated_at', + 'created_at', + 'folder_create', + ].sort() + ); + expect(app_group_permissions).toHaveLength(0); + }); + + it('should return login info when the user does not exist and sign up is enabled', async () => { + const googleVerifyMock = jest.spyOn(OAuth2Client.prototype, 'verifyIdToken'); + googleVerifyMock.mockImplementation(() => ({ + getPayload: () => ({ + sub: 'someSSOId', + email: 'ssoUser@tooljet.io', + name: 'SSO User', + hd: 'tooljet.io', + }), + })); + + const response = await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }); + + expect(googleVerifyMock).toHaveBeenCalledWith({ + idToken: token, + audience: sso_configs.configs.clientId, + }); + + expect(response.statusCode).toBe(201); + expect(Object.keys(response.body).sort()).toEqual( + [ + 'id', + 'email', + 'first_name', + 'last_name', + 'auth_token', + 'admin', + 'organization_id', + 'organization', + 'group_permissions', + 'app_group_permissions', + ].sort() + ); + + const { + email, + first_name, + last_name, + admin, + group_permissions, + app_group_permissions, + organization_id, + organization, + } = response.body; + + expect(email).toEqual('ssoUser@tooljet.io'); + expect(first_name).toEqual('SSO'); + expect(last_name).toEqual('User'); + expect(admin).toBeFalsy(); + expect(organization_id).toBe(current_organization.id); + expect(organization).toBe(current_organization.name); + expect(group_permissions).toHaveLength(1); + expect(group_permissions[0].group).toEqual('all_users'); + expect(Object.keys(group_permissions[0]).sort()).toEqual( + [ + 'id', + 'organization_id', + 'group', + 'app_create', + 'app_delete', + 'updated_at', + 'created_at', + 'folder_create', + ].sort() + ); + expect(app_group_permissions).toHaveLength(0); + }); + it('should return login info when the user does not exist and name not available and sign up is enabled', async () => { + const googleVerifyMock = jest.spyOn(OAuth2Client.prototype, 'verifyIdToken'); + googleVerifyMock.mockImplementation(() => ({ + getPayload: () => ({ + sub: 'someSSOId', + email: 'ssoUser@tooljet.io', + name: '', + hd: 'tooljet.io', + }), + })); + + const response = await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }); + + expect(googleVerifyMock).toHaveBeenCalledWith({ + idToken: token, + audience: sso_configs.configs.clientId, + }); + + expect(response.statusCode).toBe(201); + expect(Object.keys(response.body).sort()).toEqual( + [ + 'id', + 'email', + 'first_name', + 'last_name', + 'auth_token', + 'admin', + 'organization_id', + 'organization', + 'group_permissions', + 'app_group_permissions', + ].sort() + ); + + const { email, first_name, admin, group_permissions, app_group_permissions, organization_id, organization } = + response.body; + + expect(email).toEqual('ssoUser@tooljet.io'); + expect(first_name).toEqual('ssoUser'); + expect(admin).toBeFalsy(); + expect(organization_id).toBe(current_organization.id); + expect(organization).toBe(current_organization.name); + expect(group_permissions).toHaveLength(1); + expect(group_permissions[0].group).toEqual('all_users'); + expect(Object.keys(group_permissions[0]).sort()).toEqual( + [ + 'id', + 'organization_id', + 'group', + 'app_create', + 'app_delete', + 'updated_at', + 'created_at', + 'folder_create', + ].sort() + ); + expect(app_group_permissions).toHaveLength(0); + }); + it('should return login info when the user exist', async () => { + await createUser(app, { + firstName: 'SSO', + lastName: 'userExist', + email: 'anotherUser1@tooljet.io', + groups: ['all_users'], + organization: current_organization, + status: 'active', + }); + const googleVerifyMock = jest.spyOn(OAuth2Client.prototype, 'verifyIdToken'); + googleVerifyMock.mockImplementation(() => ({ + getPayload: () => ({ + sub: 'someSSOId', + email: 'anotherUser1@tooljet.io', + name: 'SSO User', + hd: 'tooljet.io', + }), + })); + + const response = await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }); + + expect(googleVerifyMock).toHaveBeenCalledWith({ + idToken: token, + audience: sso_configs.configs.clientId, + }); + + expect(response.statusCode).toBe(201); + expect(Object.keys(response.body).sort()).toEqual( + [ + 'id', + 'email', + 'first_name', + 'last_name', + 'auth_token', + 'admin', + 'organization_id', + 'organization', + 'group_permissions', + 'app_group_permissions', + ].sort() + ); + + const { + email, + first_name, + last_name, + admin, + group_permissions, + app_group_permissions, + organization_id, + organization, + } = response.body; + + expect(email).toEqual('anotherUser1@tooljet.io'); + expect(first_name).toEqual('SSO'); + expect(last_name).toEqual('userExist'); + expect(admin).toBeFalsy(); + expect(organization_id).toBe(current_organization.id); + expect(organization).toBe(current_organization.name); + expect(group_permissions).toHaveLength(1); + expect(group_permissions[0].group).toEqual('all_users'); + expect(Object.keys(group_permissions[0]).sort()).toEqual( + [ + 'id', + 'organization_id', + 'group', + 'app_create', + 'app_delete', + 'updated_at', + 'created_at', + 'folder_create', + ].sort() + ); + expect(app_group_permissions).toHaveLength(0); + }); }); - - it('should return 401 when the user does not exist and sign up is disabled', async () => { - await orgRepository.update(current_organization.id, { enableSignUp: false }); - const gitAuthResponse = jest.fn(); - gitAuthResponse.mockImplementation(() => { - return { - json: () => { - return { - access_token: 'some-access-token', - scope: 'scope', - token_type: 'bearer', - }; - }, - }; + describe('sign in via Git OAuth', () => { + let sso_configs; + const token = 'some-Token'; + beforeEach(() => { + sso_configs = current_organization.ssoConfigs.find((conf) => conf.sso === 'git'); }); - const gitGetUserResponse = jest.fn(); - gitGetUserResponse.mockImplementation(() => { - return { - json: () => { - return { - name: 'SSO UserGit', - email: 'ssoUserGit@tooljet.io', - }; - }, - }; + it('should return 401 if git sign in is disabled', async () => { + await ssoConfigsRepository.update(sso_configs.id, { enabled: false }); + await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }) + .expect(401); }); - mockedGot.mockImplementationOnce(gitAuthResponse); - mockedGot.mockImplementationOnce(gitGetUserResponse); - await request(app.getHttpServer()) - .post('/api/oauth/sign-in/' + sso_configs.id) - .send({ token }) - .expect(401); - }); - - it('should return 401 when the user does not exist domain mismatch', async () => { - await orgRepository.update(current_organization.id, { domain: 'tooljet.io,tooljet.com' }); - const gitAuthResponse = jest.fn(); - gitAuthResponse.mockImplementation(() => { - return { - json: () => { - return { - access_token: 'some-access-token', - scope: 'scope', - token_type: 'bearer', - }; - }, - }; - }); - const gitGetUserResponse = jest.fn(); - gitGetUserResponse.mockImplementation(() => { - return { - json: () => { - return { - name: 'SSO UserGit', - email: 'ssoUserGit@tooljett.io', - }; - }, - }; - }); - - mockedGot.mockImplementationOnce(gitAuthResponse); - mockedGot.mockImplementationOnce(gitGetUserResponse); - - await request(app.getHttpServer()) - .post('/api/oauth/sign-in/' + sso_configs.id) - .send({ token }) - .expect(401); - }); - - it('should return login info when the user does not exist and domain matches and sign up is enabled', async () => { - await orgRepository.update(current_organization.id, { domain: 'tooljet.io,tooljet.com' }); - const gitAuthResponse = jest.fn(); - gitAuthResponse.mockImplementation(() => { - return { - json: () => { - return { - access_token: 'some-access-token', - scope: 'scope', - token_type: 'bearer', - }; - }, - }; - }); - const gitGetUserResponse = jest.fn(); - gitGetUserResponse.mockImplementation(() => { - return { - json: () => { - return { - name: 'SSO UserGit', - email: 'ssoUserGit@tooljet.io', - }; - }, - }; - }); - - mockedGot.mockImplementationOnce(gitAuthResponse); - mockedGot.mockImplementationOnce(gitGetUserResponse); - - const response = await request(app.getHttpServer()) - .post('/api/oauth/sign-in/' + sso_configs.id) - .send({ token }); - - expect(response.statusCode).toBe(201); - expect(Object.keys(response.body).sort()).toEqual( - [ - 'id', - 'email', - 'first_name', - 'last_name', - 'auth_token', - 'admin', - 'organization_id', - 'organization', - 'group_permissions', - 'app_group_permissions', - ].sort() - ); - - const { - email, - first_name, - last_name, - admin, - group_permissions, - app_group_permissions, - organization_id, - organization, - } = response.body; - - expect(email).toEqual('ssoUserGit@tooljet.io'); - expect(first_name).toEqual('SSO'); - expect(last_name).toEqual('UserGit'); - expect(admin).toBeFalsy(); - expect(organization_id).toBe(current_organization.id); - expect(organization).toBe(current_organization.name); - expect(group_permissions).toHaveLength(1); - expect(group_permissions[0].group).toEqual('all_users'); - expect(Object.keys(group_permissions[0]).sort()).toEqual( - [ - 'id', - 'organization_id', - 'group', - 'app_create', - 'app_delete', - 'updated_at', - 'created_at', - 'folder_create', - ].sort() - ); - expect(app_group_permissions).toHaveLength(0); - }); - - it('should return login info when the user does not exist and domain includes spance matches and sign up is enabled', async () => { - await orgRepository.update(current_organization.id, { - domain: ' tooljet.io , tooljet.com, , , gmail.com', - }); - const gitAuthResponse = jest.fn(); - gitAuthResponse.mockImplementation(() => { - return { - json: () => { - return { - access_token: 'some-access-token', - scope: 'scope', - token_type: 'bearer', - }; - }, - }; - }); - const gitGetUserResponse = jest.fn(); - gitGetUserResponse.mockImplementation(() => { - return { - json: () => { - return { - name: 'SSO UserGit', - email: 'ssoUserGit@tooljet.io', - }; - }, - }; - }); - - mockedGot.mockImplementationOnce(gitAuthResponse); - mockedGot.mockImplementationOnce(gitGetUserResponse); - - const response = await request(app.getHttpServer()) - .post('/api/oauth/sign-in/' + sso_configs.id) - .send({ token }); - - expect(response.statusCode).toBe(201); - expect(Object.keys(response.body).sort()).toEqual( - [ - 'id', - 'email', - 'first_name', - 'last_name', - 'auth_token', - 'admin', - 'organization_id', - 'organization', - 'group_permissions', - 'app_group_permissions', - ].sort() - ); - - const { - email, - first_name, - last_name, - admin, - group_permissions, - app_group_permissions, - organization_id, - organization, - } = response.body; - - expect(email).toEqual('ssoUserGit@tooljet.io'); - expect(first_name).toEqual('SSO'); - expect(last_name).toEqual('UserGit'); - expect(admin).toBeFalsy(); - expect(organization_id).toBe(current_organization.id); - expect(organization).toBe(current_organization.name); - expect(group_permissions).toHaveLength(1); - expect(group_permissions[0].group).toEqual('all_users'); - expect(Object.keys(group_permissions[0]).sort()).toEqual( - [ - 'id', - 'organization_id', - 'group', - 'app_create', - 'app_delete', - 'updated_at', - 'created_at', - 'folder_create', - ].sort() - ); - expect(app_group_permissions).toHaveLength(0); - }); - - it('should return login info when the user does not exist and sign up is enabled', async () => { - const gitAuthResponse = jest.fn(); - gitAuthResponse.mockImplementation(() => { - return { - json: () => { - return { - access_token: 'some-access-token', - scope: 'scope', - token_type: 'bearer', - }; - }, - }; - }); - const gitGetUserResponse = jest.fn(); - gitGetUserResponse.mockImplementation(() => { - return { - json: () => { - return { - name: 'SSO UserGit', - email: 'ssoUserGit@tooljet.io', - }; - }, - }; - }); - - mockedGot.mockImplementationOnce(gitAuthResponse); - mockedGot.mockImplementationOnce(gitGetUserResponse); - - const response = await request(app.getHttpServer()) - .post('/api/oauth/sign-in/' + sso_configs.id) - .send({ token }); - - expect(response.statusCode).toBe(201); - expect(Object.keys(response.body).sort()).toEqual( - [ - 'id', - 'email', - 'first_name', - 'last_name', - 'auth_token', - 'admin', - 'organization_id', - 'organization', - 'group_permissions', - 'app_group_permissions', - ].sort() - ); - - const { - email, - first_name, - last_name, - admin, - group_permissions, - app_group_permissions, - organization_id, - organization, - } = response.body; - - expect(email).toEqual('ssoUserGit@tooljet.io'); - expect(first_name).toEqual('SSO'); - expect(last_name).toEqual('UserGit'); - expect(admin).toBeFalsy(); - expect(organization_id).toBe(current_organization.id); - expect(organization).toBe(current_organization.name); - expect(group_permissions).toHaveLength(1); - expect(group_permissions[0].group).toEqual('all_users'); - expect(Object.keys(group_permissions[0]).sort()).toEqual( - [ - 'id', - 'organization_id', - 'group', - 'app_create', - 'app_delete', - 'updated_at', - 'created_at', - 'folder_create', - ].sort() - ); - expect(app_group_permissions).toHaveLength(0); - }); - it('should return login info when the user does not exist and name not available and sign up is enabled', async () => { - const gitAuthResponse = jest.fn(); - gitAuthResponse.mockImplementation(() => { - return { - json: () => { - return { - access_token: 'some-access-token', - scope: 'scope', - token_type: 'bearer', - }; - }, - }; - }); - const gitGetUserResponse = jest.fn(); - gitGetUserResponse.mockImplementation(() => { - return { - json: () => { - return { - name: '', - email: 'ssoUserGit@tooljet.io', - }; - }, - }; - }); - - mockedGot.mockImplementationOnce(gitAuthResponse); - mockedGot.mockImplementationOnce(gitGetUserResponse); - - const response = await request(app.getHttpServer()) - .post('/api/oauth/sign-in/' + sso_configs.id) - .send({ token }); - - expect(response.statusCode).toBe(201); - expect(Object.keys(response.body).sort()).toEqual( - [ - 'id', - 'email', - 'first_name', - 'last_name', - 'auth_token', - 'admin', - 'organization_id', - 'organization', - 'group_permissions', - 'app_group_permissions', - ].sort() - ); - - const { email, first_name, admin, group_permissions, app_group_permissions, organization_id, organization } = - response.body; - - expect(email).toEqual('ssoUserGit@tooljet.io'); - expect(first_name).toEqual('ssoUserGit'); - expect(admin).toBeFalsy(); - expect(organization_id).toBe(current_organization.id); - expect(organization).toBe(current_organization.name); - expect(group_permissions).toHaveLength(1); - expect(group_permissions[0].group).toEqual('all_users'); - expect(Object.keys(group_permissions[0]).sort()).toEqual( - [ - 'id', - 'organization_id', - 'group', - 'app_create', - 'app_delete', - 'updated_at', - 'created_at', - 'folder_create', - ].sort() - ); - expect(app_group_permissions).toHaveLength(0); - }); - it('should return login info when the user does not exist and email id not available and sign up is enabled', async () => { - const gitAuthResponse = jest.fn(); - gitAuthResponse.mockImplementation(() => { - return { - json: () => { - return { - access_token: 'some-access-token', - scope: 'scope', - token_type: 'bearer', - }; - }, - }; - }); - const gitGetUserResponse = jest.fn(); - gitGetUserResponse.mockImplementation(() => { - return { - json: () => { - return { - name: '', - email: '', - }; - }, - }; - }); - const gitGetUserEmailResponse = jest.fn(); - gitGetUserEmailResponse.mockImplementation(() => { - return { - json: () => { - return [ - { + it('should return 401 when the user does not exist and sign up is disabled', async () => { + await orgRepository.update(current_organization.id, { enableSignUp: false }); + const gitAuthResponse = jest.fn(); + gitAuthResponse.mockImplementation(() => { + return { + json: () => { + return { + access_token: 'some-access-token', + scope: 'scope', + token_type: 'bearer', + }; + }, + }; + }); + const gitGetUserResponse = jest.fn(); + gitGetUserResponse.mockImplementation(() => { + return { + json: () => { + return { + name: 'SSO UserGit', email: 'ssoUserGit@tooljet.io', - primary: true, - verified: true, - }, - { - email: 'ssoUserGit2@tooljet.io', - primary: false, - verified: true, - }, - ]; - }, - }; + }; + }, + }; + }); + + mockedGot.mockImplementationOnce(gitAuthResponse); + mockedGot.mockImplementationOnce(gitGetUserResponse); + await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }) + .expect(401); }); - mockedGot.mockImplementationOnce(gitAuthResponse); - mockedGot.mockImplementationOnce(gitGetUserResponse); - mockedGot.mockImplementationOnce(gitGetUserEmailResponse); + it('should return 401 when the user does not exist domain mismatch', async () => { + await orgRepository.update(current_organization.id, { domain: 'tooljet.io,tooljet.com' }); + const gitAuthResponse = jest.fn(); + gitAuthResponse.mockImplementation(() => { + return { + json: () => { + return { + access_token: 'some-access-token', + scope: 'scope', + token_type: 'bearer', + }; + }, + }; + }); + const gitGetUserResponse = jest.fn(); + gitGetUserResponse.mockImplementation(() => { + return { + json: () => { + return { + name: 'SSO UserGit', + email: 'ssoUserGit@tooljett.io', + }; + }, + }; + }); - const response = await request(app.getHttpServer()) - .post('/api/oauth/sign-in/' + sso_configs.id) - .send({ token }); + mockedGot.mockImplementationOnce(gitAuthResponse); + mockedGot.mockImplementationOnce(gitGetUserResponse); - expect(response.statusCode).toBe(201); - expect(Object.keys(response.body).sort()).toEqual( - [ - 'id', - 'email', - 'first_name', - 'last_name', - 'auth_token', - 'admin', - 'organization_id', - 'organization', - 'group_permissions', - 'app_group_permissions', - ].sort() - ); - - const { email, first_name, admin, group_permissions, app_group_permissions, organization_id, organization } = - response.body; - - expect(email).toEqual('ssoUserGit@tooljet.io'); - expect(first_name).toEqual('ssoUserGit'); - expect(admin).toBeFalsy(); - expect(organization_id).toBe(current_organization.id); - expect(organization).toBe(current_organization.name); - expect(group_permissions).toHaveLength(1); - expect(group_permissions[0].group).toEqual('all_users'); - expect(Object.keys(group_permissions[0]).sort()).toEqual( - [ - 'id', - 'organization_id', - 'group', - 'app_create', - 'app_delete', - 'updated_at', - 'created_at', - 'folder_create', - ].sort() - ); - expect(app_group_permissions).toHaveLength(0); - }); - it('should return login info when the user exist', async () => { - await createUser(app, { - firstName: 'SSO', - lastName: 'userExist', - email: 'anotherUser1@tooljet.io', - groups: ['all_users'], - organization: current_organization, - status: 'active', + await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }) + .expect(401); }); - const gitAuthResponse = jest.fn(); - gitAuthResponse.mockImplementation(() => { - return { - json: () => { - return { - access_token: 'some-access-token', - scope: 'scope', - token_type: 'bearer', - }; - }, - }; - }); - const gitGetUserResponse = jest.fn(); - gitGetUserResponse.mockImplementation(() => { - return { - json: () => { - return { - name: 'SSO userExist', - email: 'anotherUser1@tooljet.io', - }; - }, - }; + it('should return login info when the user does not exist and domain matches and sign up is enabled', async () => { + await orgRepository.update(current_organization.id, { domain: 'tooljet.io,tooljet.com' }); + const gitAuthResponse = jest.fn(); + gitAuthResponse.mockImplementation(() => { + return { + json: () => { + return { + access_token: 'some-access-token', + scope: 'scope', + token_type: 'bearer', + }; + }, + }; + }); + const gitGetUserResponse = jest.fn(); + gitGetUserResponse.mockImplementation(() => { + return { + json: () => { + return { + name: 'SSO UserGit', + email: 'ssoUserGit@tooljet.io', + }; + }, + }; + }); + + mockedGot.mockImplementationOnce(gitAuthResponse); + mockedGot.mockImplementationOnce(gitGetUserResponse); + + const response = await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }); + + expect(response.statusCode).toBe(201); + expect(Object.keys(response.body).sort()).toEqual( + [ + 'id', + 'email', + 'first_name', + 'last_name', + 'auth_token', + 'admin', + 'organization_id', + 'organization', + 'group_permissions', + 'app_group_permissions', + ].sort() + ); + + const { + email, + first_name, + last_name, + admin, + group_permissions, + app_group_permissions, + organization_id, + organization, + } = response.body; + + expect(email).toEqual('ssoUserGit@tooljet.io'); + expect(first_name).toEqual('SSO'); + expect(last_name).toEqual('UserGit'); + expect(admin).toBeFalsy(); + expect(organization_id).toBe(current_organization.id); + expect(organization).toBe(current_organization.name); + expect(group_permissions).toHaveLength(1); + expect(group_permissions[0].group).toEqual('all_users'); + expect(Object.keys(group_permissions[0]).sort()).toEqual( + [ + 'id', + 'organization_id', + 'group', + 'app_create', + 'app_delete', + 'updated_at', + 'created_at', + 'folder_create', + ].sort() + ); + expect(app_group_permissions).toHaveLength(0); }); - mockedGot.mockImplementationOnce(gitAuthResponse); - mockedGot.mockImplementationOnce(gitGetUserResponse); + it('should return login info when the user does not exist and domain includes spance matches and sign up is enabled', async () => { + await orgRepository.update(current_organization.id, { + domain: ' tooljet.io , tooljet.com, , , gmail.com', + }); + const gitAuthResponse = jest.fn(); + gitAuthResponse.mockImplementation(() => { + return { + json: () => { + return { + access_token: 'some-access-token', + scope: 'scope', + token_type: 'bearer', + }; + }, + }; + }); + const gitGetUserResponse = jest.fn(); + gitGetUserResponse.mockImplementation(() => { + return { + json: () => { + return { + name: 'SSO UserGit', + email: 'ssoUserGit@tooljet.io', + }; + }, + }; + }); - const response = await request(app.getHttpServer()) - .post('/api/oauth/sign-in/' + sso_configs.id) - .send({ token }); + mockedGot.mockImplementationOnce(gitAuthResponse); + mockedGot.mockImplementationOnce(gitGetUserResponse); - expect(response.statusCode).toBe(201); - expect(Object.keys(response.body).sort()).toEqual( - [ - 'id', - 'email', - 'first_name', - 'last_name', - 'auth_token', - 'admin', - 'organization_id', - 'organization', - 'group_permissions', - 'app_group_permissions', - ].sort() - ); + const response = await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }); - const { - email, - first_name, - last_name, - admin, - group_permissions, - app_group_permissions, - organization_id, - organization, - } = response.body; + expect(response.statusCode).toBe(201); + expect(Object.keys(response.body).sort()).toEqual( + [ + 'id', + 'email', + 'first_name', + 'last_name', + 'auth_token', + 'admin', + 'organization_id', + 'organization', + 'group_permissions', + 'app_group_permissions', + ].sort() + ); - expect(email).toEqual('anotherUser1@tooljet.io'); - expect(first_name).toEqual('SSO'); - expect(last_name).toEqual('userExist'); - expect(admin).toBeFalsy(); - expect(organization_id).toBe(current_organization.id); - expect(organization).toBe(current_organization.name); - expect(group_permissions).toHaveLength(1); - expect(group_permissions[0].group).toEqual('all_users'); - expect(Object.keys(group_permissions[0]).sort()).toEqual( - [ - 'id', - 'organization_id', - 'group', - 'app_create', - 'app_delete', - 'updated_at', - 'created_at', - 'folder_create', - ].sort() - ); - expect(app_group_permissions).toHaveLength(0); + const { + email, + first_name, + last_name, + admin, + group_permissions, + app_group_permissions, + organization_id, + organization, + } = response.body; + + expect(email).toEqual('ssoUserGit@tooljet.io'); + expect(first_name).toEqual('SSO'); + expect(last_name).toEqual('UserGit'); + expect(admin).toBeFalsy(); + expect(organization_id).toBe(current_organization.id); + expect(organization).toBe(current_organization.name); + expect(group_permissions).toHaveLength(1); + expect(group_permissions[0].group).toEqual('all_users'); + expect(Object.keys(group_permissions[0]).sort()).toEqual( + [ + 'id', + 'organization_id', + 'group', + 'app_create', + 'app_delete', + 'updated_at', + 'created_at', + 'folder_create', + ].sort() + ); + expect(app_group_permissions).toHaveLength(0); + }); + + it('should return login info when the user does not exist and sign up is enabled', async () => { + const gitAuthResponse = jest.fn(); + gitAuthResponse.mockImplementation(() => { + return { + json: () => { + return { + access_token: 'some-access-token', + scope: 'scope', + token_type: 'bearer', + }; + }, + }; + }); + const gitGetUserResponse = jest.fn(); + gitGetUserResponse.mockImplementation(() => { + return { + json: () => { + return { + name: 'SSO UserGit', + email: 'ssoUserGit@tooljet.io', + }; + }, + }; + }); + + mockedGot.mockImplementationOnce(gitAuthResponse); + mockedGot.mockImplementationOnce(gitGetUserResponse); + + const response = await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }); + + expect(response.statusCode).toBe(201); + expect(Object.keys(response.body).sort()).toEqual( + [ + 'id', + 'email', + 'first_name', + 'last_name', + 'auth_token', + 'admin', + 'organization_id', + 'organization', + 'group_permissions', + 'app_group_permissions', + ].sort() + ); + + const { + email, + first_name, + last_name, + admin, + group_permissions, + app_group_permissions, + organization_id, + organization, + } = response.body; + + expect(email).toEqual('ssoUserGit@tooljet.io'); + expect(first_name).toEqual('SSO'); + expect(last_name).toEqual('UserGit'); + expect(admin).toBeFalsy(); + expect(organization_id).toBe(current_organization.id); + expect(organization).toBe(current_organization.name); + expect(group_permissions).toHaveLength(1); + expect(group_permissions[0].group).toEqual('all_users'); + expect(Object.keys(group_permissions[0]).sort()).toEqual( + [ + 'id', + 'organization_id', + 'group', + 'app_create', + 'app_delete', + 'updated_at', + 'created_at', + 'folder_create', + ].sort() + ); + expect(app_group_permissions).toHaveLength(0); + }); + it('should return login info when the user does not exist and name not available and sign up is enabled', async () => { + const gitAuthResponse = jest.fn(); + gitAuthResponse.mockImplementation(() => { + return { + json: () => { + return { + access_token: 'some-access-token', + scope: 'scope', + token_type: 'bearer', + }; + }, + }; + }); + const gitGetUserResponse = jest.fn(); + gitGetUserResponse.mockImplementation(() => { + return { + json: () => { + return { + name: '', + email: 'ssoUserGit@tooljet.io', + }; + }, + }; + }); + + mockedGot.mockImplementationOnce(gitAuthResponse); + mockedGot.mockImplementationOnce(gitGetUserResponse); + + const response = await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }); + + expect(response.statusCode).toBe(201); + expect(Object.keys(response.body).sort()).toEqual( + [ + 'id', + 'email', + 'first_name', + 'last_name', + 'auth_token', + 'admin', + 'organization_id', + 'organization', + 'group_permissions', + 'app_group_permissions', + ].sort() + ); + + const { email, first_name, admin, group_permissions, app_group_permissions, organization_id, organization } = + response.body; + + expect(email).toEqual('ssoUserGit@tooljet.io'); + expect(first_name).toEqual('ssoUserGit'); + expect(admin).toBeFalsy(); + expect(organization_id).toBe(current_organization.id); + expect(organization).toBe(current_organization.name); + expect(group_permissions).toHaveLength(1); + expect(group_permissions[0].group).toEqual('all_users'); + expect(Object.keys(group_permissions[0]).sort()).toEqual( + [ + 'id', + 'organization_id', + 'group', + 'app_create', + 'app_delete', + 'updated_at', + 'created_at', + 'folder_create', + ].sort() + ); + expect(app_group_permissions).toHaveLength(0); + }); + it('should return login info when the user does not exist and email id not available and sign up is enabled', async () => { + const gitAuthResponse = jest.fn(); + gitAuthResponse.mockImplementation(() => { + return { + json: () => { + return { + access_token: 'some-access-token', + scope: 'scope', + token_type: 'bearer', + }; + }, + }; + }); + const gitGetUserResponse = jest.fn(); + gitGetUserResponse.mockImplementation(() => { + return { + json: () => { + return { + name: '', + email: '', + }; + }, + }; + }); + const gitGetUserEmailResponse = jest.fn(); + gitGetUserEmailResponse.mockImplementation(() => { + return { + json: () => { + return [ + { + email: 'ssoUserGit@tooljet.io', + primary: true, + verified: true, + }, + { + email: 'ssoUserGit2@tooljet.io', + primary: false, + verified: true, + }, + ]; + }, + }; + }); + + mockedGot.mockImplementationOnce(gitAuthResponse); + mockedGot.mockImplementationOnce(gitGetUserResponse); + mockedGot.mockImplementationOnce(gitGetUserEmailResponse); + + const response = await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }); + + expect(response.statusCode).toBe(201); + expect(Object.keys(response.body).sort()).toEqual( + [ + 'id', + 'email', + 'first_name', + 'last_name', + 'auth_token', + 'admin', + 'organization_id', + 'organization', + 'group_permissions', + 'app_group_permissions', + ].sort() + ); + + const { email, first_name, admin, group_permissions, app_group_permissions, organization_id, organization } = + response.body; + + expect(email).toEqual('ssoUserGit@tooljet.io'); + expect(first_name).toEqual('ssoUserGit'); + expect(admin).toBeFalsy(); + expect(organization_id).toBe(current_organization.id); + expect(organization).toBe(current_organization.name); + expect(group_permissions).toHaveLength(1); + expect(group_permissions[0].group).toEqual('all_users'); + expect(Object.keys(group_permissions[0]).sort()).toEqual( + [ + 'id', + 'organization_id', + 'group', + 'app_create', + 'app_delete', + 'updated_at', + 'created_at', + 'folder_create', + ].sort() + ); + expect(app_group_permissions).toHaveLength(0); + }); + it('should return login info when the user exist', async () => { + await createUser(app, { + firstName: 'SSO', + lastName: 'userExist', + email: 'anotherUser1@tooljet.io', + groups: ['all_users'], + organization: current_organization, + status: 'active', + }); + + const gitAuthResponse = jest.fn(); + gitAuthResponse.mockImplementation(() => { + return { + json: () => { + return { + access_token: 'some-access-token', + scope: 'scope', + token_type: 'bearer', + }; + }, + }; + }); + const gitGetUserResponse = jest.fn(); + gitGetUserResponse.mockImplementation(() => { + return { + json: () => { + return { + name: 'SSO userExist', + email: 'anotherUser1@tooljet.io', + }; + }, + }; + }); + + mockedGot.mockImplementationOnce(gitAuthResponse); + mockedGot.mockImplementationOnce(gitGetUserResponse); + + const response = await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }); + + expect(response.statusCode).toBe(201); + expect(Object.keys(response.body).sort()).toEqual( + [ + 'id', + 'email', + 'first_name', + 'last_name', + 'auth_token', + 'admin', + 'organization_id', + 'organization', + 'group_permissions', + 'app_group_permissions', + ].sort() + ); + + const { + email, + first_name, + last_name, + admin, + group_permissions, + app_group_permissions, + organization_id, + organization, + } = response.body; + + expect(email).toEqual('anotherUser1@tooljet.io'); + expect(first_name).toEqual('SSO'); + expect(last_name).toEqual('userExist'); + expect(admin).toBeFalsy(); + expect(organization_id).toBe(current_organization.id); + expect(organization).toBe(current_organization.name); + expect(group_permissions).toHaveLength(1); + expect(group_permissions[0].group).toEqual('all_users'); + expect(Object.keys(group_permissions[0]).sort()).toEqual( + [ + 'id', + 'organization_id', + 'group', + 'app_create', + 'app_delete', + 'updated_at', + 'created_at', + 'folder_create', + ].sort() + ); + expect(app_group_permissions).toHaveLength(0); + }); }); }); }); diff --git a/server/test/controllers/organizations.e2e-spec.ts b/server/test/controllers/organizations.e2e-spec.ts index 98e9f842cd..972e182c6a 100644 --- a/server/test/controllers/organizations.e2e-spec.ts +++ b/server/test/controllers/organizations.e2e-spec.ts @@ -13,14 +13,6 @@ describe('organizations controller', () => { beforeEach(async () => { await clearDB(); - jest.spyOn(mockConfig, 'get').mockImplementation((key: string) => { - switch (key) { - case 'MULTI_ORGANIZATION': - return 'false'; - default: - return process.env[key]; - } - }); }); beforeAll(async () => { @@ -65,28 +57,20 @@ describe('organizations controller', () => { describe('create organization', () => { it('should allow only authenticated users to create organization', async () => { - await request(app.getHttpServer()).post('/api/organizations').send({ name: 'My organization' }).expect(401); + await request(app.getHttpServer()).post('/api/organizations').send({ name: 'My workspace' }).expect(401); }); - it('should create new organization if multi organization supported', async () => { - jest.spyOn(mockConfig, 'get').mockImplementation((key: string) => { - switch (key) { - case 'MULTI_ORGANIZATION': - return 'true'; - default: - return process.env[key]; - } - }); + it('should create new organization if Multi-Workspace supported', async () => { const { user, organization } = await createUser(app, { email: 'admin@tooljet.io', }); const response = await request(app.getHttpServer()) .post('/api/organizations') - .send({ name: 'My organization' }) + .send({ name: 'My workspace' }) .set('Authorization', authHeaderForUser(user)); expect(response.statusCode).toBe(201); expect(response.body.organization_id).not.toBe(organization.id); - expect(response.body.organization).toBe('My organization'); + expect(response.body.organization).toBe('My workspace'); expect(response.body.admin).toBeTruthy(); const newUser = await userRepository.findOneOrFail({ where: { id: user.id } }); @@ -94,14 +78,6 @@ describe('organizations controller', () => { }); it('should throw error if name is empty', async () => { - jest.spyOn(mockConfig, 'get').mockImplementation((key: string) => { - switch (key) { - case 'MULTI_ORGANIZATION': - return 'true'; - default: - return process.env[key]; - } - }); const { user } = await createUser(app, { email: 'admin@tooljet.io' }); const response = await request(app.getHttpServer()) .post('/api/organizations') @@ -111,35 +87,35 @@ describe('organizations controller', () => { expect(response.statusCode).toBe(400); }); - it('should not create new organization if multi organization not supported', async () => { - const { user } = await createUser(app, { email: 'admin@tooljet.io' }); - await request(app.getHttpServer()) - .post('/api/organizations') - .send({ name: 'My organization' }) - .set('Authorization', authHeaderForUser(user)) - .expect(403); - }); - - it('should create new organization if multi organization supported and user logged in via SSO', async () => { + it('should not create new organization if Multi-Workspace not supported', async () => { jest.spyOn(mockConfig, 'get').mockImplementation((key: string) => { switch (key) { - case 'MULTI_ORGANIZATION': + case 'DISABLE_MULTI_WORKSPACE': return 'true'; default: return process.env[key]; } }); + const { user } = await createUser(app, { email: 'admin@tooljet.io' }); + await request(app.getHttpServer()) + .post('/api/organizations') + .send({ name: 'My workspace' }) + .set('Authorization', authHeaderForUser(user)) + .expect(403); + }); + + it('should create new organization if Multi-Workspace supported and user logged in via SSO', async () => { const { user, organization } = await createUser(app, { email: 'admin@tooljet.io', }); const response = await request(app.getHttpServer()) .post('/api/organizations') - .send({ name: 'My organization' }) + .send({ name: 'My workspace' }) .set('Authorization', authHeaderForUser(user, null, false)); expect(response.statusCode).toBe(201); expect(response.body.organization_id).not.toBe(organization.id); - expect(response.body.organization).toBe('My organization'); + expect(response.body.organization).toBe('My workspace'); expect(response.body.admin).toBeTruthy(); }); }); @@ -252,6 +228,14 @@ describe('organizations controller', () => { describe('get public organization configs', () => { it('should get organization details for all users for single organization', async () => { + jest.spyOn(mockConfig, 'get').mockImplementation((key: string) => { + switch (key) { + case 'DISABLE_MULTI_WORKSPACE': + return 'true'; + default: + return process.env[key]; + } + }); const { user } = await createUser(app, { email: 'admin@tooljet.io', }); @@ -291,14 +275,6 @@ describe('organizations controller', () => { }); it('should get organization specific details for all users for multiple organization deployment', async () => { - jest.spyOn(mockConfig, 'get').mockImplementation((key: string) => { - switch (key) { - case 'MULTI_ORGANIZATION': - return 'true'; - default: - return process.env[key]; - } - }); const { user, organization } = await createUser(app, { email: 'admin@tooljet.io', }); diff --git a/server/test/controllers/users.e2e-spec.ts b/server/test/controllers/users.e2e-spec.ts index 975ad27312..26d4b23774 100644 --- a/server/test/controllers/users.e2e-spec.ts +++ b/server/test/controllers/users.e2e-spec.ts @@ -12,22 +12,17 @@ describe('users controller', () => { beforeEach(async () => { await clearDB(); - jest.spyOn(mockConfig, 'get').mockImplementation((key: string) => { - switch (key) { - case 'DISABLE_SIGNUPS': - return 'false'; - case 'MULTI_ORGANIZATION': - return 'false'; - default: - return process.env[key]; - } - }); }); beforeAll(async () => { ({ app, mockConfig } = await createNestAppInstanceWithEnvMock()); }); + afterEach(() => { + jest.resetAllMocks(); + jest.clearAllMocks(); + }); + describe('PATCH /api/users/change_password', () => { it('should allow users to update their password', async () => { const userData = await createUser(app, { email: 'admin@tooljet.io' }); @@ -87,17 +82,7 @@ describe('users controller', () => { }); describe('POST /api/users/set_password_from_token', () => { - it('should allow users to setup account after sign up using multi organization', async () => { - jest.spyOn(mockConfig, 'get').mockImplementation((key: string) => { - switch (key) { - case 'DISABLE_SIGNUPS': - return 'false'; - case 'MULTI_ORGANIZATION': - return 'true'; - default: - return process.env[key]; - } - }); + it('should allow users to setup account after sign up using Multi-Workspace', async () => { const invitationToken = uuidv4(); const userData = await createUser(app, { email: 'signup@tooljet.io', @@ -125,17 +110,7 @@ describe('users controller', () => { expect(organizationUser.status).toEqual('active'); }); - it('should return error if required params are not present - multi organization', async () => { - jest.spyOn(mockConfig, 'get').mockImplementation((key: string) => { - switch (key) { - case 'DISABLE_SIGNUPS': - return 'false'; - case 'MULTI_ORGANIZATION': - return 'true'; - default: - return process.env[key]; - } - }); + it('should return error if required params are not present - Multi-Workspace', async () => { const invitationToken = uuidv4(); await createUser(app, { email: 'signup@tooljet.io', @@ -155,6 +130,14 @@ describe('users controller', () => { }); it('should not allow users to setup account for single organization', async () => { + jest.spyOn(mockConfig, 'get').mockImplementation((key: string) => { + switch (key) { + case 'DISABLE_MULTI_WORKSPACE': + return 'true'; + default: + return process.env[key]; + } + }); const invitationToken = uuidv4(); await createUser(app, { email: 'signup@tooljet.io', @@ -174,13 +157,11 @@ describe('users controller', () => { expect(response.statusCode).toBe(403); }); - it('should not allow users to setup account for multi organization and sign up disabled', async () => { + it('should not allow users to setup account for Multi-Workspace and sign up disabled', async () => { jest.spyOn(mockConfig, 'get').mockImplementation((key: string) => { switch (key) { case 'DISABLE_SIGNUPS': return 'true'; - case 'MULTI_ORGANIZATION': - return 'true'; default: return process.env[key]; } @@ -216,15 +197,6 @@ describe('users controller', () => { organization: org, }); - jest.spyOn(mockConfig, 'get').mockImplementation((key: string) => { - switch (key) { - case 'MULTI_ORGANIZATION': - return 'true'; - default: - return process.env[key]; - } - }); - const signUpResponse = await request(app.getHttpServer()) .post('/api/signup') .send({ email: 'invited@tooljet.io' }); @@ -269,15 +241,6 @@ describe('users controller', () => { organization: org, }); - jest.spyOn(mockConfig, 'get').mockImplementation((key: string) => { - switch (key) { - case 'MULTI_ORGANIZATION': - return 'true'; - default: - return process.env[key]; - } - }); - const signUpResponse = await request(app.getHttpServer()) .post('/api/signup') .send({ email: 'invited@tooljet.io' }); @@ -321,15 +284,7 @@ describe('users controller', () => { }); describe('POST /api/users/accept-invite', () => { - it('should allow users to accept invitation when multi organization is enabled', async () => { - jest.spyOn(mockConfig, 'get').mockImplementation((key: string) => { - switch (key) { - case 'MULTI_ORGANIZATION': - return 'true'; - default: - return process.env[key]; - } - }); + it('should allow users to accept invitation when Multi-Workspace is enabled', async () => { const userData = await createUser(app, { email: 'organizationUser@tooljet.io', status: 'invited', @@ -347,11 +302,11 @@ describe('users controller', () => { expect(organizationUser.status).toEqual('active'); }); - it('should allow users to accept invitation when multi organization is disabled', async () => { + it('should allow users to accept invitation when Multi-Workspace is disabled', async () => { jest.spyOn(mockConfig, 'get').mockImplementation((key: string) => { switch (key) { - case 'MULTI_ORGANIZATION': - return 'false'; + case 'DISABLE_MULTI_WORKSPACE': + return 'true'; default: return process.env[key]; }
Hi ${name || ''},
- ${sender} has invited you to use ToolJet organisation ${organisationName}. Use the link below to set up your account and get started. + ${sender} has invited you to use ToolJet workspace ${organisationName}. Use the link below to set up your account and get started.
${inviteUrl} diff --git a/server/src/services/seeds.service.ts b/server/src/services/seeds.service.ts index fe8599e721..e4938c596f 100644 --- a/server/src/services/seeds.service.ts +++ b/server/src/services/seeds.service.ts @@ -30,7 +30,7 @@ export class SeedsService { sso: 'form', }, ], - name: 'My organization', + name: 'My workspace', }); await manager.save(organization); diff --git a/server/test/controllers/app.e2e-spec.ts b/server/test/controllers/app.e2e-spec.ts index 74f9fa4f75..a712fcb4eb 100644 --- a/server/test/controllers/app.e2e-spec.ts +++ b/server/test/controllers/app.e2e-spec.ts @@ -38,6 +38,18 @@ describe('Authentication', () => { }); describe('Single organization', () => { + beforeEach(async () => { + jest.spyOn(mockConfig, 'get').mockImplementation((key: string) => { + switch (key) { + case 'DISABLE_SIGNUPS': + return 'false'; + case 'DISABLE_MULTI_WORKSPACE': + return 'true'; + default: + return process.env[key]; + } + }); + }); it('should create new users and organization', async () => { const response = await request(app.getHttpServer()).post('/api/signup').send({ email: 'test@tooljet.io' }); expect(response.statusCode).toBe(201); @@ -52,7 +64,7 @@ describe('Authentication', () => { }); expect(user.defaultOrganizationId).toBe(user?.organizationUsers?.[0]?.organizationId); - expect(organization.name).toBe('Untitled organization'); + expect(organization.name).toBe('Untitled workspace'); const groupPermissions = await user.groupPermissions; const groupNames = groupPermissions.map((x) => x.group); @@ -142,8 +154,6 @@ describe('Authentication', () => { switch (key) { case 'DISABLE_SIGNUPS': return 'false'; - case 'MULTI_ORGANIZATION': - return 'true'; default: return process.env[key]; } @@ -155,8 +165,6 @@ describe('Authentication', () => { switch (key) { case 'DISABLE_SIGNUPS': return 'true'; - case 'MULTI_ORGANIZATION': - return 'true'; default: return process.env[key]; } @@ -182,7 +190,7 @@ describe('Authentication', () => { }); expect(user.defaultOrganizationId).toBe(user?.organizationUsers?.[0]?.organizationId); - expect(organization?.name).toBe('Untitled organization'); + expect(organization?.name).toBe('Untitled workspace'); const groupPermissions = await user.groupPermissions; const groupNames = groupPermissions.map((x) => x.group); @@ -255,7 +263,7 @@ describe('Authentication', () => { .send({ email: 'admin@tooljet.io', password: 'password' }); expect(response.statusCode).toBe(201); expect(response.body.organization_id).not.toBe(current_organization.id); - expect(response.body.organization).toBe('Untitled organization'); + expect(response.body.organization).toBe('Untitled workspace'); }); it('should be able to switch between organizations with admin privilage', async () => { const { organization: invited_organization } = await createUser( diff --git a/server/test/controllers/oauth.e2e-spec.ts b/server/test/controllers/oauth.e2e-spec.ts index 1d043ee4d0..5ea15f6438 100644 --- a/server/test/controllers/oauth.e2e-spec.ts +++ b/server/test/controllers/oauth.e2e-spec.ts @@ -19,13 +19,6 @@ describe('oauth controller', () => { beforeEach(async () => { await clearDB(); - jest.spyOn(mockConfig, 'get').mockImplementation((key: string) => { - if (key === 'MULTI_ORGANIZATION') { - return 'false'; - } else { - return process.env[key]; - } - }); }); beforeAll(async () => { @@ -57,917 +50,1844 @@ describe('oauth controller', () => { current_organization = organization; }); - describe('sign in via Google OAuth', () => { - let sso_configs; - const token = 'some-Token'; - beforeEach(() => { - sso_configs = current_organization.ssoConfigs.find((conf) => conf.sso === 'google'); - }); - it('should return 401 if google sign in is disabled', async () => { - await ssoConfigsRepository.update(sso_configs.id, { enabled: false }); - await request(app.getHttpServer()) - .post('/api/oauth/sign-in/' + sso_configs.id) - .send({ token }) - .expect(401); - }); - - it('should return 401 when the user does not exist and sign up is disabled', async () => { - await orgRepository.update(current_organization.id, { enableSignUp: false }); - const googleVerifyMock = jest.spyOn(OAuth2Client.prototype, 'verifyIdToken'); - googleVerifyMock.mockImplementation(() => ({ - getPayload: () => ({ - sub: 'someSSOId', - email: 'ssoUser@tooljet.io', - name: 'SSO User', - hd: 'tooljet.io', - }), - })); - await request(app.getHttpServer()) - .post('/api/oauth/sign-in/' + sso_configs.id) - .send({ token }) - .expect(401); - }); - - it('should return 401 when the user does not exist domain mismatch', async () => { - await orgRepository.update(current_organization.id, { domain: 'tooljet.io,tooljet.com' }); - const googleVerifyMock = jest.spyOn(OAuth2Client.prototype, 'verifyIdToken'); - googleVerifyMock.mockImplementation(() => ({ - getPayload: () => ({ - sub: 'someSSOId', - email: 'ssoUser@tooljett.io', - name: 'SSO User', - hd: 'tooljet.io', - }), - })); - await request(app.getHttpServer()) - .post('/api/oauth/sign-in/' + sso_configs.id) - .send({ token }) - .expect(401); - }); - - it('should return login info when the user does not exist and domain matches and sign up is enabled', async () => { - await orgRepository.update(current_organization.id, { domain: 'tooljet.io,tooljet.com' }); - const googleVerifyMock = jest.spyOn(OAuth2Client.prototype, 'verifyIdToken'); - googleVerifyMock.mockImplementation(() => ({ - getPayload: () => ({ - sub: 'someSSOId', - email: 'ssoUser@tooljet.io', - name: 'SSO User', - hd: 'tooljet.io', - }), - })); - - const response = await request(app.getHttpServer()) - .post('/api/oauth/sign-in/' + sso_configs.id) - .send({ token }); - - expect(googleVerifyMock).toHaveBeenCalledWith({ - idToken: token, - audience: sso_configs.configs.clientId, + describe('Multi-Workspace', () => { + describe('sign in via Google OAuth', () => { + let sso_configs; + const token = 'some-Token'; + beforeEach(() => { + sso_configs = current_organization.ssoConfigs.find((conf) => conf.sso === 'google'); + }); + it('should return 401 if google sign in is disabled', async () => { + await ssoConfigsRepository.update(sso_configs.id, { enabled: false }); + await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }) + .expect(401); }); - expect(response.statusCode).toBe(201); - expect(Object.keys(response.body).sort()).toEqual( - [ - 'id', - 'email', - 'first_name', - 'last_name', - 'auth_token', - 'admin', - 'organization_id', - 'organization', - 'group_permissions', - 'app_group_permissions', - ].sort() - ); - - const { - email, - first_name, - last_name, - admin, - group_permissions, - app_group_permissions, - organization_id, - organization, - } = response.body; - - expect(email).toEqual('ssoUser@tooljet.io'); - expect(first_name).toEqual('SSO'); - expect(last_name).toEqual('User'); - expect(admin).toBeFalsy(); - expect(organization_id).toBe(current_organization.id); - expect(organization).toBe(current_organization.name); - expect(group_permissions).toHaveLength(1); - expect(group_permissions[0].group).toEqual('all_users'); - expect(Object.keys(group_permissions[0]).sort()).toEqual( - [ - 'id', - 'organization_id', - 'group', - 'app_create', - 'app_delete', - 'updated_at', - 'created_at', - 'folder_create', - ].sort() - ); - expect(app_group_permissions).toHaveLength(0); - }); - - it('should return login info when the user does not exist and sign up is enabled', async () => { - const googleVerifyMock = jest.spyOn(OAuth2Client.prototype, 'verifyIdToken'); - googleVerifyMock.mockImplementation(() => ({ - getPayload: () => ({ - sub: 'someSSOId', - email: 'ssoUser@tooljet.io', - name: 'SSO User', - hd: 'tooljet.io', - }), - })); - - const response = await request(app.getHttpServer()) - .post('/api/oauth/sign-in/' + sso_configs.id) - .send({ token }); - - expect(googleVerifyMock).toHaveBeenCalledWith({ - idToken: token, - audience: sso_configs.configs.clientId, + it('should return 401 when the user does not exist and sign up is disabled', async () => { + await orgRepository.update(current_organization.id, { enableSignUp: false }); + const googleVerifyMock = jest.spyOn(OAuth2Client.prototype, 'verifyIdToken'); + googleVerifyMock.mockImplementation(() => ({ + getPayload: () => ({ + sub: 'someSSOId', + email: 'ssoUser@tooljet.io', + name: 'SSO User', + hd: 'tooljet.io', + }), + })); + await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }) + .expect(401); }); - expect(response.statusCode).toBe(201); - expect(Object.keys(response.body).sort()).toEqual( - [ - 'id', - 'email', - 'first_name', - 'last_name', - 'auth_token', - 'admin', - 'organization_id', - 'organization', - 'group_permissions', - 'app_group_permissions', - ].sort() - ); - - const { - email, - first_name, - last_name, - admin, - group_permissions, - app_group_permissions, - organization_id, - organization, - } = response.body; - - expect(email).toEqual('ssoUser@tooljet.io'); - expect(first_name).toEqual('SSO'); - expect(last_name).toEqual('User'); - expect(admin).toBeFalsy(); - expect(organization_id).toBe(current_organization.id); - expect(organization).toBe(current_organization.name); - expect(group_permissions).toHaveLength(1); - expect(group_permissions[0].group).toEqual('all_users'); - expect(Object.keys(group_permissions[0]).sort()).toEqual( - [ - 'id', - 'organization_id', - 'group', - 'app_create', - 'app_delete', - 'updated_at', - 'created_at', - 'folder_create', - ].sort() - ); - expect(app_group_permissions).toHaveLength(0); - }); - it('should return login info when the user does not exist and name not available and sign up is enabled', async () => { - const googleVerifyMock = jest.spyOn(OAuth2Client.prototype, 'verifyIdToken'); - googleVerifyMock.mockImplementation(() => ({ - getPayload: () => ({ - sub: 'someSSOId', - email: 'ssoUser@tooljet.io', - name: '', - hd: 'tooljet.io', - }), - })); - - const response = await request(app.getHttpServer()) - .post('/api/oauth/sign-in/' + sso_configs.id) - .send({ token }); - - expect(googleVerifyMock).toHaveBeenCalledWith({ - idToken: token, - audience: sso_configs.configs.clientId, + it('should return 401 when the user does not exist domain mismatch', async () => { + await orgRepository.update(current_organization.id, { domain: 'tooljet.io,tooljet.com' }); + const googleVerifyMock = jest.spyOn(OAuth2Client.prototype, 'verifyIdToken'); + googleVerifyMock.mockImplementation(() => ({ + getPayload: () => ({ + sub: 'someSSOId', + email: 'ssoUser@tooljett.io', + name: 'SSO User', + hd: 'tooljet.io', + }), + })); + await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }) + .expect(401); }); - expect(response.statusCode).toBe(201); - expect(Object.keys(response.body).sort()).toEqual( - [ - 'id', - 'email', - 'first_name', - 'last_name', - 'auth_token', - 'admin', - 'organization_id', - 'organization', - 'group_permissions', - 'app_group_permissions', - ].sort() - ); + it('should return login info when the user does not exist and domain matches and sign up is enabled', async () => { + await orgRepository.update(current_organization.id, { domain: 'tooljet.io,tooljet.com' }); + const googleVerifyMock = jest.spyOn(OAuth2Client.prototype, 'verifyIdToken'); + googleVerifyMock.mockImplementation(() => ({ + getPayload: () => ({ + sub: 'someSSOId', + email: 'ssoUser@tooljet.io', + name: 'SSO User', + hd: 'tooljet.io', + }), + })); - const { email, first_name, admin, group_permissions, app_group_permissions, organization_id, organization } = - response.body; + const response = await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }); - expect(email).toEqual('ssoUser@tooljet.io'); - expect(first_name).toEqual('ssoUser'); - expect(admin).toBeFalsy(); - expect(organization_id).toBe(current_organization.id); - expect(organization).toBe(current_organization.name); - expect(group_permissions).toHaveLength(1); - expect(group_permissions[0].group).toEqual('all_users'); - expect(Object.keys(group_permissions[0]).sort()).toEqual( - [ - 'id', - 'organization_id', - 'group', - 'app_create', - 'app_delete', - 'updated_at', - 'created_at', - 'folder_create', - ].sort() - ); - expect(app_group_permissions).toHaveLength(0); - }); - it('should return login info when the user exist', async () => { - await createUser(app, { - firstName: 'SSO', - lastName: 'userExist', - email: 'anotherUser1@tooljet.io', - groups: ['all_users'], - organization: current_organization, - status: 'active', + expect(googleVerifyMock).toHaveBeenCalledWith({ + idToken: token, + audience: sso_configs.configs.clientId, + }); + + expect(response.statusCode).toBe(201); + expect(Object.keys(response.body).sort()).toEqual( + [ + 'id', + 'email', + 'first_name', + 'last_name', + 'auth_token', + 'admin', + 'organization_id', + 'organization', + 'group_permissions', + 'app_group_permissions', + ].sort() + ); + + const { + email, + first_name, + last_name, + admin, + group_permissions, + app_group_permissions, + organization_id, + organization, + } = response.body; + + expect(email).toEqual('ssoUser@tooljet.io'); + expect(first_name).toEqual('SSO'); + expect(last_name).toEqual('User'); + expect(admin).toBeFalsy(); + expect(organization_id).toBe(current_organization.id); + expect(organization).toBe(current_organization.name); + expect(group_permissions).toHaveLength(1); + expect(group_permissions[0].group).toEqual('all_users'); + expect(Object.keys(group_permissions[0]).sort()).toEqual( + [ + 'id', + 'organization_id', + 'group', + 'app_create', + 'app_delete', + 'updated_at', + 'created_at', + 'folder_create', + ].sort() + ); + expect(app_group_permissions).toHaveLength(0); }); - const googleVerifyMock = jest.spyOn(OAuth2Client.prototype, 'verifyIdToken'); - googleVerifyMock.mockImplementation(() => ({ - getPayload: () => ({ - sub: 'someSSOId', + + it('should return login info when the user does not exist and sign up is enabled', async () => { + const googleVerifyMock = jest.spyOn(OAuth2Client.prototype, 'verifyIdToken'); + googleVerifyMock.mockImplementation(() => ({ + getPayload: () => ({ + sub: 'someSSOId', + email: 'ssoUser@tooljet.io', + name: 'SSO User', + hd: 'tooljet.io', + }), + })); + + const response = await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }); + + expect(googleVerifyMock).toHaveBeenCalledWith({ + idToken: token, + audience: sso_configs.configs.clientId, + }); + + expect(response.statusCode).toBe(201); + expect(Object.keys(response.body).sort()).toEqual( + [ + 'id', + 'email', + 'first_name', + 'last_name', + 'auth_token', + 'admin', + 'organization_id', + 'organization', + 'group_permissions', + 'app_group_permissions', + ].sort() + ); + + const { + email, + first_name, + last_name, + admin, + group_permissions, + app_group_permissions, + organization_id, + organization, + } = response.body; + + expect(email).toEqual('ssoUser@tooljet.io'); + expect(first_name).toEqual('SSO'); + expect(last_name).toEqual('User'); + expect(admin).toBeFalsy(); + expect(organization_id).toBe(current_organization.id); + expect(organization).toBe(current_organization.name); + expect(group_permissions).toHaveLength(1); + expect(group_permissions[0].group).toEqual('all_users'); + expect(Object.keys(group_permissions[0]).sort()).toEqual( + [ + 'id', + 'organization_id', + 'group', + 'app_create', + 'app_delete', + 'updated_at', + 'created_at', + 'folder_create', + ].sort() + ); + expect(app_group_permissions).toHaveLength(0); + }); + it('should return login info when the user does not exist and name not available and sign up is enabled', async () => { + const googleVerifyMock = jest.spyOn(OAuth2Client.prototype, 'verifyIdToken'); + googleVerifyMock.mockImplementation(() => ({ + getPayload: () => ({ + sub: 'someSSOId', + email: 'ssoUser@tooljet.io', + name: '', + hd: 'tooljet.io', + }), + })); + + const response = await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }); + + expect(googleVerifyMock).toHaveBeenCalledWith({ + idToken: token, + audience: sso_configs.configs.clientId, + }); + + expect(response.statusCode).toBe(201); + expect(Object.keys(response.body).sort()).toEqual( + [ + 'id', + 'email', + 'first_name', + 'last_name', + 'auth_token', + 'admin', + 'organization_id', + 'organization', + 'group_permissions', + 'app_group_permissions', + ].sort() + ); + + const { email, first_name, admin, group_permissions, app_group_permissions, organization_id, organization } = + response.body; + + expect(email).toEqual('ssoUser@tooljet.io'); + expect(first_name).toEqual('ssoUser'); + expect(admin).toBeFalsy(); + expect(organization_id).toBe(current_organization.id); + expect(organization).toBe(current_organization.name); + expect(group_permissions).toHaveLength(1); + expect(group_permissions[0].group).toEqual('all_users'); + expect(Object.keys(group_permissions[0]).sort()).toEqual( + [ + 'id', + 'organization_id', + 'group', + 'app_create', + 'app_delete', + 'updated_at', + 'created_at', + 'folder_create', + ].sort() + ); + expect(app_group_permissions).toHaveLength(0); + }); + it('should return login info when the user exist', async () => { + await createUser(app, { + firstName: 'SSO', + lastName: 'userExist', email: 'anotherUser1@tooljet.io', - name: 'SSO User', - hd: 'tooljet.io', - }), - })); + groups: ['all_users'], + organization: current_organization, + status: 'active', + }); + const googleVerifyMock = jest.spyOn(OAuth2Client.prototype, 'verifyIdToken'); + googleVerifyMock.mockImplementation(() => ({ + getPayload: () => ({ + sub: 'someSSOId', + email: 'anotherUser1@tooljet.io', + name: 'SSO User', + hd: 'tooljet.io', + }), + })); - const response = await request(app.getHttpServer()) - .post('/api/oauth/sign-in/' + sso_configs.id) - .send({ token }); + const response = await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }); - expect(googleVerifyMock).toHaveBeenCalledWith({ - idToken: token, - audience: sso_configs.configs.clientId, + expect(googleVerifyMock).toHaveBeenCalledWith({ + idToken: token, + audience: sso_configs.configs.clientId, + }); + + expect(response.statusCode).toBe(201); + expect(Object.keys(response.body).sort()).toEqual( + [ + 'id', + 'email', + 'first_name', + 'last_name', + 'auth_token', + 'admin', + 'organization_id', + 'organization', + 'group_permissions', + 'app_group_permissions', + ].sort() + ); + + const { + email, + first_name, + last_name, + admin, + group_permissions, + app_group_permissions, + organization_id, + organization, + } = response.body; + + expect(email).toEqual('anotherUser1@tooljet.io'); + expect(first_name).toEqual('SSO'); + expect(last_name).toEqual('userExist'); + expect(admin).toBeFalsy(); + expect(organization_id).toBe(current_organization.id); + expect(organization).toBe(current_organization.name); + expect(group_permissions).toHaveLength(1); + expect(group_permissions[0].group).toEqual('all_users'); + expect(Object.keys(group_permissions[0]).sort()).toEqual( + [ + 'id', + 'organization_id', + 'group', + 'app_create', + 'app_delete', + 'updated_at', + 'created_at', + 'folder_create', + ].sort() + ); + expect(app_group_permissions).toHaveLength(0); + }); + }); + describe('sign in via Git OAuth', () => { + let sso_configs; + const token = 'some-Token'; + beforeEach(() => { + sso_configs = current_organization.ssoConfigs.find((conf) => conf.sso === 'git'); + }); + it('should return 401 if git sign in is disabled', async () => { + await ssoConfigsRepository.update(sso_configs.id, { enabled: false }); + await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }) + .expect(401); }); - expect(response.statusCode).toBe(201); - expect(Object.keys(response.body).sort()).toEqual( - [ - 'id', - 'email', - 'first_name', - 'last_name', - 'auth_token', - 'admin', - 'organization_id', - 'organization', - 'group_permissions', - 'app_group_permissions', - ].sort() - ); + it('should return 401 when the user does not exist and sign up is disabled', async () => { + await orgRepository.update(current_organization.id, { enableSignUp: false }); + const gitAuthResponse = jest.fn(); + gitAuthResponse.mockImplementation(() => { + return { + json: () => { + return { + access_token: 'some-access-token', + scope: 'scope', + token_type: 'bearer', + }; + }, + }; + }); + const gitGetUserResponse = jest.fn(); + gitGetUserResponse.mockImplementation(() => { + return { + json: () => { + return { + name: 'SSO UserGit', + email: 'ssoUserGit@tooljet.io', + }; + }, + }; + }); - const { - email, - first_name, - last_name, - admin, - group_permissions, - app_group_permissions, - organization_id, - organization, - } = response.body; + mockedGot.mockImplementationOnce(gitAuthResponse); + mockedGot.mockImplementationOnce(gitGetUserResponse); + await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }) + .expect(401); + }); - expect(email).toEqual('anotherUser1@tooljet.io'); - expect(first_name).toEqual('SSO'); - expect(last_name).toEqual('userExist'); - expect(admin).toBeFalsy(); - expect(organization_id).toBe(current_organization.id); - expect(organization).toBe(current_organization.name); - expect(group_permissions).toHaveLength(1); - expect(group_permissions[0].group).toEqual('all_users'); - expect(Object.keys(group_permissions[0]).sort()).toEqual( - [ - 'id', - 'organization_id', - 'group', - 'app_create', - 'app_delete', - 'updated_at', - 'created_at', - 'folder_create', - ].sort() - ); - expect(app_group_permissions).toHaveLength(0); + it('should return 401 when the user does not exist domain mismatch', async () => { + await orgRepository.update(current_organization.id, { domain: 'tooljet.io,tooljet.com' }); + const gitAuthResponse = jest.fn(); + gitAuthResponse.mockImplementation(() => { + return { + json: () => { + return { + access_token: 'some-access-token', + scope: 'scope', + token_type: 'bearer', + }; + }, + }; + }); + const gitGetUserResponse = jest.fn(); + gitGetUserResponse.mockImplementation(() => { + return { + json: () => { + return { + name: 'SSO UserGit', + email: 'ssoUserGit@tooljett.io', + }; + }, + }; + }); + + mockedGot.mockImplementationOnce(gitAuthResponse); + mockedGot.mockImplementationOnce(gitGetUserResponse); + + await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }) + .expect(401); + }); + + it('should return login info when the user does not exist and domain matches and sign up is enabled', async () => { + await orgRepository.update(current_organization.id, { domain: 'tooljet.io,tooljet.com' }); + const gitAuthResponse = jest.fn(); + gitAuthResponse.mockImplementation(() => { + return { + json: () => { + return { + access_token: 'some-access-token', + scope: 'scope', + token_type: 'bearer', + }; + }, + }; + }); + const gitGetUserResponse = jest.fn(); + gitGetUserResponse.mockImplementation(() => { + return { + json: () => { + return { + name: 'SSO UserGit', + email: 'ssoUserGit@tooljet.io', + }; + }, + }; + }); + + mockedGot.mockImplementationOnce(gitAuthResponse); + mockedGot.mockImplementationOnce(gitGetUserResponse); + + const response = await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }); + + expect(response.statusCode).toBe(201); + expect(Object.keys(response.body).sort()).toEqual( + [ + 'id', + 'email', + 'first_name', + 'last_name', + 'auth_token', + 'admin', + 'organization_id', + 'organization', + 'group_permissions', + 'app_group_permissions', + ].sort() + ); + + const { + email, + first_name, + last_name, + admin, + group_permissions, + app_group_permissions, + organization_id, + organization, + } = response.body; + + expect(email).toEqual('ssoUserGit@tooljet.io'); + expect(first_name).toEqual('SSO'); + expect(last_name).toEqual('UserGit'); + expect(admin).toBeFalsy(); + expect(organization_id).toBe(current_organization.id); + expect(organization).toBe(current_organization.name); + expect(group_permissions).toHaveLength(1); + expect(group_permissions[0].group).toEqual('all_users'); + expect(Object.keys(group_permissions[0]).sort()).toEqual( + [ + 'id', + 'organization_id', + 'group', + 'app_create', + 'app_delete', + 'updated_at', + 'created_at', + 'folder_create', + ].sort() + ); + expect(app_group_permissions).toHaveLength(0); + }); + + it('should return login info when the user does not exist and domain includes spance matches and sign up is enabled', async () => { + await orgRepository.update(current_organization.id, { + domain: ' tooljet.io , tooljet.com, , , gmail.com', + }); + const gitAuthResponse = jest.fn(); + gitAuthResponse.mockImplementation(() => { + return { + json: () => { + return { + access_token: 'some-access-token', + scope: 'scope', + token_type: 'bearer', + }; + }, + }; + }); + const gitGetUserResponse = jest.fn(); + gitGetUserResponse.mockImplementation(() => { + return { + json: () => { + return { + name: 'SSO UserGit', + email: 'ssoUserGit@tooljet.io', + }; + }, + }; + }); + + mockedGot.mockImplementationOnce(gitAuthResponse); + mockedGot.mockImplementationOnce(gitGetUserResponse); + + const response = await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }); + + expect(response.statusCode).toBe(201); + expect(Object.keys(response.body).sort()).toEqual( + [ + 'id', + 'email', + 'first_name', + 'last_name', + 'auth_token', + 'admin', + 'organization_id', + 'organization', + 'group_permissions', + 'app_group_permissions', + ].sort() + ); + + const { + email, + first_name, + last_name, + admin, + group_permissions, + app_group_permissions, + organization_id, + organization, + } = response.body; + + expect(email).toEqual('ssoUserGit@tooljet.io'); + expect(first_name).toEqual('SSO'); + expect(last_name).toEqual('UserGit'); + expect(admin).toBeFalsy(); + expect(organization_id).toBe(current_organization.id); + expect(organization).toBe(current_organization.name); + expect(group_permissions).toHaveLength(1); + expect(group_permissions[0].group).toEqual('all_users'); + expect(Object.keys(group_permissions[0]).sort()).toEqual( + [ + 'id', + 'organization_id', + 'group', + 'app_create', + 'app_delete', + 'updated_at', + 'created_at', + 'folder_create', + ].sort() + ); + expect(app_group_permissions).toHaveLength(0); + }); + + it('should return login info when the user does not exist and sign up is enabled', async () => { + const gitAuthResponse = jest.fn(); + gitAuthResponse.mockImplementation(() => { + return { + json: () => { + return { + access_token: 'some-access-token', + scope: 'scope', + token_type: 'bearer', + }; + }, + }; + }); + const gitGetUserResponse = jest.fn(); + gitGetUserResponse.mockImplementation(() => { + return { + json: () => { + return { + name: 'SSO UserGit', + email: 'ssoUserGit@tooljet.io', + }; + }, + }; + }); + + mockedGot.mockImplementationOnce(gitAuthResponse); + mockedGot.mockImplementationOnce(gitGetUserResponse); + + const response = await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }); + + expect(response.statusCode).toBe(201); + expect(Object.keys(response.body).sort()).toEqual( + [ + 'id', + 'email', + 'first_name', + 'last_name', + 'auth_token', + 'admin', + 'organization_id', + 'organization', + 'group_permissions', + 'app_group_permissions', + ].sort() + ); + + const { + email, + first_name, + last_name, + admin, + group_permissions, + app_group_permissions, + organization_id, + organization, + } = response.body; + + expect(email).toEqual('ssoUserGit@tooljet.io'); + expect(first_name).toEqual('SSO'); + expect(last_name).toEqual('UserGit'); + expect(admin).toBeFalsy(); + expect(organization_id).toBe(current_organization.id); + expect(organization).toBe(current_organization.name); + expect(group_permissions).toHaveLength(1); + expect(group_permissions[0].group).toEqual('all_users'); + expect(Object.keys(group_permissions[0]).sort()).toEqual( + [ + 'id', + 'organization_id', + 'group', + 'app_create', + 'app_delete', + 'updated_at', + 'created_at', + 'folder_create', + ].sort() + ); + expect(app_group_permissions).toHaveLength(0); + }); + it('should return login info when the user does not exist and name not available and sign up is enabled', async () => { + const gitAuthResponse = jest.fn(); + gitAuthResponse.mockImplementation(() => { + return { + json: () => { + return { + access_token: 'some-access-token', + scope: 'scope', + token_type: 'bearer', + }; + }, + }; + }); + const gitGetUserResponse = jest.fn(); + gitGetUserResponse.mockImplementation(() => { + return { + json: () => { + return { + name: '', + email: 'ssoUserGit@tooljet.io', + }; + }, + }; + }); + + mockedGot.mockImplementationOnce(gitAuthResponse); + mockedGot.mockImplementationOnce(gitGetUserResponse); + + const response = await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }); + + expect(response.statusCode).toBe(201); + expect(Object.keys(response.body).sort()).toEqual( + [ + 'id', + 'email', + 'first_name', + 'last_name', + 'auth_token', + 'admin', + 'organization_id', + 'organization', + 'group_permissions', + 'app_group_permissions', + ].sort() + ); + + const { email, first_name, admin, group_permissions, app_group_permissions, organization_id, organization } = + response.body; + + expect(email).toEqual('ssoUserGit@tooljet.io'); + expect(first_name).toEqual('ssoUserGit'); + expect(admin).toBeFalsy(); + expect(organization_id).toBe(current_organization.id); + expect(organization).toBe(current_organization.name); + expect(group_permissions).toHaveLength(1); + expect(group_permissions[0].group).toEqual('all_users'); + expect(Object.keys(group_permissions[0]).sort()).toEqual( + [ + 'id', + 'organization_id', + 'group', + 'app_create', + 'app_delete', + 'updated_at', + 'created_at', + 'folder_create', + ].sort() + ); + expect(app_group_permissions).toHaveLength(0); + }); + it('should return login info when the user does not exist and email id not available and sign up is enabled', async () => { + const gitAuthResponse = jest.fn(); + gitAuthResponse.mockImplementation(() => { + return { + json: () => { + return { + access_token: 'some-access-token', + scope: 'scope', + token_type: 'bearer', + }; + }, + }; + }); + const gitGetUserResponse = jest.fn(); + gitGetUserResponse.mockImplementation(() => { + return { + json: () => { + return { + name: '', + email: '', + }; + }, + }; + }); + const gitGetUserEmailResponse = jest.fn(); + gitGetUserEmailResponse.mockImplementation(() => { + return { + json: () => { + return [ + { + email: 'ssoUserGit@tooljet.io', + primary: true, + verified: true, + }, + { + email: 'ssoUserGit2@tooljet.io', + primary: false, + verified: true, + }, + ]; + }, + }; + }); + + mockedGot.mockImplementationOnce(gitAuthResponse); + mockedGot.mockImplementationOnce(gitGetUserResponse); + mockedGot.mockImplementationOnce(gitGetUserEmailResponse); + + const response = await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }); + + expect(response.statusCode).toBe(201); + expect(Object.keys(response.body).sort()).toEqual( + [ + 'id', + 'email', + 'first_name', + 'last_name', + 'auth_token', + 'admin', + 'organization_id', + 'organization', + 'group_permissions', + 'app_group_permissions', + ].sort() + ); + + const { email, first_name, admin, group_permissions, app_group_permissions, organization_id, organization } = + response.body; + + expect(email).toEqual('ssoUserGit@tooljet.io'); + expect(first_name).toEqual('ssoUserGit'); + expect(admin).toBeFalsy(); + expect(organization_id).toBe(current_organization.id); + expect(organization).toBe(current_organization.name); + expect(group_permissions).toHaveLength(1); + expect(group_permissions[0].group).toEqual('all_users'); + expect(Object.keys(group_permissions[0]).sort()).toEqual( + [ + 'id', + 'organization_id', + 'group', + 'app_create', + 'app_delete', + 'updated_at', + 'created_at', + 'folder_create', + ].sort() + ); + expect(app_group_permissions).toHaveLength(0); + }); + it('should return login info when the user exist', async () => { + await createUser(app, { + firstName: 'SSO', + lastName: 'userExist', + email: 'anotherUser1@tooljet.io', + groups: ['all_users'], + organization: current_organization, + status: 'active', + }); + + const gitAuthResponse = jest.fn(); + gitAuthResponse.mockImplementation(() => { + return { + json: () => { + return { + access_token: 'some-access-token', + scope: 'scope', + token_type: 'bearer', + }; + }, + }; + }); + const gitGetUserResponse = jest.fn(); + gitGetUserResponse.mockImplementation(() => { + return { + json: () => { + return { + name: 'SSO userExist', + email: 'anotherUser1@tooljet.io', + }; + }, + }; + }); + + mockedGot.mockImplementationOnce(gitAuthResponse); + mockedGot.mockImplementationOnce(gitGetUserResponse); + + const response = await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }); + + expect(response.statusCode).toBe(201); + expect(Object.keys(response.body).sort()).toEqual( + [ + 'id', + 'email', + 'first_name', + 'last_name', + 'auth_token', + 'admin', + 'organization_id', + 'organization', + 'group_permissions', + 'app_group_permissions', + ].sort() + ); + + const { + email, + first_name, + last_name, + admin, + group_permissions, + app_group_permissions, + organization_id, + organization, + } = response.body; + + expect(email).toEqual('anotherUser1@tooljet.io'); + expect(first_name).toEqual('SSO'); + expect(last_name).toEqual('userExist'); + expect(admin).toBeFalsy(); + expect(organization_id).toBe(current_organization.id); + expect(organization).toBe(current_organization.name); + expect(group_permissions).toHaveLength(1); + expect(group_permissions[0].group).toEqual('all_users'); + expect(Object.keys(group_permissions[0]).sort()).toEqual( + [ + 'id', + 'organization_id', + 'group', + 'app_create', + 'app_delete', + 'updated_at', + 'created_at', + 'folder_create', + ].sort() + ); + expect(app_group_permissions).toHaveLength(0); + }); }); }); - describe('sign in via Git OAuth', () => { - let sso_configs; - const token = 'some-Token'; - beforeEach(() => { - sso_configs = current_organization.ssoConfigs.find((conf) => conf.sso === 'git'); + + describe('Multi-Workspace Disabled', () => { + beforeEach(async () => { + jest.spyOn(mockConfig, 'get').mockImplementation((key: string) => { + if (key === 'DISABLE_MULTI_WORKSPACE') { + return 'true'; + } else { + return process.env[key]; + } + }); }); - it('should return 401 if git sign in is disabled', async () => { - await ssoConfigsRepository.update(sso_configs.id, { enabled: false }); - await request(app.getHttpServer()) - .post('/api/oauth/sign-in/' + sso_configs.id) - .send({ token }) - .expect(401); + describe('sign in via Google OAuth', () => { + let sso_configs; + const token = 'some-Token'; + beforeEach(() => { + sso_configs = current_organization.ssoConfigs.find((conf) => conf.sso === 'google'); + }); + it('should return 401 if google sign in is disabled', async () => { + await ssoConfigsRepository.update(sso_configs.id, { enabled: false }); + await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }) + .expect(401); + }); + + it('should return 401 when the user does not exist and sign up is disabled', async () => { + await orgRepository.update(current_organization.id, { enableSignUp: false }); + const googleVerifyMock = jest.spyOn(OAuth2Client.prototype, 'verifyIdToken'); + googleVerifyMock.mockImplementation(() => ({ + getPayload: () => ({ + sub: 'someSSOId', + email: 'ssoUser@tooljet.io', + name: 'SSO User', + hd: 'tooljet.io', + }), + })); + await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }) + .expect(401); + }); + + it('should return 401 when the user does not exist domain mismatch', async () => { + await orgRepository.update(current_organization.id, { domain: 'tooljet.io,tooljet.com' }); + const googleVerifyMock = jest.spyOn(OAuth2Client.prototype, 'verifyIdToken'); + googleVerifyMock.mockImplementation(() => ({ + getPayload: () => ({ + sub: 'someSSOId', + email: 'ssoUser@tooljett.io', + name: 'SSO User', + hd: 'tooljet.io', + }), + })); + await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }) + .expect(401); + }); + + it('should return login info when the user does not exist and domain matches and sign up is enabled', async () => { + await orgRepository.update(current_organization.id, { domain: 'tooljet.io,tooljet.com' }); + const googleVerifyMock = jest.spyOn(OAuth2Client.prototype, 'verifyIdToken'); + googleVerifyMock.mockImplementation(() => ({ + getPayload: () => ({ + sub: 'someSSOId', + email: 'ssoUser@tooljet.io', + name: 'SSO User', + hd: 'tooljet.io', + }), + })); + + const response = await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }); + + expect(googleVerifyMock).toHaveBeenCalledWith({ + idToken: token, + audience: sso_configs.configs.clientId, + }); + + expect(response.statusCode).toBe(201); + expect(Object.keys(response.body).sort()).toEqual( + [ + 'id', + 'email', + 'first_name', + 'last_name', + 'auth_token', + 'admin', + 'organization_id', + 'organization', + 'group_permissions', + 'app_group_permissions', + ].sort() + ); + + const { + email, + first_name, + last_name, + admin, + group_permissions, + app_group_permissions, + organization_id, + organization, + } = response.body; + + expect(email).toEqual('ssoUser@tooljet.io'); + expect(first_name).toEqual('SSO'); + expect(last_name).toEqual('User'); + expect(admin).toBeFalsy(); + expect(organization_id).toBe(current_organization.id); + expect(organization).toBe(current_organization.name); + expect(group_permissions).toHaveLength(1); + expect(group_permissions[0].group).toEqual('all_users'); + expect(Object.keys(group_permissions[0]).sort()).toEqual( + [ + 'id', + 'organization_id', + 'group', + 'app_create', + 'app_delete', + 'updated_at', + 'created_at', + 'folder_create', + ].sort() + ); + expect(app_group_permissions).toHaveLength(0); + }); + + it('should return login info when the user does not exist and sign up is enabled', async () => { + const googleVerifyMock = jest.spyOn(OAuth2Client.prototype, 'verifyIdToken'); + googleVerifyMock.mockImplementation(() => ({ + getPayload: () => ({ + sub: 'someSSOId', + email: 'ssoUser@tooljet.io', + name: 'SSO User', + hd: 'tooljet.io', + }), + })); + + const response = await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }); + + expect(googleVerifyMock).toHaveBeenCalledWith({ + idToken: token, + audience: sso_configs.configs.clientId, + }); + + expect(response.statusCode).toBe(201); + expect(Object.keys(response.body).sort()).toEqual( + [ + 'id', + 'email', + 'first_name', + 'last_name', + 'auth_token', + 'admin', + 'organization_id', + 'organization', + 'group_permissions', + 'app_group_permissions', + ].sort() + ); + + const { + email, + first_name, + last_name, + admin, + group_permissions, + app_group_permissions, + organization_id, + organization, + } = response.body; + + expect(email).toEqual('ssoUser@tooljet.io'); + expect(first_name).toEqual('SSO'); + expect(last_name).toEqual('User'); + expect(admin).toBeFalsy(); + expect(organization_id).toBe(current_organization.id); + expect(organization).toBe(current_organization.name); + expect(group_permissions).toHaveLength(1); + expect(group_permissions[0].group).toEqual('all_users'); + expect(Object.keys(group_permissions[0]).sort()).toEqual( + [ + 'id', + 'organization_id', + 'group', + 'app_create', + 'app_delete', + 'updated_at', + 'created_at', + 'folder_create', + ].sort() + ); + expect(app_group_permissions).toHaveLength(0); + }); + it('should return login info when the user does not exist and name not available and sign up is enabled', async () => { + const googleVerifyMock = jest.spyOn(OAuth2Client.prototype, 'verifyIdToken'); + googleVerifyMock.mockImplementation(() => ({ + getPayload: () => ({ + sub: 'someSSOId', + email: 'ssoUser@tooljet.io', + name: '', + hd: 'tooljet.io', + }), + })); + + const response = await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }); + + expect(googleVerifyMock).toHaveBeenCalledWith({ + idToken: token, + audience: sso_configs.configs.clientId, + }); + + expect(response.statusCode).toBe(201); + expect(Object.keys(response.body).sort()).toEqual( + [ + 'id', + 'email', + 'first_name', + 'last_name', + 'auth_token', + 'admin', + 'organization_id', + 'organization', + 'group_permissions', + 'app_group_permissions', + ].sort() + ); + + const { email, first_name, admin, group_permissions, app_group_permissions, organization_id, organization } = + response.body; + + expect(email).toEqual('ssoUser@tooljet.io'); + expect(first_name).toEqual('ssoUser'); + expect(admin).toBeFalsy(); + expect(organization_id).toBe(current_organization.id); + expect(organization).toBe(current_organization.name); + expect(group_permissions).toHaveLength(1); + expect(group_permissions[0].group).toEqual('all_users'); + expect(Object.keys(group_permissions[0]).sort()).toEqual( + [ + 'id', + 'organization_id', + 'group', + 'app_create', + 'app_delete', + 'updated_at', + 'created_at', + 'folder_create', + ].sort() + ); + expect(app_group_permissions).toHaveLength(0); + }); + it('should return login info when the user exist', async () => { + await createUser(app, { + firstName: 'SSO', + lastName: 'userExist', + email: 'anotherUser1@tooljet.io', + groups: ['all_users'], + organization: current_organization, + status: 'active', + }); + const googleVerifyMock = jest.spyOn(OAuth2Client.prototype, 'verifyIdToken'); + googleVerifyMock.mockImplementation(() => ({ + getPayload: () => ({ + sub: 'someSSOId', + email: 'anotherUser1@tooljet.io', + name: 'SSO User', + hd: 'tooljet.io', + }), + })); + + const response = await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }); + + expect(googleVerifyMock).toHaveBeenCalledWith({ + idToken: token, + audience: sso_configs.configs.clientId, + }); + + expect(response.statusCode).toBe(201); + expect(Object.keys(response.body).sort()).toEqual( + [ + 'id', + 'email', + 'first_name', + 'last_name', + 'auth_token', + 'admin', + 'organization_id', + 'organization', + 'group_permissions', + 'app_group_permissions', + ].sort() + ); + + const { + email, + first_name, + last_name, + admin, + group_permissions, + app_group_permissions, + organization_id, + organization, + } = response.body; + + expect(email).toEqual('anotherUser1@tooljet.io'); + expect(first_name).toEqual('SSO'); + expect(last_name).toEqual('userExist'); + expect(admin).toBeFalsy(); + expect(organization_id).toBe(current_organization.id); + expect(organization).toBe(current_organization.name); + expect(group_permissions).toHaveLength(1); + expect(group_permissions[0].group).toEqual('all_users'); + expect(Object.keys(group_permissions[0]).sort()).toEqual( + [ + 'id', + 'organization_id', + 'group', + 'app_create', + 'app_delete', + 'updated_at', + 'created_at', + 'folder_create', + ].sort() + ); + expect(app_group_permissions).toHaveLength(0); + }); }); - - it('should return 401 when the user does not exist and sign up is disabled', async () => { - await orgRepository.update(current_organization.id, { enableSignUp: false }); - const gitAuthResponse = jest.fn(); - gitAuthResponse.mockImplementation(() => { - return { - json: () => { - return { - access_token: 'some-access-token', - scope: 'scope', - token_type: 'bearer', - }; - }, - }; + describe('sign in via Git OAuth', () => { + let sso_configs; + const token = 'some-Token'; + beforeEach(() => { + sso_configs = current_organization.ssoConfigs.find((conf) => conf.sso === 'git'); }); - const gitGetUserResponse = jest.fn(); - gitGetUserResponse.mockImplementation(() => { - return { - json: () => { - return { - name: 'SSO UserGit', - email: 'ssoUserGit@tooljet.io', - }; - }, - }; + it('should return 401 if git sign in is disabled', async () => { + await ssoConfigsRepository.update(sso_configs.id, { enabled: false }); + await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }) + .expect(401); }); - mockedGot.mockImplementationOnce(gitAuthResponse); - mockedGot.mockImplementationOnce(gitGetUserResponse); - await request(app.getHttpServer()) - .post('/api/oauth/sign-in/' + sso_configs.id) - .send({ token }) - .expect(401); - }); - - it('should return 401 when the user does not exist domain mismatch', async () => { - await orgRepository.update(current_organization.id, { domain: 'tooljet.io,tooljet.com' }); - const gitAuthResponse = jest.fn(); - gitAuthResponse.mockImplementation(() => { - return { - json: () => { - return { - access_token: 'some-access-token', - scope: 'scope', - token_type: 'bearer', - }; - }, - }; - }); - const gitGetUserResponse = jest.fn(); - gitGetUserResponse.mockImplementation(() => { - return { - json: () => { - return { - name: 'SSO UserGit', - email: 'ssoUserGit@tooljett.io', - }; - }, - }; - }); - - mockedGot.mockImplementationOnce(gitAuthResponse); - mockedGot.mockImplementationOnce(gitGetUserResponse); - - await request(app.getHttpServer()) - .post('/api/oauth/sign-in/' + sso_configs.id) - .send({ token }) - .expect(401); - }); - - it('should return login info when the user does not exist and domain matches and sign up is enabled', async () => { - await orgRepository.update(current_organization.id, { domain: 'tooljet.io,tooljet.com' }); - const gitAuthResponse = jest.fn(); - gitAuthResponse.mockImplementation(() => { - return { - json: () => { - return { - access_token: 'some-access-token', - scope: 'scope', - token_type: 'bearer', - }; - }, - }; - }); - const gitGetUserResponse = jest.fn(); - gitGetUserResponse.mockImplementation(() => { - return { - json: () => { - return { - name: 'SSO UserGit', - email: 'ssoUserGit@tooljet.io', - }; - }, - }; - }); - - mockedGot.mockImplementationOnce(gitAuthResponse); - mockedGot.mockImplementationOnce(gitGetUserResponse); - - const response = await request(app.getHttpServer()) - .post('/api/oauth/sign-in/' + sso_configs.id) - .send({ token }); - - expect(response.statusCode).toBe(201); - expect(Object.keys(response.body).sort()).toEqual( - [ - 'id', - 'email', - 'first_name', - 'last_name', - 'auth_token', - 'admin', - 'organization_id', - 'organization', - 'group_permissions', - 'app_group_permissions', - ].sort() - ); - - const { - email, - first_name, - last_name, - admin, - group_permissions, - app_group_permissions, - organization_id, - organization, - } = response.body; - - expect(email).toEqual('ssoUserGit@tooljet.io'); - expect(first_name).toEqual('SSO'); - expect(last_name).toEqual('UserGit'); - expect(admin).toBeFalsy(); - expect(organization_id).toBe(current_organization.id); - expect(organization).toBe(current_organization.name); - expect(group_permissions).toHaveLength(1); - expect(group_permissions[0].group).toEqual('all_users'); - expect(Object.keys(group_permissions[0]).sort()).toEqual( - [ - 'id', - 'organization_id', - 'group', - 'app_create', - 'app_delete', - 'updated_at', - 'created_at', - 'folder_create', - ].sort() - ); - expect(app_group_permissions).toHaveLength(0); - }); - - it('should return login info when the user does not exist and domain includes spance matches and sign up is enabled', async () => { - await orgRepository.update(current_organization.id, { - domain: ' tooljet.io , tooljet.com, , , gmail.com', - }); - const gitAuthResponse = jest.fn(); - gitAuthResponse.mockImplementation(() => { - return { - json: () => { - return { - access_token: 'some-access-token', - scope: 'scope', - token_type: 'bearer', - }; - }, - }; - }); - const gitGetUserResponse = jest.fn(); - gitGetUserResponse.mockImplementation(() => { - return { - json: () => { - return { - name: 'SSO UserGit', - email: 'ssoUserGit@tooljet.io', - }; - }, - }; - }); - - mockedGot.mockImplementationOnce(gitAuthResponse); - mockedGot.mockImplementationOnce(gitGetUserResponse); - - const response = await request(app.getHttpServer()) - .post('/api/oauth/sign-in/' + sso_configs.id) - .send({ token }); - - expect(response.statusCode).toBe(201); - expect(Object.keys(response.body).sort()).toEqual( - [ - 'id', - 'email', - 'first_name', - 'last_name', - 'auth_token', - 'admin', - 'organization_id', - 'organization', - 'group_permissions', - 'app_group_permissions', - ].sort() - ); - - const { - email, - first_name, - last_name, - admin, - group_permissions, - app_group_permissions, - organization_id, - organization, - } = response.body; - - expect(email).toEqual('ssoUserGit@tooljet.io'); - expect(first_name).toEqual('SSO'); - expect(last_name).toEqual('UserGit'); - expect(admin).toBeFalsy(); - expect(organization_id).toBe(current_organization.id); - expect(organization).toBe(current_organization.name); - expect(group_permissions).toHaveLength(1); - expect(group_permissions[0].group).toEqual('all_users'); - expect(Object.keys(group_permissions[0]).sort()).toEqual( - [ - 'id', - 'organization_id', - 'group', - 'app_create', - 'app_delete', - 'updated_at', - 'created_at', - 'folder_create', - ].sort() - ); - expect(app_group_permissions).toHaveLength(0); - }); - - it('should return login info when the user does not exist and sign up is enabled', async () => { - const gitAuthResponse = jest.fn(); - gitAuthResponse.mockImplementation(() => { - return { - json: () => { - return { - access_token: 'some-access-token', - scope: 'scope', - token_type: 'bearer', - }; - }, - }; - }); - const gitGetUserResponse = jest.fn(); - gitGetUserResponse.mockImplementation(() => { - return { - json: () => { - return { - name: 'SSO UserGit', - email: 'ssoUserGit@tooljet.io', - }; - }, - }; - }); - - mockedGot.mockImplementationOnce(gitAuthResponse); - mockedGot.mockImplementationOnce(gitGetUserResponse); - - const response = await request(app.getHttpServer()) - .post('/api/oauth/sign-in/' + sso_configs.id) - .send({ token }); - - expect(response.statusCode).toBe(201); - expect(Object.keys(response.body).sort()).toEqual( - [ - 'id', - 'email', - 'first_name', - 'last_name', - 'auth_token', - 'admin', - 'organization_id', - 'organization', - 'group_permissions', - 'app_group_permissions', - ].sort() - ); - - const { - email, - first_name, - last_name, - admin, - group_permissions, - app_group_permissions, - organization_id, - organization, - } = response.body; - - expect(email).toEqual('ssoUserGit@tooljet.io'); - expect(first_name).toEqual('SSO'); - expect(last_name).toEqual('UserGit'); - expect(admin).toBeFalsy(); - expect(organization_id).toBe(current_organization.id); - expect(organization).toBe(current_organization.name); - expect(group_permissions).toHaveLength(1); - expect(group_permissions[0].group).toEqual('all_users'); - expect(Object.keys(group_permissions[0]).sort()).toEqual( - [ - 'id', - 'organization_id', - 'group', - 'app_create', - 'app_delete', - 'updated_at', - 'created_at', - 'folder_create', - ].sort() - ); - expect(app_group_permissions).toHaveLength(0); - }); - it('should return login info when the user does not exist and name not available and sign up is enabled', async () => { - const gitAuthResponse = jest.fn(); - gitAuthResponse.mockImplementation(() => { - return { - json: () => { - return { - access_token: 'some-access-token', - scope: 'scope', - token_type: 'bearer', - }; - }, - }; - }); - const gitGetUserResponse = jest.fn(); - gitGetUserResponse.mockImplementation(() => { - return { - json: () => { - return { - name: '', - email: 'ssoUserGit@tooljet.io', - }; - }, - }; - }); - - mockedGot.mockImplementationOnce(gitAuthResponse); - mockedGot.mockImplementationOnce(gitGetUserResponse); - - const response = await request(app.getHttpServer()) - .post('/api/oauth/sign-in/' + sso_configs.id) - .send({ token }); - - expect(response.statusCode).toBe(201); - expect(Object.keys(response.body).sort()).toEqual( - [ - 'id', - 'email', - 'first_name', - 'last_name', - 'auth_token', - 'admin', - 'organization_id', - 'organization', - 'group_permissions', - 'app_group_permissions', - ].sort() - ); - - const { email, first_name, admin, group_permissions, app_group_permissions, organization_id, organization } = - response.body; - - expect(email).toEqual('ssoUserGit@tooljet.io'); - expect(first_name).toEqual('ssoUserGit'); - expect(admin).toBeFalsy(); - expect(organization_id).toBe(current_organization.id); - expect(organization).toBe(current_organization.name); - expect(group_permissions).toHaveLength(1); - expect(group_permissions[0].group).toEqual('all_users'); - expect(Object.keys(group_permissions[0]).sort()).toEqual( - [ - 'id', - 'organization_id', - 'group', - 'app_create', - 'app_delete', - 'updated_at', - 'created_at', - 'folder_create', - ].sort() - ); - expect(app_group_permissions).toHaveLength(0); - }); - it('should return login info when the user does not exist and email id not available and sign up is enabled', async () => { - const gitAuthResponse = jest.fn(); - gitAuthResponse.mockImplementation(() => { - return { - json: () => { - return { - access_token: 'some-access-token', - scope: 'scope', - token_type: 'bearer', - }; - }, - }; - }); - const gitGetUserResponse = jest.fn(); - gitGetUserResponse.mockImplementation(() => { - return { - json: () => { - return { - name: '', - email: '', - }; - }, - }; - }); - const gitGetUserEmailResponse = jest.fn(); - gitGetUserEmailResponse.mockImplementation(() => { - return { - json: () => { - return [ - { + it('should return 401 when the user does not exist and sign up is disabled', async () => { + await orgRepository.update(current_organization.id, { enableSignUp: false }); + const gitAuthResponse = jest.fn(); + gitAuthResponse.mockImplementation(() => { + return { + json: () => { + return { + access_token: 'some-access-token', + scope: 'scope', + token_type: 'bearer', + }; + }, + }; + }); + const gitGetUserResponse = jest.fn(); + gitGetUserResponse.mockImplementation(() => { + return { + json: () => { + return { + name: 'SSO UserGit', email: 'ssoUserGit@tooljet.io', - primary: true, - verified: true, - }, - { - email: 'ssoUserGit2@tooljet.io', - primary: false, - verified: true, - }, - ]; - }, - }; + }; + }, + }; + }); + + mockedGot.mockImplementationOnce(gitAuthResponse); + mockedGot.mockImplementationOnce(gitGetUserResponse); + await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }) + .expect(401); }); - mockedGot.mockImplementationOnce(gitAuthResponse); - mockedGot.mockImplementationOnce(gitGetUserResponse); - mockedGot.mockImplementationOnce(gitGetUserEmailResponse); + it('should return 401 when the user does not exist domain mismatch', async () => { + await orgRepository.update(current_organization.id, { domain: 'tooljet.io,tooljet.com' }); + const gitAuthResponse = jest.fn(); + gitAuthResponse.mockImplementation(() => { + return { + json: () => { + return { + access_token: 'some-access-token', + scope: 'scope', + token_type: 'bearer', + }; + }, + }; + }); + const gitGetUserResponse = jest.fn(); + gitGetUserResponse.mockImplementation(() => { + return { + json: () => { + return { + name: 'SSO UserGit', + email: 'ssoUserGit@tooljett.io', + }; + }, + }; + }); - const response = await request(app.getHttpServer()) - .post('/api/oauth/sign-in/' + sso_configs.id) - .send({ token }); + mockedGot.mockImplementationOnce(gitAuthResponse); + mockedGot.mockImplementationOnce(gitGetUserResponse); - expect(response.statusCode).toBe(201); - expect(Object.keys(response.body).sort()).toEqual( - [ - 'id', - 'email', - 'first_name', - 'last_name', - 'auth_token', - 'admin', - 'organization_id', - 'organization', - 'group_permissions', - 'app_group_permissions', - ].sort() - ); - - const { email, first_name, admin, group_permissions, app_group_permissions, organization_id, organization } = - response.body; - - expect(email).toEqual('ssoUserGit@tooljet.io'); - expect(first_name).toEqual('ssoUserGit'); - expect(admin).toBeFalsy(); - expect(organization_id).toBe(current_organization.id); - expect(organization).toBe(current_organization.name); - expect(group_permissions).toHaveLength(1); - expect(group_permissions[0].group).toEqual('all_users'); - expect(Object.keys(group_permissions[0]).sort()).toEqual( - [ - 'id', - 'organization_id', - 'group', - 'app_create', - 'app_delete', - 'updated_at', - 'created_at', - 'folder_create', - ].sort() - ); - expect(app_group_permissions).toHaveLength(0); - }); - it('should return login info when the user exist', async () => { - await createUser(app, { - firstName: 'SSO', - lastName: 'userExist', - email: 'anotherUser1@tooljet.io', - groups: ['all_users'], - organization: current_organization, - status: 'active', + await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }) + .expect(401); }); - const gitAuthResponse = jest.fn(); - gitAuthResponse.mockImplementation(() => { - return { - json: () => { - return { - access_token: 'some-access-token', - scope: 'scope', - token_type: 'bearer', - }; - }, - }; - }); - const gitGetUserResponse = jest.fn(); - gitGetUserResponse.mockImplementation(() => { - return { - json: () => { - return { - name: 'SSO userExist', - email: 'anotherUser1@tooljet.io', - }; - }, - }; + it('should return login info when the user does not exist and domain matches and sign up is enabled', async () => { + await orgRepository.update(current_organization.id, { domain: 'tooljet.io,tooljet.com' }); + const gitAuthResponse = jest.fn(); + gitAuthResponse.mockImplementation(() => { + return { + json: () => { + return { + access_token: 'some-access-token', + scope: 'scope', + token_type: 'bearer', + }; + }, + }; + }); + const gitGetUserResponse = jest.fn(); + gitGetUserResponse.mockImplementation(() => { + return { + json: () => { + return { + name: 'SSO UserGit', + email: 'ssoUserGit@tooljet.io', + }; + }, + }; + }); + + mockedGot.mockImplementationOnce(gitAuthResponse); + mockedGot.mockImplementationOnce(gitGetUserResponse); + + const response = await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }); + + expect(response.statusCode).toBe(201); + expect(Object.keys(response.body).sort()).toEqual( + [ + 'id', + 'email', + 'first_name', + 'last_name', + 'auth_token', + 'admin', + 'organization_id', + 'organization', + 'group_permissions', + 'app_group_permissions', + ].sort() + ); + + const { + email, + first_name, + last_name, + admin, + group_permissions, + app_group_permissions, + organization_id, + organization, + } = response.body; + + expect(email).toEqual('ssoUserGit@tooljet.io'); + expect(first_name).toEqual('SSO'); + expect(last_name).toEqual('UserGit'); + expect(admin).toBeFalsy(); + expect(organization_id).toBe(current_organization.id); + expect(organization).toBe(current_organization.name); + expect(group_permissions).toHaveLength(1); + expect(group_permissions[0].group).toEqual('all_users'); + expect(Object.keys(group_permissions[0]).sort()).toEqual( + [ + 'id', + 'organization_id', + 'group', + 'app_create', + 'app_delete', + 'updated_at', + 'created_at', + 'folder_create', + ].sort() + ); + expect(app_group_permissions).toHaveLength(0); }); - mockedGot.mockImplementationOnce(gitAuthResponse); - mockedGot.mockImplementationOnce(gitGetUserResponse); + it('should return login info when the user does not exist and domain includes spance matches and sign up is enabled', async () => { + await orgRepository.update(current_organization.id, { + domain: ' tooljet.io , tooljet.com, , , gmail.com', + }); + const gitAuthResponse = jest.fn(); + gitAuthResponse.mockImplementation(() => { + return { + json: () => { + return { + access_token: 'some-access-token', + scope: 'scope', + token_type: 'bearer', + }; + }, + }; + }); + const gitGetUserResponse = jest.fn(); + gitGetUserResponse.mockImplementation(() => { + return { + json: () => { + return { + name: 'SSO UserGit', + email: 'ssoUserGit@tooljet.io', + }; + }, + }; + }); - const response = await request(app.getHttpServer()) - .post('/api/oauth/sign-in/' + sso_configs.id) - .send({ token }); + mockedGot.mockImplementationOnce(gitAuthResponse); + mockedGot.mockImplementationOnce(gitGetUserResponse); - expect(response.statusCode).toBe(201); - expect(Object.keys(response.body).sort()).toEqual( - [ - 'id', - 'email', - 'first_name', - 'last_name', - 'auth_token', - 'admin', - 'organization_id', - 'organization', - 'group_permissions', - 'app_group_permissions', - ].sort() - ); + const response = await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }); - const { - email, - first_name, - last_name, - admin, - group_permissions, - app_group_permissions, - organization_id, - organization, - } = response.body; + expect(response.statusCode).toBe(201); + expect(Object.keys(response.body).sort()).toEqual( + [ + 'id', + 'email', + 'first_name', + 'last_name', + 'auth_token', + 'admin', + 'organization_id', + 'organization', + 'group_permissions', + 'app_group_permissions', + ].sort() + ); - expect(email).toEqual('anotherUser1@tooljet.io'); - expect(first_name).toEqual('SSO'); - expect(last_name).toEqual('userExist'); - expect(admin).toBeFalsy(); - expect(organization_id).toBe(current_organization.id); - expect(organization).toBe(current_organization.name); - expect(group_permissions).toHaveLength(1); - expect(group_permissions[0].group).toEqual('all_users'); - expect(Object.keys(group_permissions[0]).sort()).toEqual( - [ - 'id', - 'organization_id', - 'group', - 'app_create', - 'app_delete', - 'updated_at', - 'created_at', - 'folder_create', - ].sort() - ); - expect(app_group_permissions).toHaveLength(0); + const { + email, + first_name, + last_name, + admin, + group_permissions, + app_group_permissions, + organization_id, + organization, + } = response.body; + + expect(email).toEqual('ssoUserGit@tooljet.io'); + expect(first_name).toEqual('SSO'); + expect(last_name).toEqual('UserGit'); + expect(admin).toBeFalsy(); + expect(organization_id).toBe(current_organization.id); + expect(organization).toBe(current_organization.name); + expect(group_permissions).toHaveLength(1); + expect(group_permissions[0].group).toEqual('all_users'); + expect(Object.keys(group_permissions[0]).sort()).toEqual( + [ + 'id', + 'organization_id', + 'group', + 'app_create', + 'app_delete', + 'updated_at', + 'created_at', + 'folder_create', + ].sort() + ); + expect(app_group_permissions).toHaveLength(0); + }); + + it('should return login info when the user does not exist and sign up is enabled', async () => { + const gitAuthResponse = jest.fn(); + gitAuthResponse.mockImplementation(() => { + return { + json: () => { + return { + access_token: 'some-access-token', + scope: 'scope', + token_type: 'bearer', + }; + }, + }; + }); + const gitGetUserResponse = jest.fn(); + gitGetUserResponse.mockImplementation(() => { + return { + json: () => { + return { + name: 'SSO UserGit', + email: 'ssoUserGit@tooljet.io', + }; + }, + }; + }); + + mockedGot.mockImplementationOnce(gitAuthResponse); + mockedGot.mockImplementationOnce(gitGetUserResponse); + + const response = await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }); + + expect(response.statusCode).toBe(201); + expect(Object.keys(response.body).sort()).toEqual( + [ + 'id', + 'email', + 'first_name', + 'last_name', + 'auth_token', + 'admin', + 'organization_id', + 'organization', + 'group_permissions', + 'app_group_permissions', + ].sort() + ); + + const { + email, + first_name, + last_name, + admin, + group_permissions, + app_group_permissions, + organization_id, + organization, + } = response.body; + + expect(email).toEqual('ssoUserGit@tooljet.io'); + expect(first_name).toEqual('SSO'); + expect(last_name).toEqual('UserGit'); + expect(admin).toBeFalsy(); + expect(organization_id).toBe(current_organization.id); + expect(organization).toBe(current_organization.name); + expect(group_permissions).toHaveLength(1); + expect(group_permissions[0].group).toEqual('all_users'); + expect(Object.keys(group_permissions[0]).sort()).toEqual( + [ + 'id', + 'organization_id', + 'group', + 'app_create', + 'app_delete', + 'updated_at', + 'created_at', + 'folder_create', + ].sort() + ); + expect(app_group_permissions).toHaveLength(0); + }); + it('should return login info when the user does not exist and name not available and sign up is enabled', async () => { + const gitAuthResponse = jest.fn(); + gitAuthResponse.mockImplementation(() => { + return { + json: () => { + return { + access_token: 'some-access-token', + scope: 'scope', + token_type: 'bearer', + }; + }, + }; + }); + const gitGetUserResponse = jest.fn(); + gitGetUserResponse.mockImplementation(() => { + return { + json: () => { + return { + name: '', + email: 'ssoUserGit@tooljet.io', + }; + }, + }; + }); + + mockedGot.mockImplementationOnce(gitAuthResponse); + mockedGot.mockImplementationOnce(gitGetUserResponse); + + const response = await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }); + + expect(response.statusCode).toBe(201); + expect(Object.keys(response.body).sort()).toEqual( + [ + 'id', + 'email', + 'first_name', + 'last_name', + 'auth_token', + 'admin', + 'organization_id', + 'organization', + 'group_permissions', + 'app_group_permissions', + ].sort() + ); + + const { email, first_name, admin, group_permissions, app_group_permissions, organization_id, organization } = + response.body; + + expect(email).toEqual('ssoUserGit@tooljet.io'); + expect(first_name).toEqual('ssoUserGit'); + expect(admin).toBeFalsy(); + expect(organization_id).toBe(current_organization.id); + expect(organization).toBe(current_organization.name); + expect(group_permissions).toHaveLength(1); + expect(group_permissions[0].group).toEqual('all_users'); + expect(Object.keys(group_permissions[0]).sort()).toEqual( + [ + 'id', + 'organization_id', + 'group', + 'app_create', + 'app_delete', + 'updated_at', + 'created_at', + 'folder_create', + ].sort() + ); + expect(app_group_permissions).toHaveLength(0); + }); + it('should return login info when the user does not exist and email id not available and sign up is enabled', async () => { + const gitAuthResponse = jest.fn(); + gitAuthResponse.mockImplementation(() => { + return { + json: () => { + return { + access_token: 'some-access-token', + scope: 'scope', + token_type: 'bearer', + }; + }, + }; + }); + const gitGetUserResponse = jest.fn(); + gitGetUserResponse.mockImplementation(() => { + return { + json: () => { + return { + name: '', + email: '', + }; + }, + }; + }); + const gitGetUserEmailResponse = jest.fn(); + gitGetUserEmailResponse.mockImplementation(() => { + return { + json: () => { + return [ + { + email: 'ssoUserGit@tooljet.io', + primary: true, + verified: true, + }, + { + email: 'ssoUserGit2@tooljet.io', + primary: false, + verified: true, + }, + ]; + }, + }; + }); + + mockedGot.mockImplementationOnce(gitAuthResponse); + mockedGot.mockImplementationOnce(gitGetUserResponse); + mockedGot.mockImplementationOnce(gitGetUserEmailResponse); + + const response = await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }); + + expect(response.statusCode).toBe(201); + expect(Object.keys(response.body).sort()).toEqual( + [ + 'id', + 'email', + 'first_name', + 'last_name', + 'auth_token', + 'admin', + 'organization_id', + 'organization', + 'group_permissions', + 'app_group_permissions', + ].sort() + ); + + const { email, first_name, admin, group_permissions, app_group_permissions, organization_id, organization } = + response.body; + + expect(email).toEqual('ssoUserGit@tooljet.io'); + expect(first_name).toEqual('ssoUserGit'); + expect(admin).toBeFalsy(); + expect(organization_id).toBe(current_organization.id); + expect(organization).toBe(current_organization.name); + expect(group_permissions).toHaveLength(1); + expect(group_permissions[0].group).toEqual('all_users'); + expect(Object.keys(group_permissions[0]).sort()).toEqual( + [ + 'id', + 'organization_id', + 'group', + 'app_create', + 'app_delete', + 'updated_at', + 'created_at', + 'folder_create', + ].sort() + ); + expect(app_group_permissions).toHaveLength(0); + }); + it('should return login info when the user exist', async () => { + await createUser(app, { + firstName: 'SSO', + lastName: 'userExist', + email: 'anotherUser1@tooljet.io', + groups: ['all_users'], + organization: current_organization, + status: 'active', + }); + + const gitAuthResponse = jest.fn(); + gitAuthResponse.mockImplementation(() => { + return { + json: () => { + return { + access_token: 'some-access-token', + scope: 'scope', + token_type: 'bearer', + }; + }, + }; + }); + const gitGetUserResponse = jest.fn(); + gitGetUserResponse.mockImplementation(() => { + return { + json: () => { + return { + name: 'SSO userExist', + email: 'anotherUser1@tooljet.io', + }; + }, + }; + }); + + mockedGot.mockImplementationOnce(gitAuthResponse); + mockedGot.mockImplementationOnce(gitGetUserResponse); + + const response = await request(app.getHttpServer()) + .post('/api/oauth/sign-in/' + sso_configs.id) + .send({ token }); + + expect(response.statusCode).toBe(201); + expect(Object.keys(response.body).sort()).toEqual( + [ + 'id', + 'email', + 'first_name', + 'last_name', + 'auth_token', + 'admin', + 'organization_id', + 'organization', + 'group_permissions', + 'app_group_permissions', + ].sort() + ); + + const { + email, + first_name, + last_name, + admin, + group_permissions, + app_group_permissions, + organization_id, + organization, + } = response.body; + + expect(email).toEqual('anotherUser1@tooljet.io'); + expect(first_name).toEqual('SSO'); + expect(last_name).toEqual('userExist'); + expect(admin).toBeFalsy(); + expect(organization_id).toBe(current_organization.id); + expect(organization).toBe(current_organization.name); + expect(group_permissions).toHaveLength(1); + expect(group_permissions[0].group).toEqual('all_users'); + expect(Object.keys(group_permissions[0]).sort()).toEqual( + [ + 'id', + 'organization_id', + 'group', + 'app_create', + 'app_delete', + 'updated_at', + 'created_at', + 'folder_create', + ].sort() + ); + expect(app_group_permissions).toHaveLength(0); + }); }); }); }); diff --git a/server/test/controllers/organizations.e2e-spec.ts b/server/test/controllers/organizations.e2e-spec.ts index 98e9f842cd..972e182c6a 100644 --- a/server/test/controllers/organizations.e2e-spec.ts +++ b/server/test/controllers/organizations.e2e-spec.ts @@ -13,14 +13,6 @@ describe('organizations controller', () => { beforeEach(async () => { await clearDB(); - jest.spyOn(mockConfig, 'get').mockImplementation((key: string) => { - switch (key) { - case 'MULTI_ORGANIZATION': - return 'false'; - default: - return process.env[key]; - } - }); }); beforeAll(async () => { @@ -65,28 +57,20 @@ describe('organizations controller', () => { describe('create organization', () => { it('should allow only authenticated users to create organization', async () => { - await request(app.getHttpServer()).post('/api/organizations').send({ name: 'My organization' }).expect(401); + await request(app.getHttpServer()).post('/api/organizations').send({ name: 'My workspace' }).expect(401); }); - it('should create new organization if multi organization supported', async () => { - jest.spyOn(mockConfig, 'get').mockImplementation((key: string) => { - switch (key) { - case 'MULTI_ORGANIZATION': - return 'true'; - default: - return process.env[key]; - } - }); + it('should create new organization if Multi-Workspace supported', async () => { const { user, organization } = await createUser(app, { email: 'admin@tooljet.io', }); const response = await request(app.getHttpServer()) .post('/api/organizations') - .send({ name: 'My organization' }) + .send({ name: 'My workspace' }) .set('Authorization', authHeaderForUser(user)); expect(response.statusCode).toBe(201); expect(response.body.organization_id).not.toBe(organization.id); - expect(response.body.organization).toBe('My organization'); + expect(response.body.organization).toBe('My workspace'); expect(response.body.admin).toBeTruthy(); const newUser = await userRepository.findOneOrFail({ where: { id: user.id } }); @@ -94,14 +78,6 @@ describe('organizations controller', () => { }); it('should throw error if name is empty', async () => { - jest.spyOn(mockConfig, 'get').mockImplementation((key: string) => { - switch (key) { - case 'MULTI_ORGANIZATION': - return 'true'; - default: - return process.env[key]; - } - }); const { user } = await createUser(app, { email: 'admin@tooljet.io' }); const response = await request(app.getHttpServer()) .post('/api/organizations') @@ -111,35 +87,35 @@ describe('organizations controller', () => { expect(response.statusCode).toBe(400); }); - it('should not create new organization if multi organization not supported', async () => { - const { user } = await createUser(app, { email: 'admin@tooljet.io' }); - await request(app.getHttpServer()) - .post('/api/organizations') - .send({ name: 'My organization' }) - .set('Authorization', authHeaderForUser(user)) - .expect(403); - }); - - it('should create new organization if multi organization supported and user logged in via SSO', async () => { + it('should not create new organization if Multi-Workspace not supported', async () => { jest.spyOn(mockConfig, 'get').mockImplementation((key: string) => { switch (key) { - case 'MULTI_ORGANIZATION': + case 'DISABLE_MULTI_WORKSPACE': return 'true'; default: return process.env[key]; } }); + const { user } = await createUser(app, { email: 'admin@tooljet.io' }); + await request(app.getHttpServer()) + .post('/api/organizations') + .send({ name: 'My workspace' }) + .set('Authorization', authHeaderForUser(user)) + .expect(403); + }); + + it('should create new organization if Multi-Workspace supported and user logged in via SSO', async () => { const { user, organization } = await createUser(app, { email: 'admin@tooljet.io', }); const response = await request(app.getHttpServer()) .post('/api/organizations') - .send({ name: 'My organization' }) + .send({ name: 'My workspace' }) .set('Authorization', authHeaderForUser(user, null, false)); expect(response.statusCode).toBe(201); expect(response.body.organization_id).not.toBe(organization.id); - expect(response.body.organization).toBe('My organization'); + expect(response.body.organization).toBe('My workspace'); expect(response.body.admin).toBeTruthy(); }); }); @@ -252,6 +228,14 @@ describe('organizations controller', () => { describe('get public organization configs', () => { it('should get organization details for all users for single organization', async () => { + jest.spyOn(mockConfig, 'get').mockImplementation((key: string) => { + switch (key) { + case 'DISABLE_MULTI_WORKSPACE': + return 'true'; + default: + return process.env[key]; + } + }); const { user } = await createUser(app, { email: 'admin@tooljet.io', }); @@ -291,14 +275,6 @@ describe('organizations controller', () => { }); it('should get organization specific details for all users for multiple organization deployment', async () => { - jest.spyOn(mockConfig, 'get').mockImplementation((key: string) => { - switch (key) { - case 'MULTI_ORGANIZATION': - return 'true'; - default: - return process.env[key]; - } - }); const { user, organization } = await createUser(app, { email: 'admin@tooljet.io', }); diff --git a/server/test/controllers/users.e2e-spec.ts b/server/test/controllers/users.e2e-spec.ts index 975ad27312..26d4b23774 100644 --- a/server/test/controllers/users.e2e-spec.ts +++ b/server/test/controllers/users.e2e-spec.ts @@ -12,22 +12,17 @@ describe('users controller', () => { beforeEach(async () => { await clearDB(); - jest.spyOn(mockConfig, 'get').mockImplementation((key: string) => { - switch (key) { - case 'DISABLE_SIGNUPS': - return 'false'; - case 'MULTI_ORGANIZATION': - return 'false'; - default: - return process.env[key]; - } - }); }); beforeAll(async () => { ({ app, mockConfig } = await createNestAppInstanceWithEnvMock()); }); + afterEach(() => { + jest.resetAllMocks(); + jest.clearAllMocks(); + }); + describe('PATCH /api/users/change_password', () => { it('should allow users to update their password', async () => { const userData = await createUser(app, { email: 'admin@tooljet.io' }); @@ -87,17 +82,7 @@ describe('users controller', () => { }); describe('POST /api/users/set_password_from_token', () => { - it('should allow users to setup account after sign up using multi organization', async () => { - jest.spyOn(mockConfig, 'get').mockImplementation((key: string) => { - switch (key) { - case 'DISABLE_SIGNUPS': - return 'false'; - case 'MULTI_ORGANIZATION': - return 'true'; - default: - return process.env[key]; - } - }); + it('should allow users to setup account after sign up using Multi-Workspace', async () => { const invitationToken = uuidv4(); const userData = await createUser(app, { email: 'signup@tooljet.io', @@ -125,17 +110,7 @@ describe('users controller', () => { expect(organizationUser.status).toEqual('active'); }); - it('should return error if required params are not present - multi organization', async () => { - jest.spyOn(mockConfig, 'get').mockImplementation((key: string) => { - switch (key) { - case 'DISABLE_SIGNUPS': - return 'false'; - case 'MULTI_ORGANIZATION': - return 'true'; - default: - return process.env[key]; - } - }); + it('should return error if required params are not present - Multi-Workspace', async () => { const invitationToken = uuidv4(); await createUser(app, { email: 'signup@tooljet.io', @@ -155,6 +130,14 @@ describe('users controller', () => { }); it('should not allow users to setup account for single organization', async () => { + jest.spyOn(mockConfig, 'get').mockImplementation((key: string) => { + switch (key) { + case 'DISABLE_MULTI_WORKSPACE': + return 'true'; + default: + return process.env[key]; + } + }); const invitationToken = uuidv4(); await createUser(app, { email: 'signup@tooljet.io', @@ -174,13 +157,11 @@ describe('users controller', () => { expect(response.statusCode).toBe(403); }); - it('should not allow users to setup account for multi organization and sign up disabled', async () => { + it('should not allow users to setup account for Multi-Workspace and sign up disabled', async () => { jest.spyOn(mockConfig, 'get').mockImplementation((key: string) => { switch (key) { case 'DISABLE_SIGNUPS': return 'true'; - case 'MULTI_ORGANIZATION': - return 'true'; default: return process.env[key]; } @@ -216,15 +197,6 @@ describe('users controller', () => { organization: org, }); - jest.spyOn(mockConfig, 'get').mockImplementation((key: string) => { - switch (key) { - case 'MULTI_ORGANIZATION': - return 'true'; - default: - return process.env[key]; - } - }); - const signUpResponse = await request(app.getHttpServer()) .post('/api/signup') .send({ email: 'invited@tooljet.io' }); @@ -269,15 +241,6 @@ describe('users controller', () => { organization: org, }); - jest.spyOn(mockConfig, 'get').mockImplementation((key: string) => { - switch (key) { - case 'MULTI_ORGANIZATION': - return 'true'; - default: - return process.env[key]; - } - }); - const signUpResponse = await request(app.getHttpServer()) .post('/api/signup') .send({ email: 'invited@tooljet.io' }); @@ -321,15 +284,7 @@ describe('users controller', () => { }); describe('POST /api/users/accept-invite', () => { - it('should allow users to accept invitation when multi organization is enabled', async () => { - jest.spyOn(mockConfig, 'get').mockImplementation((key: string) => { - switch (key) { - case 'MULTI_ORGANIZATION': - return 'true'; - default: - return process.env[key]; - } - }); + it('should allow users to accept invitation when Multi-Workspace is enabled', async () => { const userData = await createUser(app, { email: 'organizationUser@tooljet.io', status: 'invited', @@ -347,11 +302,11 @@ describe('users controller', () => { expect(organizationUser.status).toEqual('active'); }); - it('should allow users to accept invitation when multi organization is disabled', async () => { + it('should allow users to accept invitation when Multi-Workspace is disabled', async () => { jest.spyOn(mockConfig, 'get').mockImplementation((key: string) => { switch (key) { - case 'MULTI_ORGANIZATION': - return 'false'; + case 'DISABLE_MULTI_WORKSPACE': + return 'true'; default: return process.env[key]; }