diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2018-06-27 01:23:13 +0100 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2018-06-26 17:23:13 -0700 |
| commit | f17c15c9d83e42e46adb8e8c1fb9706b22fe6f50 (patch) | |
| tree | 47fc7424a307efb78262526c5d795e0649964f14 /api4 | |
| parent | 85aa3d664c32af0532113f554002a5d3192faf29 (diff) | |
| download | chat-f17c15c9d83e42e46adb8e8c1fb9706b22fe6f50.tar.gz chat-f17c15c9d83e42e46adb8e8c1fb9706b22fe6f50.tar.bz2 chat-f17c15c9d83e42e46adb8e8c1fb9706b22fe6f50.zip | |
Simplify oauth (#8972)
* Remove unused OauthProvider::GetIdentifier
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
* Reuse gitlab's getAuthData() instead of open-coding it
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
* Remove OauthProvider::GetAuthDataFromJson interface
The data is already available via GetUserFromJson().AuthData
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Diffstat (limited to 'api4')
| -rw-r--r-- | api4/oauth_test.go | 13 |
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 } |