From f17c15c9d83e42e46adb8e8c1fb9706b22fe6f50 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Wed, 27 Jun 2018 01:23:13 +0100 Subject: Simplify oauth (#8972) * Remove unused OauthProvider::GetIdentifier Signed-off-by: Emil Velikov * Reuse gitlab's getAuthData() instead of open-coding it Signed-off-by: Emil Velikov * Remove OauthProvider::GetAuthDataFromJson interface The data is already available via GetUserFromJson().AuthData Signed-off-by: Emil Velikov --- api4/oauth_test.go | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'api4') diff --git a/api4/oauth_test.go b/api4/oauth_test.go index 8cf20ca5e..6bbd99ccc 100644 --- a/api4/oauth_test.go +++ b/api4/oauth_test.go @@ -1127,15 +1127,8 @@ func closeBody(r *http.Response) { type MattermostTestProvider struct { } -func (m *MattermostTestProvider) GetIdentifier() string { - return model.SERVICE_GITLAB -} - func (m *MattermostTestProvider) GetUserFromJson(data io.Reader) *model.User { - return model.UserFromJson(data) -} - -func (m *MattermostTestProvider) GetAuthDataFromJson(data io.Reader) string { - authData := model.UserFromJson(data) - return authData.Email + user := model.UserFromJson(data) + user.AuthData = &user.Email + return user } -- cgit v1.2.3-1-g7c22