[ARVADOS-WORKBENCH2] updated: 1.3.1-471-gcd10c61b
Git user
git at public.curoverse.com
Fri May 17 20:27:08 UTC 2019
Summary of changes:
src/views/workbench/fed-login.tsx | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
via cd10c61ba9a77ca1d4dea853dacc350c729cab9f (commit)
from 53a66ff40ecb6a06082ef84312d22af4f9190280 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit cd10c61ba9a77ca1d4dea853dacc350c729cab9f
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date: Fri May 17 16:26:13 2019 -0400
Fix federated login, only create iframes for local user refs #15064
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>
diff --git a/src/views/workbench/fed-login.tsx b/src/views/workbench/fed-login.tsx
index 399b419e..d09e6893 100644
--- a/src/views/workbench/fed-login.tsx
+++ b/src/views/workbench/fed-login.tsx
@@ -13,7 +13,7 @@ import { Config } from '~/common/config';
export interface FedLoginProps {
user?: User;
apiToken?: string;
- homeCluster: string;
+ localCluster: string;
remoteHostsConfig: { [key: string]: Config };
}
@@ -21,20 +21,20 @@ const mapStateToProps = ({ auth }: RootState) => ({
user: auth.user,
apiToken: auth.apiToken,
remoteHostsConfig: auth.remoteHostsConfig,
- homeCluster: auth.homeCluster,
+ localCluster: auth.localCluster,
});
export const FedLogin = connect(mapStateToProps)(
class extends React.Component<FedLoginProps> {
render() {
- const { apiToken, user, homeCluster, remoteHostsConfig } = this.props;
- if (!apiToken || !user || !user.uuid.startsWith(homeCluster)) {
+ const { apiToken, user, localCluster, remoteHostsConfig } = this.props;
+ if (!apiToken || !user || !user.uuid.startsWith(localCluster)) {
return <></>;
}
const [, tokenUuid, token] = apiToken.split("/");
return <div id={"fedtoken-iframe-div"}>
{Object.keys(remoteHostsConfig)
- .map((k) => k !== homeCluster &&
+ .map((k) => k !== localCluster &&
<iframe key={k} src={`${remoteHostsConfig[k].workbench2Url}/fedtoken?api_token=${getSaltedToken(k, tokenUuid, token)}`} style={{
height: 0,
width: 0,
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list