Skip to content
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

Jump to bottom

fix(ui): Fix "Using Your Login". Fixes #4707 #4708

Merged
merged 3 commits into from
Dec 11, 2020
Merged

fix(ui): Fix "Using Your Login". Fixes #4707 #4708

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e450391
fix(ui): Fix "Using Your Login". Fixes #4707
alexec Dec 11, 2020
0fb17c0
Merge branch 'master' into fix-4707
alexec Dec 11, 2020
2e9439c
Merge branch 'master' into fix-4707
alexec Dec 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 9 additions & 8 deletions ui/src/app/userinfo/components/cli-help.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,19 @@ import * as React from 'react';
import {createRef, useState} from 'react';

export const CliHelp = () => {
const argoSecure = document.location.protocol === 'https';
const argoSecure = document.location.protocol === 'https:';
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bug #1 - just did not work with https

const argoBaseHref = document
.getElementsByTagName('base')[0]
.href.toString()
.replace(document.location.protocol + '//' + document.location.host + '/', '');
const argoToken = decodeURIComponent(document.cookie)
.split(';')
.map(x => x.trim())
.find(x => x.startsWith('authorization='))
.replace('authorization=', '');
const argoToken = (
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bug #2 - did not work if there was no token (crashed page)

decodeURIComponent(document.cookie)
.split(';')
.map(x => x.trim())
.find(x => x.startsWith('authorization=')) || ''
).replace('authorization=', '');

const text = `export ARGO_SERVER='${document.location.host}'
const text = `export ARGO_SERVER='${document.location.hostname}:${document.location.port || (argoSecure ? 443 : 80)}'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bug #3 - did not work if the port was the default for the protocol

export ARGO_HTTP1=true
export ARGO_SECURE=${argoSecure ? 'true' : 'false'}
export ARGO_BASE_HREF=${argoBaseHref}
Expand All @@ -30,7 +31,7 @@ argo list`;
<div className='white-box'>
<h4>Using Your Login With The CLI</h4>
<p>Download the latest CLI before you start.</p>
<div style={{fontFamily: 'monospace', whiteSpace: 'pre', margin: 20}}>{text.replace(argoToken, '[REDACTED]')}</div>
<div style={{fontFamily: 'monospace', whiteSpace: 'pre', margin: 20}}>{argoToken ? text.replace(argoToken, '[REDACTED]') : text}</div>
<p>For help with options such as ARGO_INSECURE_SKIP_VERIFY, ARGO_NAMESPACE and ARGO_INSTANCEID, run: `argo --help`.</p>
<div>
<button
Expand Down