Skip to content

Try to help the operator if they are using a URL format value for org #82

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
merged 1 commit into from
Mar 15, 2023
Merged

Try to help the operator if they are using a URL format value for org #82

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
20 changes: 19 additions & 1 deletion internal/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package config
import (
"fmt"
"net/http"
"net/url"
"strings"
"time"

Expand Down Expand Up @@ -163,10 +164,27 @@ func NewConfig() *Config {
if !cfg.QRCode {
cfg.QRCode = viper.GetBool(downCase(QRCodeEnvVar))
}

// correct org domain if it's in admin form
orgDomain := strings.Replace(cfg.OrgDomain, "-admin", "", -1)
if orgDomain != cfg.OrgDomain {
fmt.Printf("Warning: proactively correcting org domain %q to non-admin form %q.\n\n", cfg.OrgDomain, orgDomain)
fmt.Printf("WARNING: proactively correcting org domain %q to non-admin form %q.\n\n", cfg.OrgDomain, orgDomain)
cfg.OrgDomain = orgDomain
}
if strings.HasPrefix(cfg.OrgDomain, "http") {
u, err := url.Parse(cfg.OrgDomain)
// try to help correct org domain value if parsing occurs correctly,
// else let the CLI error out else where
if err == nil {
orgDomain = u.Hostname()
fmt.Printf("WARNING: proactively correcting URL format org domain %q value to hostname only form %q.\n\n", cfg.OrgDomain, orgDomain)
cfg.OrgDomain = orgDomain
}
}
if strings.HasSuffix(cfg.OrgDomain, "/") {
orgDomain = string([]byte(cfg.OrgDomain)[0 : len(cfg.OrgDomain)-1])
// try to help correct malformed org domain value
fmt.Printf("WARNING: proactively correcting malformed org domain %q value to hostname only form %q.\n\n", cfg.OrgDomain, orgDomain)
cfg.OrgDomain = orgDomain
}

Expand Down