Merge branch 'dev' into possibility-to-bind-user-to-org-on-signup-and-login

FalkWolsky · web-flow · commit d0c019f9104d · 2023-11-24T16:37:20.000+01:00
diff --git a/client/packages/lowcoder/src/pages/setting/idSource/list.tsx b/client/packages/lowcoder/src/pages/setting/idSource/list.tsx
@@ -54,8 +54,7 @@ export const IdSourceList = (props: any) => {
     currentDomain += `:${port}`;
   }
 
-  const redirectUrl = encodeURIComponent(`${protocol}//${currentDomain}/apps`);
-  const loginUrl = `${protocol}//${currentDomain}/org/${currentOrgId}/auth/login?redirectUrl=${encodeURIComponent(redirectUrl)}`;
+  const loginUrl = `${protocol}//${currentDomain}/org/${currentOrgId}/auth/login`;
 
   useEffect(() => {
     if (!currentOrgId) {

Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,7 @@ export const IdSourceList = (props: any) => {`
`54`	`54`	currentDomain += `:${port}`;
`55`	`55`	`}`
`56`	`56`
`57`		- const redirectUrl = encodeURIComponent(`${protocol}//${currentDomain}/apps`);
`58`		- const loginUrl = `${protocol}//${currentDomain}/org/${currentOrgId}/auth/login?redirectUrl=${encodeURIComponent(redirectUrl)}`;
	`57`	+ const loginUrl = `${protocol}//${currentDomain}/org/${currentOrgId}/auth/login`;
`59`	`58`
`60`	`59`	`useEffect(() => {`
`61`	`60`	`if (!currentOrgId) {`