From c4a3118e9f885e92bb9b7d882898e9a51fc3be69 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Tue, 2 Aug 2016 16:37:09 -0400 Subject: PLT-3408 Add SiteURL to config.json (#3692) * PLT-3408 Changed serverside code to get the service's URL from config.json * PLT-3408 Changed most clientside code to use the SiteURL config setting instead of window.location * PLT-3408 Changed default SiteURL to be autodetected --- mattermost.go | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) (limited to 'mattermost.go') diff --git a/mattermost.go b/mattermost.go index 68f7f26da..1b93fe8df 100644 --- a/mattermost.go +++ b/mattermost.go @@ -70,7 +70,6 @@ var flagEmail string var flagPassword string var flagTeamName string var flagChannelName string -var flagSiteURL string var flagConfirmBackup string var flagRole string var flagRunCmds bool @@ -290,7 +289,6 @@ func parseCmds() { flag.StringVar(&flagPassword, "password", "", "") flag.StringVar(&flagTeamName, "team_name", "", "") flag.StringVar(&flagChannelName, "channel_name", "", "") - flag.StringVar(&flagSiteURL, "site_url", "", "") flag.StringVar(&flagConfirmBackup, "confirm_backup", "", "") flag.StringVar(&flagFromAuth, "from_auth", "", "") flag.StringVar(&flagToAuth, "to_auth", "", "") @@ -863,16 +861,8 @@ func cmdInviteUser() { os.Exit(1) } - if len(flagSiteURL) == 0 { - fmt.Fprintln(os.Stderr, "flag needs an argument: -site_url") - flag.Usage() - os.Exit(1) - } - - // basic validation of the URL format - if _, err := url.ParseRequestURI(flagSiteURL); err != nil { - fmt.Fprintln(os.Stderr, "-site_url flag is invalid. It should look like http://example.com") - flag.Usage() + if len(*utils.Cfg.ServiceSettings.SiteURL) == 0 { + fmt.Fprintln(os.Stderr, "SiteURL must be specified in config.json") os.Exit(1) } @@ -894,7 +884,6 @@ func cmdInviteUser() { invites := []string{flagEmail} c := getMockContext() - c.SetSiteURL(strings.TrimSuffix(flagSiteURL, "/")) api.InviteMembers(c, team, user, invites) os.Exit(0) @@ -1590,8 +1579,6 @@ FLAGS: -team_name="name" The team name used in other commands - -site_url="url" The site URL used in other commands - -role="system_admin" The role used in other commands valid values are "" - The empty role is basic user @@ -1611,9 +1598,9 @@ COMMANDS: platform -create_user -team_name="name" -email="user@example.com" -password="mypassword" -username="user" -invite_user Invites a user to a team by email. It requires the -team_name - , -email and -site_url flags. + and -email flags. Example: - platform -invite_user -team_name="name" -email="user@example.com" -site_url="https://mattermost.example.com" + platform -invite_user -team_name="name" -email="user@example.com" -leave_team Removes a user from a team. It requires the -team_name and -email. -- cgit v1.2.3-1-g7c22