diff options
| author | Chris <ccbrown112@gmail.com> | 2018-02-22 18:23:32 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-22 18:23:32 -0600 |
| commit | d44ef7ea67324072f3fbf1230c77f0ee0b4ac8bd (patch) | |
| tree | 250e6f64e10631d6e0470e57916d82c897fc8b6a /app/oauth.go | |
| parent | 1b3808f3ecf754876168a9342e18c46d49f32ddf (diff) | |
| download | chat-d44ef7ea67324072f3fbf1230c77f0ee0b4ac8bd.tar.gz chat-d44ef7ea67324072f3fbf1230c77f0ee0b4ac8bd.tar.bz2 chat-d44ef7ea67324072f3fbf1230c77f0ee0b4ac8bd.zip | |
Remove global site url (#8343)
* remove global site url
* missed one
* revert mysterious change
Diffstat (limited to 'app/oauth.go')
| -rw-r--r-- | app/oauth.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/oauth.go b/app/oauth.go index 5a66f542e..b9001ee0b 100644 --- a/app/oauth.go +++ b/app/oauth.go @@ -527,7 +527,7 @@ func (a *App) CompleteSwitchWithOAuth(service string, userData io.ReadCloser, em } a.Go(func() { - if err := a.SendSignInChangeEmail(user.Email, strings.Title(service)+" SSO", user.Locale, utils.GetSiteURL()); err != nil { + if err := a.SendSignInChangeEmail(user.Email, strings.Title(service)+" SSO", user.Locale, a.GetSiteURL()); err != nil { l4g.Error(err.Error()) } }) @@ -600,7 +600,7 @@ func (a *App) GetAuthorizationCode(w http.ResponseWriter, r *http.Request, servi props["token"] = stateToken.Token state := b64.StdEncoding.EncodeToString([]byte(model.MapToJson(props))) - redirectUri := utils.GetSiteURL() + "/signup/" + service + "/complete" + redirectUri := a.GetSiteURL() + "/signup/" + service + "/complete" authUrl := endpoint + "?response_type=code&client_id=" + clientId + "&redirect_uri=" + url.QueryEscape(redirectUri) + "&state=" + url.QueryEscape(state) @@ -736,7 +736,7 @@ func (a *App) SwitchEmailToOAuth(w http.ResponseWriter, r *http.Request, email, stateProps["email"] = email if service == model.USER_AUTH_SERVICE_SAML { - return utils.GetSiteURL() + "/login/sso/saml?action=" + model.OAUTH_ACTION_EMAIL_TO_SSO + "&email=" + utils.UrlEncode(email), nil + return a.GetSiteURL() + "/login/sso/saml?action=" + model.OAUTH_ACTION_EMAIL_TO_SSO + "&email=" + utils.UrlEncode(email), nil } else { if authUrl, err := a.GetAuthorizationCode(w, r, service, stateProps, ""); err != nil { return "", err @@ -768,7 +768,7 @@ func (a *App) SwitchOAuthToEmail(email, password, requesterId string) (string, * T := utils.GetUserTranslations(user.Locale) a.Go(func() { - if err := a.SendSignInChangeEmail(user.Email, T("api.templates.signin_change_email.body.method_email"), user.Locale, utils.GetSiteURL()); err != nil { + if err := a.SendSignInChangeEmail(user.Email, T("api.templates.signin_change_email.body.method_email"), user.Locale, a.GetSiteURL()); err != nil { l4g.Error(err.Error()) } }) |