Skip to content

adding param to manage SSO redirection #918

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 11, 2024
Merged

adding param to manage SSO redirection #918

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4050633
adding param to manage SSO redirection
alfredorubin96 Jul 9, 2024
59b2ade
added standalone when not sharing credentials
alfredorubin96 Jul 10, 2024
b0f4eff
Merge branch 'develop' into fix/share-standalone-sso
nielsdejong Sep 24, 2024
1312a68
Removed superfluous log statements
nielsdejong Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 11 additions & 30 deletions src/application/ApplicationThunks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,6 @@ export const handleSharedDashboardsThunk = () => (dispatch: any) => {
if (dashboardDatabase) {
dispatch(setStandaloneDashboardDatabase(dashboardDatabase));
}

if (urlParams.get('credentials')) {
setWelcomeScreenOpen(false);
const connection = decodeURIComponent(urlParams.get('credentials'));
Expand All @@ -271,32 +270,6 @@ export const handleSharedDashboardsThunk = () => (dispatch: any) => {
const database = connection.split('@')[1].split(':')[0];
const url = connection.split('@')[1].split(':')[1];
const port = connection.split('@')[1].split(':')[2];
// if (url == password) {
// // Special case where a connect link is generated without a password.
// // Here, the format is parsed incorrectly and we open the connection window instead.
// dispatch(setConnectionProperties(protocol, url, port, database, username.split('@')[0], ''));
// dispatch(
// setShareDetailsFromUrl(
// type,
// id,
// standalone,
// protocol,
// url,
// port,
// database,
// username.split('@')[0],
// '',
// dashboardDatabase,
// true
// )
// );
// setDashboardToLoadAfterConnecting(id);
// window.history.pushState({}, document.title, window.location.pathname);
// dispatch(setConnectionModalOpen(true));
// dispatch(setWelcomeScreenOpen(false));
// // window.history.pushState({}, document.title, "/");
// return;
// }

dispatch(setConnectionModalOpen(false));
dispatch(
Expand Down Expand Up @@ -327,7 +300,7 @@ export const handleSharedDashboardsThunk = () => (dispatch: any) => {
setShareDetailsFromUrl(
type,
id,
undefined,
standalone,
undefined,
undefined,
undefined,
Expand Down Expand Up @@ -358,6 +331,7 @@ export const handleSharedDashboardsThunk = () => (dispatch: any) => {
*/
export const onConfirmLoadSharedDashboardThunk = () => (dispatch: any, getState: any) => {
try {
console.log('IN');
const state = getState();
const { shareDetails } = state.application;
dispatch(setWelcomeScreenOpen(false));
Expand Down Expand Up @@ -385,6 +359,7 @@ export const onConfirmLoadSharedDashboardThunk = () => (dispatch: any, getState:
}
if (shareDetails.standalone == true) {
dispatch(setStandaloneMode(true));
localStorage.setItem('standaloneShared', 'true'); // EDGE CASE: redirect SSO removes the shareDetails when redirecting
}
dispatch(resetShareDetails());
} catch (e) {
Expand Down Expand Up @@ -455,10 +430,15 @@ export const loadApplicationConfigThunk = () => async (dispatch: any, getState:
dispatch(setSSOEnabled(config.ssoEnabled, state.application.cachedSSODiscoveryUrl));
dispatch(setSSOProviders(config.ssoProviders));

const { standalone } = config;
// Check if we are in standalone mode
// const standaloneShared = localStorage.getItem('standaloneShared') == 'true'; // EDGE case: from url param it could happen that we lose the value due to SSO redirect
const {standalone} = config;
// || standaloneShared;

// if a dashboard database was previously set, remember to use it.
const dashboardDatabase = state.application.standaloneDashboardDatabase;

console.log(`Standalone: ${ standalone}`);
console.log(`Standalone Shared${ localStorage.getItem('standaloneShared')}`);
dispatch(
setStandaloneEnabled(
standalone,
Expand All @@ -478,6 +458,7 @@ export const loadApplicationConfigThunk = () => async (dispatch: any, getState:
config.standaloneDatabaseList
)
);
localStorage.removeItem('standaloneShared');

dispatch(setLoggingMode(config.loggingMode));
dispatch(setLoggingDatabase(config.loggingDatabase));
Expand Down