ToolJet/frontend/src/Oauth/Authorize.jsx

89 lines
2.9 KiB
React
Raw Normal View History

import React, { useEffect, useState } from 'react';
import useRouter from '@/_hooks/use-router';
import { authenticationService } from '@/_services';
import { Navigate } from 'react-router-dom';
import Configs from './Configs/Config.json';
import { RedirectLoader } from '@/_components';
import { redirectToWorkspace } from '@/_helpers/utils';
export function Authorize() {
const [error, setError] = useState('');
const router = useRouter();
const organizationId = authenticationService.getLoginOrganizationId();
useEffect(() => {
const errorMessage = router.query.error_description || router.query.error;
if (errorMessage) {
return setError(errorMessage);
}
if (!(router.query.origin && Configs[router.query.origin])) {
return setError('Login failed');
}
const configs = Configs[router.query.origin];
const authParams = {};
if (configs.responseType === 'hash') {
if (!window.location.hash) {
return setError('Login failed');
}
const params = new Proxy(new URLSearchParams(window.location.hash.substr(1)), {
get: (searchParams, prop) => searchParams.get(prop),
});
authParams.token = params[configs.params.token];
authParams.state = params[configs.params.state];
} else {
authParams.token = router.query[configs.params.token];
authParams.state = router.query[configs.params.state];
}
[Improvement] URLs scoped with workspace id (#5487) * add: new URL prefix * fix: working on home page * add: profile path * playing with rxjs * removed context part * working on path changes * changing routes - TODO: replace the workspaceId with actual id * redo: public apps path * initial commit * added authorize API * remove privileges from auth response * fixed some api issue - added subscriptions * fix: redirect url workspace-id null issue * fix: switch workspace * fix: organization list mapping - menu item paths * fix: preview url - editor, viewer permission mapping * jwt fix * fix: some url issue - permission mappings - workspace login * fixed some issues - user invite workspace-id - org settings menu item default selected item issue * app viewer fixes * fixing workspace login issues * fix * fixing issues - tooljet db - path issues - refatoring the code * fix: workspace vars permissions * fix: multi-page handle * fix: create app from template * fix: bulk user upload * fix: import app - clone app - upload profile image * fix: onboarding * fix: log out * fixed multi-workspace logout issue * fix: launch btn * fix: oauth2 * fixes * fix: sso login * fix: workspace sso login * fixing sso issues * fix: moved list of orgs to rxjs - fixed switching issues * reverting some changes * fixed some minor bugs * fixing sso redirect url issues * fix: switching network timing issues * fix: back to workspace-id * fix: tj-database - refactored the code - removed org id from some pages - will get the org id from the service file only * fix: multi-pages * fix: infinite loop issue * fixing workspace switching issue * fixes - comment link - logout & private route redirect url * fix: wrong uuid error * fixing subpath - fixed most of the places - need to test & fix workspace login, sso, new account * fix: subpath workspace login * fix: rxjs handle bug * Revert "fix: tj-database" This reverts commit 9632ec2ff0707c9d7b1777f64afbe15679203ca1. * fix: reverted tj-db changes * fix: subpath sso * typo fix * fix: existing session issues * new: switch workspace page * fix: modal dark-mode * added default sso support * fixes - subpath workspace switching - handle wrong routes * fix: manager user button - refactored the code * removed SINGLE Workspace feature * rebase * add: change modal text * fix: added validation * fixed private app 401 issue * initial commit * fix: logged out session multi-tab issue * refactoring the code * fix: redirect url issue * added auth-token in cookies * Fix: failing e2e specs * added session API * fix: backend session guard * fix: removing user details from local storage * fix: null wid * undo and redo * fix: login page * fix: viewer login redirection * fix: login page redirection * fix: public apps logout issue * added session storage and scheduler * added profile api * fix: sso login - switch workspace - login page - setup admin * working on fixes * fix: socket issue * fix: setup admin api * connected profile & logout apis * fix: malfunctioned auth token case * fix: realtime avatar * fix: profile avatar * fix: Realtime cursors avatar * setting max age for auth token cookie * add: Go to login page if logout api returns 401 * fix: subpath login * fix * fix: app logout [viewer] * fix: authorize page * remove expiry from jwt * fix: integrations route - session api * small fix * fix: updated profile * fix: workspace login [logged user] * fix: oauth and another workspace page issue * fixed app preview logout issue * subpath fix * fix: subpath app id * fix: selected state didnt change for apps page [subpath] * fix * add cookie parser to test app * specs added * increased user session expiry time * test: session & new apis * working on test cases * fix: onboarding issue * fixing specs * fix: test cases * fix: removing profile api calls * some fixes * fixing rebase issues * fix: global ds issues * fix: app is crashing * fix: back to text * fix: oauth test cases * fix: test-helper * fix: onboarding test cases * fix: tests again * refactoring the code * latest develop merging precautions - fixed a minor null issue * fix: typo * fix :menu issues due to the merging * fix: - clicking on tooljet logo didnt redirect to login page for public apps - private app preview doesnt load after login * subpath fixes * fixed back to issue * PR changes * fix: spec fixes for EE * doc: URL scoped for workspace --------- Co-authored-by: gsmithun4 <gsmithun4@gmail.com> Co-authored-by: Shubhendra <withshubh@gmail.com>
2023-04-06 11:12:58 +00:00
let subsciption;
if (organizationId) {
subsciption = authenticationService.currentSession.subscribe((session) => {
//logged users should send tj-workspace-id when login to unauthorized workspace
if (session.authentication_status === false || session.current_organization_id) {
signIn(authParams, configs);
}
});
} else {
signIn(authParams, configs);
}
() => subsciption && subsciption.unsubscribe();
// Disabled for useEffect not being called for updation
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
const signIn = (authParams, configs) => {
authenticationService
.signInViaOAuth(router.query.configId, router.query.origin, authParams)
.then(({ redirect_url, current_organization_id }) => {
Feature :: Onboarding revamp (#4044) * typo * password length check , ui fixes * fixing typos * fixing navbar ui * updated icon , changed history to Link * fix :: repopulating data * fix :: key added for non sso logins * ui improvements , added loading states , bugfixes * changing folder names * fix :: removing scroll and fixing to 100% * fix :: all spell mistakes corrected * fix :: bug on password show/hide * fix :: bug in button animation state * fix :: added loader states for all onboarding buttons * fix :: imports * feat :: centering ui for signup and login pages * bugfixes :: minor * feat :: added mediaquery for mobile screens * fix :: typo spell check * PR changes - instance configs - reused jwt payload * fix :: loading bugfix * feat :: added loader for verification sucess screen * styles :: loader * fix :: typo corrections * fix :: image path * fix :: darmode & enter press in onboard * Fixed organization name issue * fix :: keystroke not taken initially * fix :: trim company name * fix :: setting autocomplete to off * removing redirectsso and confirmation page as its unused now * few ui corrections , laoding states * Fixed organization login sso issue * Add db transaction wrap * refactoring the code * flow changes * Added db tranxn wrap to auth services * adding accept invite screen * added verify organization token route * fixes * adding disable_multiworkspace to default config * cleanup * intermediate commit :: revamping organization page , api integration * fixes * feat :: organization token send in invite from org account setup * fix :: making orgtoken conditional and ui changes / functional updates organization invte * removed unwanted code * fix :: login/account setup for sso user in single workspace flow * fixes * fix :: CTA loader misaligned * fix :: sso login single workspace * fix * fix :: role check db * fix :: role check DB * fix :: setting fallback screen for organizational invite * feat :: org signup * fix :: loading states bug * fix :: loading bug * fixes * added password length validation * fixes * fix: sub path for static asset serve (#4665) * fix: sub path for static asset serve * fix: sub path for static asset serve * fix: sub path for static asset serve (#4668) * Bugfix :: Sort event fired on sort removal (#4542) * onsort applied on sort removal * bugcheck * removing unused toast * Feature :: Table image column type addition (#4547) * feat :: adding column type image * feat :: adding image fit property * Fix :: Closing of textarea ontype Table widget (#4549) * fix :: closing of textarea ontype * fix :: bug not able to clear value * bug fixed : generate file in text is not supported (#4346) * add eslintignore for frontend (#4669) * [cypress] Fix failing manage SSO spec in single workspace #4390 (#4509) * added [data-cy=login-page-logo] also removed one dropdown of same name * Revert command.js * call loginpagelogo * Fixed toast test case * updated text * remove timer * revert linting * Github text fixed * Replaced the woocommerce connection screenshot from dark to light one (#4654) Signed-off-by: Pakeetharan Balasubramaniam <bpakee@gmail.com> Signed-off-by: Pakeetharan Balasubramaniam <bpakee@gmail.com> * gifs for Keyboard Shortcuts Added (#4643) * Fix. Image to button group docs (#4630) (#4631) * Add. Image to button group docs (#4630) * Update docs/docs/widgets/button-group.md Co-authored-by: Shubhendra Singh Chauhan <withshubh@gmail.com> * [added] Translated global strings in french #4169 (#4232) * [added] Translated global strings in french Added global strings translated to French language , Issue: #4169 * [localization ] Fixed the Proposed Changes in French Translation * [localization ] Fixed the Remaining Proposed Changes in French Translation v2 * Update selectHost Co-authored-by: roiLeo <medina.leo42@gmail.com> Co-authored-by: Shubhendra Singh Chauhan <withshubh@gmail.com> Co-authored-by: roiLeo <medina.leo42@gmail.com> * [localization] issue-4188 added spanish keys for card app (#4229) * issue-4188 added spanish keys for card app * IT-4188 fixed PR * Improve toast message shortcut on component deletion (#4513) * Improve toast message shortcut * Improved user agent check Co-authored-by: Kavin Venkatachalam <50441969+kavinvenkatachalam@users.noreply.github.com> * Improved user agent check Co-authored-by: Kavin Venkatachalam <50441969+kavinvenkatachalam@users.noreply.github.com> * feat: Add DTO for organization create (#4651) * feat: Add DTO for organization create * chore: fix eslint error * chore: eslint ... * Fixed failing manage SSO spec in multi workspace (#4658) * Fixed failing manage SSO spec in multi workspace * github to gitHib * persist data without saving the query (#4649) * Fixed failing dashboard specs (#4667) * Add and modify data-cy * Fix failing manage users spec in multiworkspace * Fix failing user permission spec in multi workspace * Fix failing dashboard spec * Fix failing manage group spec * Fix failing manage users spec in single workspace * Fix failing user permission spec in single workspace * indentation changes * Remove wait * [Marketplace] AWS S3 (#4670) * fix: sub path for static asset serve (#4665) * fix: sub path for static asset serve * fix: sub path for static asset serve * marketplace: s3 * rename operations file to query_operations * fix: crash on click of existing plugin * remove unused console * adds missing async await * add isoptional for repo * plugin card ui style fixes * update plugin name Co-authored-by: Gandharv <gandharvkumargarg@gmail.com> * fix: Added a modal with warning message on disabling password (#4552) * Copy to clipboard (#4588) * Update EventManager.jsx * Update EventManager.jsx * Update EventManager.jsx * fix :: adding sso configs based on org id * loader and password check * multiworkspace invite flow updated * restrict only active users * fix * added error message for password length check * fix :: password trim * fix :: all happy flows tested , single and multi exept sso * fix: message on invalid password * revert: package-lock.json file * feat :: changing ui for user present for org invite in multi workspace * fix :: remove password check for existing user multiworkspace * fix :: added fallback * fix :: typo * fix :: adding checks * fix * feat :: for single workspace user logged in directly * fix :: code meaning fix * fix * fixes * fix * fix * fix * fix :: sso fix and bug updates * fix :: json resolution for only single workspace * token :: app level * fix * fix * fixes * fix * ui fixes , removed loading and added checks * showing sso options * fix :: back to * fix single workspace * adding sso check ui * sso single workspace fix * code refactoring * fix :: bugfix on click enter submit in signup and signin * qa fix :: typo * fix for sending welcome email on invite * bug fixes * fix * qa bug fixes and translations * switch workspace fixes * fix :: company name taking empty spaces * adding some more translations * making all screens center aligned * fix :: login page not loading * fix :: singup conditional * fixes * typo fix * fix :: for diabled cases of sso , password login , disabled signup * fix * fix :: added max input length for workspace name * fix * fix :: missing validation on edit email * fix :: all screens vertically aligned * fix :: alignment link expiry screen * fix * fix :: styling terms and condition * fix :: for redirect url loginto workspace fixed according to new design * typo * feat :: removed onboarding modal , redundant * typo fix * fix * name is now mandatory for sign up * fix for password retry count not updating * showing onboarding questions for sign up users * fix :: spaces in password in diff screens * fix :: darkmode initial * fix for accept organization invite success message * fix :: dark mode * fix :: dark mode * feat :: updating all dark mode images * bugfix img * bugfix ::img * dark mode :: improvements * single workspace signup fix * updating images * stylefix * self review :: bugfixes * sign up page fix * fix for asking password for single ws activation * or separator fix for signup page * fix * feat :: updating cta images * fix :: loader bugs * hiding sso options in org invite, sign in via sso * fix :: dark mode img * bugfixes :: cta changed * Fix :: onboarding styles fixes (#4773) * fix: styling in authWrappers * cleanup Co-authored-by: Vijaykant Yadav <vjy239@gmail.com> * fix :: conflicting styles * fix :: loaders , and added header to link expired screen , style fixes * fix :: mobile onboarding btn * fix :: loading onboarding completion * fix :: subpath not taking img path * fix :: path * fix :: removing trailing img / for subpath * fix :: cta img * fix :: remove scrollbar * last name as undefined in comments * fixed loading bug and cursor of company input onboard form * comments fixes * fix :: removing verify email screen on org invite * comments fix * fix :: no login methods * fix :: bug in expired org invite verification link * fix :: edge case name being empty when user types multiple spaces * fix :: comments breaking * fix :: notification breaking * fix :: user groups table lastname * fix for sso redirection * fix :: empty first and last name during org invite * bug fixed :On updating any permissions under permission tab, currentTab switches to app tab (#4734) * fix: popout editor closing for tables (#4674) Co-authored-by: Kavin Venkatachalam <kavin.saratha@gmail.com> * Added default value for backgroundColor In NumberInput (#4378) * fix: added background styles for number input * fix: removed additional f from the background color property * fix: added backgroundColor property from styles * fixes: default bg color for dark mode Co-authored-by: arpitnath <arpitnath42@gmail.com> Co-authored-by: Kavin Venkatachalam <kavin.saratha@gmail.com> * Added the hover effects on datasources (#4303) Co-authored-by: Kavin Venkatachalam <kavin.saratha@gmail.com> * Added Background Color to Text Input (#4194) * Added Background Color to Text Input * Added Default Value for Background Color * added default value and make background of text input consistent with the dark theme Co-authored-by: manishkushare <kushare.manish9@gmail.com> Co-authored-by: Kavin Venkatachalam <kavin.saratha@gmail.com> * feat: Add update version button on installable plugin (#4766) * feat: Add update version button on installable plugin * use id from update method * removes redundant check * use plugin id for fetching files from s3 * fetch latest plugins once updated * disable update and remove buttons while update in progress * replace href with link-span cx + send body in patch request * fix: Dark mode on table's `Striped` and `Striped & Bordered` table type mode (#4611) * [ Hotfix ] :: Hard to resize table columns (#4438) * fix :: hard to resize , scrollbar should not be visible * fix :: resizer not working in pewview * Enhancement : [RangeSlider widget] Bind onChange event (#4192) * add onChange event and its handler * add handler for slider change as well * fix lint * added onChange fire event when slider value is changed Co-authored-by: manishkushare <kushare.manish9@gmail.com> * Added data-cy for table widget elements (#4792) * Add data-cy to tooltip label * Add data-cy to table filter pop-over * Add data-cy to table elements * Add review changes * [docs] Widget updates (#4793) * widget updates * minor update * Update README.md (#4784) * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Fixed grammatical errors in localization doc (#4800) * [docs] widget property updates (#4806) * fixes * added resend invite API * Onboarding revamp test cases (#4770) * fix: test cases for oauth * fix: app controller test cases * fix: test cases for oauth * fix: app controller test cases * remove: unused vars * fix: test cases for oauth * fix: app controller test cases * remove: unused vars * chore: PR fixes and cleanup * fix: single workspace test cases * fix: test cases for oauth * fix: app controller test cases * remove: unused vars * chore: PR fixes and cleanup * fix: test cases for oauth * fix: single workspace test cases * add: test cases for invitation links * add: test cases for sso * fix: test cases for oauth * fix: app controller test cases * remove: unused vars * chore: PR fixes and cleanup * fix: test cases for oauth * fix: single workspace test cases * add: test cases for invitation links * fix: test cases for oauth * fix: app controller test cases * chore: PR fixes and cleanup * add: test cases for sso * fix: app test cases * fix: linting in files * fix: test cases for oauth * fix: app controller test cases * remove: unused vars * chore: PR fixes and cleanup * fix: test cases for oauth * fix: single workspace test cases * add: test cases for invitation links * fix: test cases for oauth * fix: app controller test cases * chore: PR fixes and cleanup * add: test cases for sso * fix: app test cases * fix: test cases for oauth * fix: linting in files * rebase: from feature/onboarding-revamp Co-authored-by: Vijaykant Yadav <vjy239@gmail.com> * feat :: api update resend invite * loading state resend mail * adding loading state * checkpoints shown only till tablet * fix: failing test cases for sso * pr:: changes changed all imports and removed unwanted fragments * pr changes * fix :: naming images * fix :: style organized for onboarding * fix for user seed issue * removing unwanted styles * Setting darkmode from props :: onboarding (#4885) * passing darkmode as props to components * error toast * Review comment :: rename env variable * Pr :: changes , code cleanup onborading form * develop merge * pr changes ::form splitted to components * password warning added * chore :: lint folder renaming * review comments * fixes * fix for test cases failure * changes :: removed empty divs * cleanup Signed-off-by: Pakeetharan Balasubramaniam <bpakee@gmail.com> Co-authored-by: Muhsin Shah <muhsinshah21@gmail.com> Co-authored-by: gsmithun4 <gsmithun4@gmail.com> Co-authored-by: Gandharv <gandharvkumargarg@gmail.com> Co-authored-by: Manish Kushare <kushare.manish9@gmail.com> Co-authored-by: Akshay <akshaysasidharan93@gmail.com> Co-authored-by: alammoiz <moixalam@gmail.com> Co-authored-by: Pakeetharan Balasubramaniam <bpakee@gmail.com> Co-authored-by: Akhilesh Kumar Mishra <79476272+iamakhileshmishra@users.noreply.github.com> Co-authored-by: Hemanth Kumar <49117799+Hemanthhari2000@users.noreply.github.com> Co-authored-by: Shubhendra Singh Chauhan <withshubh@gmail.com> Co-authored-by: akk312000 <akk312000@gmail.com> Co-authored-by: roiLeo <medina.leo42@gmail.com> Co-authored-by: Jose Morales <jmoralesmnz@gmail.com> Co-authored-by: 3t8 <62209650+3t8@users.noreply.github.com> Co-authored-by: Kavin Venkatachalam <50441969+kavinvenkatachalam@users.noreply.github.com> Co-authored-by: Santosh Bhandari <bsantosh909@gmail.com> Co-authored-by: Arpit <arpitnath42@gmail.com> Co-authored-by: Ajith KV <ajith.jaban@gmail.com> Co-authored-by: Akarsh Jain <72064462+akarsh-jain-790@users.noreply.github.com> Co-authored-by: Utsav Paul <91927689+Smartmind12@users.noreply.github.com> Co-authored-by: Vijaykant Yadav <vjaris42@Vijaykants-MacBook-Pro.local> Co-authored-by: Vijaykant Yadav <vjy239@gmail.com> Co-authored-by: geisterfurz007 <geisterfurz007@users.noreply.github.com> Co-authored-by: Kavin Venkatachalam <kavin.saratha@gmail.com> Co-authored-by: Abhushan Gautam <carefreeav09@gmail.com> Co-authored-by: Syed Ansar <82027712+Syed-Ansar@users.noreply.github.com> Co-authored-by: Rahul Sunil <rahulsunil2@gmail.com> Co-authored-by: Srisuma Atluri <40341173+Srisuma13@users.noreply.github.com> Co-authored-by: Midhun Kumar E <midhun752@gmail.com> Co-authored-by: Navaneeth Pk <navaneeth@tooljet.io> Co-authored-by: Akasshhg <91525166+gogoiakash2311@users.noreply.github.com>
2022-12-08 07:54:31 +00:00
if (redirect_url) {
window.location.href = redirect_url;
return;
}
/*for workspace login / normal login response will contain the next organization_id user want to login*/
if (current_organization_id) {
redirectToWorkspace();
}
Feature :: Onboarding revamp (#4044) * typo * password length check , ui fixes * fixing typos * fixing navbar ui * updated icon , changed history to Link * fix :: repopulating data * fix :: key added for non sso logins * ui improvements , added loading states , bugfixes * changing folder names * fix :: removing scroll and fixing to 100% * fix :: all spell mistakes corrected * fix :: bug on password show/hide * fix :: bug in button animation state * fix :: added loader states for all onboarding buttons * fix :: imports * feat :: centering ui for signup and login pages * bugfixes :: minor * feat :: added mediaquery for mobile screens * fix :: typo spell check * PR changes - instance configs - reused jwt payload * fix :: loading bugfix * feat :: added loader for verification sucess screen * styles :: loader * fix :: typo corrections * fix :: image path * fix :: darmode & enter press in onboard * Fixed organization name issue * fix :: keystroke not taken initially * fix :: trim company name * fix :: setting autocomplete to off * removing redirectsso and confirmation page as its unused now * few ui corrections , laoding states * Fixed organization login sso issue * Add db transaction wrap * refactoring the code * flow changes * Added db tranxn wrap to auth services * adding accept invite screen * added verify organization token route * fixes * adding disable_multiworkspace to default config * cleanup * intermediate commit :: revamping organization page , api integration * fixes * feat :: organization token send in invite from org account setup * fix :: making orgtoken conditional and ui changes / functional updates organization invte * removed unwanted code * fix :: login/account setup for sso user in single workspace flow * fixes * fix :: CTA loader misaligned * fix :: sso login single workspace * fix * fix :: role check db * fix :: role check DB * fix :: setting fallback screen for organizational invite * feat :: org signup * fix :: loading states bug * fix :: loading bug * fixes * added password length validation * fixes * fix: sub path for static asset serve (#4665) * fix: sub path for static asset serve * fix: sub path for static asset serve * fix: sub path for static asset serve (#4668) * Bugfix :: Sort event fired on sort removal (#4542) * onsort applied on sort removal * bugcheck * removing unused toast * Feature :: Table image column type addition (#4547) * feat :: adding column type image * feat :: adding image fit property * Fix :: Closing of textarea ontype Table widget (#4549) * fix :: closing of textarea ontype * fix :: bug not able to clear value * bug fixed : generate file in text is not supported (#4346) * add eslintignore for frontend (#4669) * [cypress] Fix failing manage SSO spec in single workspace #4390 (#4509) * added [data-cy=login-page-logo] also removed one dropdown of same name * Revert command.js * call loginpagelogo * Fixed toast test case * updated text * remove timer * revert linting * Github text fixed * Replaced the woocommerce connection screenshot from dark to light one (#4654) Signed-off-by: Pakeetharan Balasubramaniam <bpakee@gmail.com> Signed-off-by: Pakeetharan Balasubramaniam <bpakee@gmail.com> * gifs for Keyboard Shortcuts Added (#4643) * Fix. Image to button group docs (#4630) (#4631) * Add. Image to button group docs (#4630) * Update docs/docs/widgets/button-group.md Co-authored-by: Shubhendra Singh Chauhan <withshubh@gmail.com> * [added] Translated global strings in french #4169 (#4232) * [added] Translated global strings in french Added global strings translated to French language , Issue: #4169 * [localization ] Fixed the Proposed Changes in French Translation * [localization ] Fixed the Remaining Proposed Changes in French Translation v2 * Update selectHost Co-authored-by: roiLeo <medina.leo42@gmail.com> Co-authored-by: Shubhendra Singh Chauhan <withshubh@gmail.com> Co-authored-by: roiLeo <medina.leo42@gmail.com> * [localization] issue-4188 added spanish keys for card app (#4229) * issue-4188 added spanish keys for card app * IT-4188 fixed PR * Improve toast message shortcut on component deletion (#4513) * Improve toast message shortcut * Improved user agent check Co-authored-by: Kavin Venkatachalam <50441969+kavinvenkatachalam@users.noreply.github.com> * Improved user agent check Co-authored-by: Kavin Venkatachalam <50441969+kavinvenkatachalam@users.noreply.github.com> * feat: Add DTO for organization create (#4651) * feat: Add DTO for organization create * chore: fix eslint error * chore: eslint ... * Fixed failing manage SSO spec in multi workspace (#4658) * Fixed failing manage SSO spec in multi workspace * github to gitHib * persist data without saving the query (#4649) * Fixed failing dashboard specs (#4667) * Add and modify data-cy * Fix failing manage users spec in multiworkspace * Fix failing user permission spec in multi workspace * Fix failing dashboard spec * Fix failing manage group spec * Fix failing manage users spec in single workspace * Fix failing user permission spec in single workspace * indentation changes * Remove wait * [Marketplace] AWS S3 (#4670) * fix: sub path for static asset serve (#4665) * fix: sub path for static asset serve * fix: sub path for static asset serve * marketplace: s3 * rename operations file to query_operations * fix: crash on click of existing plugin * remove unused console * adds missing async await * add isoptional for repo * plugin card ui style fixes * update plugin name Co-authored-by: Gandharv <gandharvkumargarg@gmail.com> * fix: Added a modal with warning message on disabling password (#4552) * Copy to clipboard (#4588) * Update EventManager.jsx * Update EventManager.jsx * Update EventManager.jsx * fix :: adding sso configs based on org id * loader and password check * multiworkspace invite flow updated * restrict only active users * fix * added error message for password length check * fix :: password trim * fix :: all happy flows tested , single and multi exept sso * fix: message on invalid password * revert: package-lock.json file * feat :: changing ui for user present for org invite in multi workspace * fix :: remove password check for existing user multiworkspace * fix :: added fallback * fix :: typo * fix :: adding checks * fix * feat :: for single workspace user logged in directly * fix :: code meaning fix * fix * fixes * fix * fix * fix * fix :: sso fix and bug updates * fix :: json resolution for only single workspace * token :: app level * fix * fix * fixes * fix * ui fixes , removed loading and added checks * showing sso options * fix :: back to * fix single workspace * adding sso check ui * sso single workspace fix * code refactoring * fix :: bugfix on click enter submit in signup and signin * qa fix :: typo * fix for sending welcome email on invite * bug fixes * fix * qa bug fixes and translations * switch workspace fixes * fix :: company name taking empty spaces * adding some more translations * making all screens center aligned * fix :: login page not loading * fix :: singup conditional * fixes * typo fix * fix :: for diabled cases of sso , password login , disabled signup * fix * fix :: added max input length for workspace name * fix * fix :: missing validation on edit email * fix :: all screens vertically aligned * fix :: alignment link expiry screen * fix * fix :: styling terms and condition * fix :: for redirect url loginto workspace fixed according to new design * typo * feat :: removed onboarding modal , redundant * typo fix * fix * name is now mandatory for sign up * fix for password retry count not updating * showing onboarding questions for sign up users * fix :: spaces in password in diff screens * fix :: darkmode initial * fix for accept organization invite success message * fix :: dark mode * fix :: dark mode * feat :: updating all dark mode images * bugfix img * bugfix ::img * dark mode :: improvements * single workspace signup fix * updating images * stylefix * self review :: bugfixes * sign up page fix * fix for asking password for single ws activation * or separator fix for signup page * fix * feat :: updating cta images * fix :: loader bugs * hiding sso options in org invite, sign in via sso * fix :: dark mode img * bugfixes :: cta changed * Fix :: onboarding styles fixes (#4773) * fix: styling in authWrappers * cleanup Co-authored-by: Vijaykant Yadav <vjy239@gmail.com> * fix :: conflicting styles * fix :: loaders , and added header to link expired screen , style fixes * fix :: mobile onboarding btn * fix :: loading onboarding completion * fix :: subpath not taking img path * fix :: path * fix :: removing trailing img / for subpath * fix :: cta img * fix :: remove scrollbar * last name as undefined in comments * fixed loading bug and cursor of company input onboard form * comments fixes * fix :: removing verify email screen on org invite * comments fix * fix :: no login methods * fix :: bug in expired org invite verification link * fix :: edge case name being empty when user types multiple spaces * fix :: comments breaking * fix :: notification breaking * fix :: user groups table lastname * fix for sso redirection * fix :: empty first and last name during org invite * bug fixed :On updating any permissions under permission tab, currentTab switches to app tab (#4734) * fix: popout editor closing for tables (#4674) Co-authored-by: Kavin Venkatachalam <kavin.saratha@gmail.com> * Added default value for backgroundColor In NumberInput (#4378) * fix: added background styles for number input * fix: removed additional f from the background color property * fix: added backgroundColor property from styles * fixes: default bg color for dark mode Co-authored-by: arpitnath <arpitnath42@gmail.com> Co-authored-by: Kavin Venkatachalam <kavin.saratha@gmail.com> * Added the hover effects on datasources (#4303) Co-authored-by: Kavin Venkatachalam <kavin.saratha@gmail.com> * Added Background Color to Text Input (#4194) * Added Background Color to Text Input * Added Default Value for Background Color * added default value and make background of text input consistent with the dark theme Co-authored-by: manishkushare <kushare.manish9@gmail.com> Co-authored-by: Kavin Venkatachalam <kavin.saratha@gmail.com> * feat: Add update version button on installable plugin (#4766) * feat: Add update version button on installable plugin * use id from update method * removes redundant check * use plugin id for fetching files from s3 * fetch latest plugins once updated * disable update and remove buttons while update in progress * replace href with link-span cx + send body in patch request * fix: Dark mode on table's `Striped` and `Striped & Bordered` table type mode (#4611) * [ Hotfix ] :: Hard to resize table columns (#4438) * fix :: hard to resize , scrollbar should not be visible * fix :: resizer not working in pewview * Enhancement : [RangeSlider widget] Bind onChange event (#4192) * add onChange event and its handler * add handler for slider change as well * fix lint * added onChange fire event when slider value is changed Co-authored-by: manishkushare <kushare.manish9@gmail.com> * Added data-cy for table widget elements (#4792) * Add data-cy to tooltip label * Add data-cy to table filter pop-over * Add data-cy to table elements * Add review changes * [docs] Widget updates (#4793) * widget updates * minor update * Update README.md (#4784) * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Fixed grammatical errors in localization doc (#4800) * [docs] widget property updates (#4806) * fixes * added resend invite API * Onboarding revamp test cases (#4770) * fix: test cases for oauth * fix: app controller test cases * fix: test cases for oauth * fix: app controller test cases * remove: unused vars * fix: test cases for oauth * fix: app controller test cases * remove: unused vars * chore: PR fixes and cleanup * fix: single workspace test cases * fix: test cases for oauth * fix: app controller test cases * remove: unused vars * chore: PR fixes and cleanup * fix: test cases for oauth * fix: single workspace test cases * add: test cases for invitation links * add: test cases for sso * fix: test cases for oauth * fix: app controller test cases * remove: unused vars * chore: PR fixes and cleanup * fix: test cases for oauth * fix: single workspace test cases * add: test cases for invitation links * fix: test cases for oauth * fix: app controller test cases * chore: PR fixes and cleanup * add: test cases for sso * fix: app test cases * fix: linting in files * fix: test cases for oauth * fix: app controller test cases * remove: unused vars * chore: PR fixes and cleanup * fix: test cases for oauth * fix: single workspace test cases * add: test cases for invitation links * fix: test cases for oauth * fix: app controller test cases * chore: PR fixes and cleanup * add: test cases for sso * fix: app test cases * fix: test cases for oauth * fix: linting in files * rebase: from feature/onboarding-revamp Co-authored-by: Vijaykant Yadav <vjy239@gmail.com> * feat :: api update resend invite * loading state resend mail * adding loading state * checkpoints shown only till tablet * fix: failing test cases for sso * pr:: changes changed all imports and removed unwanted fragments * pr changes * fix :: naming images * fix :: style organized for onboarding * fix for user seed issue * removing unwanted styles * Setting darkmode from props :: onboarding (#4885) * passing darkmode as props to components * error toast * Review comment :: rename env variable * Pr :: changes , code cleanup onborading form * develop merge * pr changes ::form splitted to components * password warning added * chore :: lint folder renaming * review comments * fixes * fix for test cases failure * changes :: removed empty divs * cleanup Signed-off-by: Pakeetharan Balasubramaniam <bpakee@gmail.com> Co-authored-by: Muhsin Shah <muhsinshah21@gmail.com> Co-authored-by: gsmithun4 <gsmithun4@gmail.com> Co-authored-by: Gandharv <gandharvkumargarg@gmail.com> Co-authored-by: Manish Kushare <kushare.manish9@gmail.com> Co-authored-by: Akshay <akshaysasidharan93@gmail.com> Co-authored-by: alammoiz <moixalam@gmail.com> Co-authored-by: Pakeetharan Balasubramaniam <bpakee@gmail.com> Co-authored-by: Akhilesh Kumar Mishra <79476272+iamakhileshmishra@users.noreply.github.com> Co-authored-by: Hemanth Kumar <49117799+Hemanthhari2000@users.noreply.github.com> Co-authored-by: Shubhendra Singh Chauhan <withshubh@gmail.com> Co-authored-by: akk312000 <akk312000@gmail.com> Co-authored-by: roiLeo <medina.leo42@gmail.com> Co-authored-by: Jose Morales <jmoralesmnz@gmail.com> Co-authored-by: 3t8 <62209650+3t8@users.noreply.github.com> Co-authored-by: Kavin Venkatachalam <50441969+kavinvenkatachalam@users.noreply.github.com> Co-authored-by: Santosh Bhandari <bsantosh909@gmail.com> Co-authored-by: Arpit <arpitnath42@gmail.com> Co-authored-by: Ajith KV <ajith.jaban@gmail.com> Co-authored-by: Akarsh Jain <72064462+akarsh-jain-790@users.noreply.github.com> Co-authored-by: Utsav Paul <91927689+Smartmind12@users.noreply.github.com> Co-authored-by: Vijaykant Yadav <vjaris42@Vijaykants-MacBook-Pro.local> Co-authored-by: Vijaykant Yadav <vjy239@gmail.com> Co-authored-by: geisterfurz007 <geisterfurz007@users.noreply.github.com> Co-authored-by: Kavin Venkatachalam <kavin.saratha@gmail.com> Co-authored-by: Abhushan Gautam <carefreeav09@gmail.com> Co-authored-by: Syed Ansar <82027712+Syed-Ansar@users.noreply.github.com> Co-authored-by: Rahul Sunil <rahulsunil2@gmail.com> Co-authored-by: Srisuma Atluri <40341173+Srisuma13@users.noreply.github.com> Co-authored-by: Midhun Kumar E <midhun752@gmail.com> Co-authored-by: Navaneeth Pk <navaneeth@tooljet.io> Co-authored-by: Akasshhg <91525166+gogoiakash2311@users.noreply.github.com>
2022-12-08 07:54:31 +00:00
})
.catch((err) => setError(`${configs.name} login failed - ${err?.error || 'something went wrong'}`));
[Improvement] URLs scoped with workspace id (#5487) * add: new URL prefix * fix: working on home page * add: profile path * playing with rxjs * removed context part * working on path changes * changing routes - TODO: replace the workspaceId with actual id * redo: public apps path * initial commit * added authorize API * remove privileges from auth response * fixed some api issue - added subscriptions * fix: redirect url workspace-id null issue * fix: switch workspace * fix: organization list mapping - menu item paths * fix: preview url - editor, viewer permission mapping * jwt fix * fix: some url issue - permission mappings - workspace login * fixed some issues - user invite workspace-id - org settings menu item default selected item issue * app viewer fixes * fixing workspace login issues * fix * fixing issues - tooljet db - path issues - refatoring the code * fix: workspace vars permissions * fix: multi-page handle * fix: create app from template * fix: bulk user upload * fix: import app - clone app - upload profile image * fix: onboarding * fix: log out * fixed multi-workspace logout issue * fix: launch btn * fix: oauth2 * fixes * fix: sso login * fix: workspace sso login * fixing sso issues * fix: moved list of orgs to rxjs - fixed switching issues * reverting some changes * fixed some minor bugs * fixing sso redirect url issues * fix: switching network timing issues * fix: back to workspace-id * fix: tj-database - refactored the code - removed org id from some pages - will get the org id from the service file only * fix: multi-pages * fix: infinite loop issue * fixing workspace switching issue * fixes - comment link - logout & private route redirect url * fix: wrong uuid error * fixing subpath - fixed most of the places - need to test & fix workspace login, sso, new account * fix: subpath workspace login * fix: rxjs handle bug * Revert "fix: tj-database" This reverts commit 9632ec2ff0707c9d7b1777f64afbe15679203ca1. * fix: reverted tj-db changes * fix: subpath sso * typo fix * fix: existing session issues * new: switch workspace page * fix: modal dark-mode * added default sso support * fixes - subpath workspace switching - handle wrong routes * fix: manager user button - refactored the code * removed SINGLE Workspace feature * rebase * add: change modal text * fix: added validation * fixed private app 401 issue * initial commit * fix: logged out session multi-tab issue * refactoring the code * fix: redirect url issue * added auth-token in cookies * Fix: failing e2e specs * added session API * fix: backend session guard * fix: removing user details from local storage * fix: null wid * undo and redo * fix: login page * fix: viewer login redirection * fix: login page redirection * fix: public apps logout issue * added session storage and scheduler * added profile api * fix: sso login - switch workspace - login page - setup admin * working on fixes * fix: socket issue * fix: setup admin api * connected profile & logout apis * fix: malfunctioned auth token case * fix: realtime avatar * fix: profile avatar * fix: Realtime cursors avatar * setting max age for auth token cookie * add: Go to login page if logout api returns 401 * fix: subpath login * fix * fix: app logout [viewer] * fix: authorize page * remove expiry from jwt * fix: integrations route - session api * small fix * fix: updated profile * fix: workspace login [logged user] * fix: oauth and another workspace page issue * fixed app preview logout issue * subpath fix * fix: subpath app id * fix: selected state didnt change for apps page [subpath] * fix * add cookie parser to test app * specs added * increased user session expiry time * test: session & new apis * working on test cases * fix: onboarding issue * fixing specs * fix: test cases * fix: removing profile api calls * some fixes * fixing rebase issues * fix: global ds issues * fix: app is crashing * fix: back to text * fix: oauth test cases * fix: test-helper * fix: onboarding test cases * fix: tests again * refactoring the code * latest develop merging precautions - fixed a minor null issue * fix: typo * fix :menu issues due to the merging * fix: - clicking on tooljet logo didnt redirect to login page for public apps - private app preview doesnt load after login * subpath fixes * fixed back to issue * PR changes * fix: spec fixes for EE * doc: URL scoped for workspace --------- Co-authored-by: gsmithun4 <gsmithun4@gmail.com> Co-authored-by: Shubhendra <withshubh@gmail.com>
2023-04-06 11:12:58 +00:00
};
return (
<div>
<RedirectLoader origin={Configs[router.query.origin] ? router.query.origin : 'unknown'} />
{error && (
<Navigate
replace
to={`/login${error && organizationId ? `/${organizationId}` : ''}`}
state={{ errorMessage: error && error }}
/>
)}
</div>
);
}