diff options
-rw-r--r-- | app/oauth.go | 6 | ||||
-rw-r--r-- | i18n/en.json | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/oauth.go b/app/oauth.go index 4174f8146..d3633b7eb 100644 --- a/app/oauth.go +++ b/app/oauth.go @@ -682,16 +682,16 @@ func AuthorizeOAuthUser(w http.ResponseWriter, r *http.Request, service, code, s ar = model.AccessResponseFromJson(resp.Body) defer CloseBody(resp) if ar == nil { - return nil, "", nil, model.NewLocAppError("AuthorizeOAuthUser", "api.user.authorize_oauth_user.bad_response.app_error", nil, "response_body="+string(bodyBytes)) + return nil, "", stateProps, model.NewLocAppError("AuthorizeOAuthUser", "api.user.authorize_oauth_user.bad_response.app_error", nil, "response_body="+string(bodyBytes)) } } if strings.ToLower(ar.TokenType) != model.ACCESS_TOKEN_TYPE { - return nil, "", nil, model.NewLocAppError("AuthorizeOAuthUser", "api.user.authorize_oauth_user.bad_token.app_error", nil, "token_type="+ar.TokenType+", response_body="+string(bodyBytes)) + return nil, "", stateProps, model.NewLocAppError("AuthorizeOAuthUser", "api.user.authorize_oauth_user.bad_token.app_error", nil, "token_type="+ar.TokenType+", response_body="+string(bodyBytes)) } if len(ar.AccessToken) == 0 { - return nil, "", nil, model.NewLocAppError("AuthorizeOAuthUser", "api.user.authorize_oauth_user.missing.app_error", nil, "response_body="+string(bodyBytes)) + return nil, "", stateProps, model.NewLocAppError("AuthorizeOAuthUser", "api.user.authorize_oauth_user.missing.app_error", nil, "response_body="+string(bodyBytes)) } p = url.Values{} diff --git a/i18n/en.json b/i18n/en.json index 70a243e56..542a538f5 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -6541,7 +6541,7 @@ }, { "id": "utils.config.supported_server_locale.app_error", - "translation": "Unable to load mattermost configuration file: DefaultServerLocale must be one of the supported locales" + "translation": "Unable to load mattermost configuration file: DefaultServerLocale must be one of the supported locales. Setting DefaultServerLocale to en as default value." }, { "id": "utils.config.validate_locale.app_error", |