+ {selectAccountModal && (
+ setSelectAccountModal(undefined)} />
+ )}
+
{diconnectModal && (
setDisconnectModal(undefined)}>
, b: Set): boolean {
return a.size === b.size && Array.from(a).every(e => b.has(e));
-}
\ No newline at end of file
+}
diff --git a/components/dashboard/src/settings/SelectAccountModal.tsx b/components/dashboard/src/settings/SelectAccountModal.tsx
new file mode 100644
index 00000000000000..b8aec66ab76501
--- /dev/null
+++ b/components/dashboard/src/settings/SelectAccountModal.tsx
@@ -0,0 +1,86 @@
+/**
+ * Copyright (c) 2021 Gitpod GmbH. All rights reserved.
+ * Licensed under the GNU Affero General Public License (AGPL).
+ * See License-AGPL.txt in the project root for license information.
+ */
+
+ import { SelectAccountPayload } from "@gitpod/gitpod-protocol/lib/auth";
+ import { useEffect, useState } from "react";
+ import { gitpodHostUrl } from "../service/service";
+ import Modal from "../components/Modal";
+ import SelectableCard from "../components/SelectableCard";
+ import info from '../images/info.svg';
+
+export function SelectAccountModal(props: SelectAccountPayload & {
+ close: () => void
+}) {
+
+ const [useAccount, setUseAccount] = useState<"current" | "other">("current");
+
+ useEffect(() => {
+ }, []);
+
+ const continueWithCurrentAccount = () => {
+ props.close();
+ };
+
+ const continueWithOtherAccount = () => {
+ const accessControlUrl = gitpodHostUrl.asAccessControl().toString();
+
+ const loginUrl = gitpodHostUrl.withApi({
+ pathname: '/login',
+ search: `host=${props.otherUser.authHost}&returnTo=${encodeURIComponent(accessControlUrl)}`
+ }).toString();
+
+ const logoutUrl = gitpodHostUrl.withApi({
+ pathname: "/logout",
+ search: `returnTo=${encodeURIComponent(loginUrl)}`
+ }).toString();
+
+ window.location.href = logoutUrl;
+ };
+
+ return (
+ );
+}
\ No newline at end of file
diff --git a/components/dashboard/src/start/CreateWorkspace.tsx b/components/dashboard/src/start/CreateWorkspace.tsx
index e3ea3ca4b247c1..52a6d4c72b22f1 100644
--- a/components/dashboard/src/start/CreateWorkspace.tsx
+++ b/components/dashboard/src/start/CreateWorkspace.tsx
@@ -13,6 +13,9 @@ import { getGitpodService, gitpodHostUrl } from "../service/service";
import { UserContext } from "../user-context";
import { StartPage, StartPhase, StartWorkspaceError } from "./StartPage";
import StartWorkspace from "./StartWorkspace";
+import { openAuthorizeWindow } from "../provider-utils";
+import { SelectAccountPayload } from "@gitpod/gitpod-protocol/lib/auth";
+import { SelectAccountModal } from "../settings/SelectAccountModal";
const WorkspaceLogs = React.lazy(() => import('./WorkspaceLogs'));
@@ -23,6 +26,7 @@ export interface CreateWorkspaceProps {
export interface CreateWorkspaceState {
result?: WorkspaceCreationResult;
error?: StartWorkspaceError;
+ selectAccountError?: SelectAccountPayload;
stillParsing: boolean;
}
@@ -62,7 +66,43 @@ export default class CreateWorkspace extends React.Component {
+ window.location.href = window.location.toString();
+ },
+ onError: (error) => {
+ if (typeof error === "string") {
+ try {
+ const payload = JSON.parse(error);
+ if (SelectAccountPayload.is(payload)) {
+ this.setState({ selectAccountError: payload });
+ }
+ } catch (error) {
+ console.log(error);
+ }
+ }
+ }
+ });
+ } catch (error) {
+ console.log(error)
+ }
+ };
+
render() {
+ if (SelectAccountPayload.is(this.state.selectAccountError)) {
+ return (
+ );
+ }
+
let phase = StartPhase.Checking;
let statusMessage = ;
break;
case ErrorCodes.NOT_AUTHENTICATED:
- const authorizeUrl = gitpodHostUrl.withApi({
- pathname: '/authorize',
- search: `returnTo=${encodeURIComponent(window.location.toString())}&host=${error.data.host}&scopes=${error.data.scopes.join(',')}`
- }).toString();
- window.location.href = authorizeUrl;
statusMessage = ;
break;
case ErrorCodes.USER_BLOCKED:
diff --git a/components/server/src/auth/generic-auth-provider.ts b/components/server/src/auth/generic-auth-provider.ts
index 996ad848654d42..b62227fddb3b74 100644
--- a/components/server/src/auth/generic-auth-provider.ts
+++ b/components/server/src/auth/generic-auth-provider.ts
@@ -340,7 +340,9 @@ export class GenericAuthProvider implements AuthProvider {
if (SelectAccountException.is(err)) {
this.selectAccountCookie.set(response, err.payload);
- const url = this.env.hostUrl.with({ pathname: '/select-account' }).toString();
+
+ // option 1: send as GET param on redirect
+ const url = this.env.hostUrl.with({ pathname: '/flow-result', search: "message=error:" + Buffer.from(JSON.stringify(err.payload), "utf-8").toString('base64') }).toString();
response.redirect(url);
return;
}
Disconnect Provider
@@ -627,4 +650,4 @@ function GitIntegrationModal(props: ({ function equals(a: SetSelect Account
+
+
+
+ You are trying to authorize a provider that is already connected with another account on Gitpod.
+ +
+ 
+
+ Disconnect a provider in one of you accounts, if you like to continue with the other account.
+
+
+
+
+ setUseAccount('current')}>
+
+
+ setUseAccount('other')}>
+
+
+
+
+
+ 
+ {props.currentUser.authName}
+ {props.currentUser.authHost}
+
+
+ 
+ {props.otherUser.authName}
+ {props.otherUser.authHost}
+
+
+
+
+
+ {
+ window.location.href = gitpodHostUrl.asAccessControl().toString();
+ }} />
+
+ {this.state.stillParsing ? 'Parsing context …' : 'Preparing workspace …'}
; @@ -75,14 +115,10 @@ export default class CreateWorkspace extends React.Component