Merge branch 'master' into plugins-2

1 files changed, 3 insertions, 10 deletions

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
 }