Skip to content

feat(login page): use Patternfly empty state template #292

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
craicoverflow merged 1 commit into from
Jan 26, 2021
Merged

feat(login page): use Patternfly empty state template #292

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
52 changes: 25 additions & 27 deletions pkg/cmd/login/login.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,23 +40,22 @@ const (
defaultClientID = "rhoas-cli-prod"
)

const PostLoginPage = `
<link rel="preconnect" href="https://fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css2?family=Red+Hat+Display&display=swap" rel="stylesheet">
<style>
.content {
font-family: 'Red Hat Display', sans-serif;
margin: auto;
width: 50%;
padding: 10px;
margin-top: 350px;
text-align: center;
}
</style>

<div class="content">
<h1>Logged in to RHOAS. Return to your terminal to begin.</h1>
// HTML template to show on the redirect page
const RedirectURLTemplate = `
<!DOCTYPE html>
<head>
<link rel="stylesheet" href="https://unpkg.com/@patternfly/patternfly@4.70.2/patternfly.css">
Copy link
Collaborator

@wtrocki wtrocki Jan 26, 2021

Choose a reason for hiding this comment

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

image

This little thing is going to cost us 5mb ;)

Copy link
Contributor Author

@craicoverflow craicoverflow Jan 26, 2021

Choose a reason for hiding this comment

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

It's 967kb. It is only used on this one page on rare occasions so I do not think this is an issue. Anyway, we need to use Patternfly so there's no alternative.

<title>Welcome to RHOAS</title>
</head>
<body>
<div class="pf-c-empty-state">
<div class="pf-c-empty-state__content">
<i class="fas fa-key pf-c-empty-state__icon" aria-hidden="true"></i>
<h1 class="pf-c-title pf-m-lg">Welcome to RHOAS</h1>
<div class="pf-c-empty-state__body">You have successfully logged in to the RHOAS CLI as <span style="font-weight:700">%v</span>. You may now close this tab and return to the command-line.</div>
</div>
</div>
</body>
`

// When the value of the `--url` option is one of the keys of this map it will be replaced by the
Expand Down Expand Up @@ -256,26 +255,25 @@ func runLogin(opts *Options) error {
os.Exit(1)
}

w.Header().Set("Content-Type", "text/html; charset=utf-8")
fmt.Fprintln(w, PostLoginPage)

accessTkn, _ := token.Parse(resp.OAuth2Token.AccessToken)
tknClaims, _ := token.MapClaims(accessTkn)
userName, ok := tknClaims["preferred_username"]
logger.Info("")
if !ok {
logger.Info("You are now logged in")
} else {
rawUsername := fmt.Sprintf("%v", userName)
logger.Infof("You are now logged in as %v", color.Info(rawUsername))
var rawUsername string = "unknown"
if ok {
rawUsername = fmt.Sprintf("%v", userName)
}

w.Header().Set("Content-Type", "text/html; charset=utf-8")
fmt.Fprintf(w, RedirectURLTemplate, rawUsername)

logger.Infof("You are now logged in as %v", color.Info(rawUsername))
logger.Info("")

cancel()
})

if opts.printURL {
logger.Info("Open the following URL in your browser to login:")
logger.Info("")
logger.Info("Open the following URL in your browser to login:\n\n")
fmt.Println(authCodeURL)
} else {
openBrowserExec, _ := browser.GetOpenBrowserCommand(authCodeURL)
Expand Down