From 2be5577b88e5ff85a98b0a2b3e3a43b90cc99c6d Mon Sep 17 00:00:00 2001 From: George Goldberg Date: Fri, 15 Sep 2017 13:32:11 +0100 Subject: Model: NewLocAppError -> NewAppError (#7450) --- model/access.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'model/access.go') diff --git a/model/access.go b/model/access.go index 9e16ed58b..551ef930f 100644 --- a/model/access.go +++ b/model/access.go @@ -6,6 +6,7 @@ package model import ( "encoding/json" "io" + "net/http" ) const ( @@ -37,23 +38,23 @@ type AccessResponse struct { func (ad *AccessData) IsValid() *AppError { if len(ad.ClientId) == 0 || len(ad.ClientId) > 26 { - return NewLocAppError("AccessData.IsValid", "model.access.is_valid.client_id.app_error", nil, "") + return NewAppError("AccessData.IsValid", "model.access.is_valid.client_id.app_error", nil, "", http.StatusBadRequest) } if len(ad.UserId) == 0 || len(ad.UserId) > 26 { - return NewLocAppError("AccessData.IsValid", "model.access.is_valid.user_id.app_error", nil, "") + return NewAppError("AccessData.IsValid", "model.access.is_valid.user_id.app_error", nil, "", http.StatusBadRequest) } if len(ad.Token) != 26 { - return NewLocAppError("AccessData.IsValid", "model.access.is_valid.access_token.app_error", nil, "") + return NewAppError("AccessData.IsValid", "model.access.is_valid.access_token.app_error", nil, "", http.StatusBadRequest) } if len(ad.RefreshToken) > 26 { - return NewLocAppError("AccessData.IsValid", "model.access.is_valid.refresh_token.app_error", nil, "") + return NewAppError("AccessData.IsValid", "model.access.is_valid.refresh_token.app_error", nil, "", http.StatusBadRequest) } if len(ad.RedirectUri) == 0 || len(ad.RedirectUri) > 256 || !IsValidHttpUrl(ad.RedirectUri) { - return NewLocAppError("AccessData.IsValid", "model.access.is_valid.redirect_uri.app_error", nil, "") + return NewAppError("AccessData.IsValid", "model.access.is_valid.redirect_uri.app_error", nil, "", http.StatusBadRequest) } return nil -- cgit v1.2.3-1-g7c22