[WIP] [MM-55031] OAuth Outgoing Connection App integration (#25379)
* OAuthOutgoingConnection model * added store * make generated * add missing license headers * fix receiver name * i18n * i18n sorting * update migrations from master * make migrations-extract * update retrylayer tests * replaced sql query with id pagination * fixed flaky tests * missing columns * missing columns on save/update * typo * improved tests * remove enum from mysql colum * add password credentials to store * license changes * OAuthOutgoingConnectionInterface * Oauth -> OAuth * make generated * merge migrations * renamed migrations * model change suggestions * refactor test functionsn * migration typo * refactor store table names * updated sanitize test * cleanup merge * refactor symbol * list endpoint * oauthoutgoingconnection -> outgoingoauthconnection * signature change * i18n update * granttype typo * naming * api list * uppercase typo * i18n * missing license header * fixed path in comments * updated openapi definitions * sanitize connections * make generated * test license and no feature flag * removed t.fatal * updated testhelper calls * yaml schema fixes * switched interface name * suggested translation * missing i18n translation * address comments * updated i18n
Этот коммит содержится в:
Felipe Martin
коммит произвёл
GitHub
GitHub
родитель
287cbad2d5
Коммит
81a1d725a0
337
server/channels/api4/outgoing_oauth_connection_test.go
Обычный файл
337
server/channels/api4/outgoing_oauth_connection_test.go
Обычный файл
@@ -0,0 +1,337 @@
|
||||
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
||||
// See LICENSE.txt for license information.
|
||||
package api4
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"os"
|
||||
"testing"
|
||||
|
||||
"github.com/mattermost/mattermost/server/public/model"
|
||||
"github.com/mattermost/mattermost/server/public/plugin/plugintest/mock"
|
||||
"github.com/mattermost/mattermost/server/v8/channels/web"
|
||||
"github.com/mattermost/mattermost/server/v8/einterfaces/mocks"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
func newOutgoingOAuthConnection() *model.OutgoingOAuthConnection {
|
||||
return &model.OutgoingOAuthConnection{
|
||||
Name: "test",
|
||||
CreatorId: model.NewId(),
|
||||
ClientId: "test",
|
||||
ClientSecret: "test",
|
||||
OAuthTokenURL: "http://localhost:9999/oauth/token",
|
||||
GrantType: model.OutgoingOAuthConnectionGrantTypeClientCredentials,
|
||||
Audiences: []string{"http://example.com"},
|
||||
}
|
||||
}
|
||||
|
||||
func outgoingOauthConnectionsCleanup(t *testing.T, th *TestHelper) {
|
||||
t.Helper()
|
||||
|
||||
// Remove all connections
|
||||
conns, errCleanup := th.App.Srv().Store().OutgoingOAuthConnection().GetConnections(th.Context, model.OutgoingOAuthConnectionGetConnectionsFilter{})
|
||||
require.NoError(t, errCleanup)
|
||||
|
||||
for _, c := range conns {
|
||||
require.NoError(t, th.App.Srv().Store().OutgoingOAuthConnection().DeleteConnection(th.Context, c.Id))
|
||||
}
|
||||
}
|
||||
|
||||
// Client tests
|
||||
|
||||
func TestOutgoingOAuthConnectionGet(t *testing.T) {
|
||||
t.Run("No license returns 501", func(t *testing.T) {
|
||||
os.Setenv("MM_FEATUREFLAGS_OUTGOINGOAUTHCONNECTION", "true")
|
||||
defer os.Unsetenv("MM_FEATUREFLAGS_OUTGOINGOAUTHCONNECTION")
|
||||
th := Setup(t).InitBasic()
|
||||
defer th.TearDown()
|
||||
|
||||
outgoingOauthIface := &mocks.OutgoingOAuthConnectionInterface{}
|
||||
outgoingOauthImpl := th.App.Srv().OutgoingOAuthConnection
|
||||
defer func() {
|
||||
th.App.Srv().OutgoingOAuthConnection = outgoingOauthImpl
|
||||
}()
|
||||
th.App.Srv().OutgoingOAuthConnection = outgoingOauthIface
|
||||
|
||||
th.Client.Login(context.Background(), th.BasicUser.Email, th.BasicUser.Password)
|
||||
|
||||
connections, response, err := th.Client.GetOutgoingOAuthConnections(context.Background(), "", 10)
|
||||
require.Error(t, err)
|
||||
require.Nil(t, connections)
|
||||
require.Equal(t, 501, response.StatusCode)
|
||||
})
|
||||
|
||||
t.Run("license but no feature flag returns 501", func(t *testing.T) {
|
||||
th := Setup(t).InitBasic()
|
||||
defer th.TearDown()
|
||||
|
||||
outgoingOauthIface := &mocks.OutgoingOAuthConnectionInterface{}
|
||||
outgoingOauthImpl := th.App.Srv().OutgoingOAuthConnection
|
||||
defer func() {
|
||||
th.App.Srv().OutgoingOAuthConnection = outgoingOauthImpl
|
||||
}()
|
||||
th.App.Srv().OutgoingOAuthConnection = outgoingOauthIface
|
||||
license := model.NewTestLicenseSKU(model.LicenseShortSkuEnterprise, "outgoing_oauth_connections")
|
||||
license.Id = "test-license-id"
|
||||
th.App.Srv().SetLicense(license)
|
||||
th.App.Srv().RemoveLicense()
|
||||
|
||||
th.Client.Login(context.Background(), th.BasicUser.Email, th.BasicUser.Password)
|
||||
|
||||
connections, response, err := th.Client.GetOutgoingOAuthConnections(context.Background(), "", 10)
|
||||
require.Error(t, err)
|
||||
require.Nil(t, connections)
|
||||
require.Equal(t, 501, response.StatusCode)
|
||||
})
|
||||
}
|
||||
|
||||
func TestListOutgoingOAutConnection(t *testing.T) {
|
||||
os.Setenv("MM_FEATUREFLAGS_OUTGOINGOAUTHCONNECTIONS", "true")
|
||||
defer os.Unsetenv("MM_FEATUREFLAGS_OUTGOINGOAUTHCONNECTIONS")
|
||||
th := Setup(t).InitBasic()
|
||||
defer th.TearDown()
|
||||
|
||||
license := model.NewTestLicenseSKU(model.LicenseShortSkuEnterprise, "outgoing_oauth_connections")
|
||||
license.Id = "test-license-id"
|
||||
th.App.Srv().SetLicense(license)
|
||||
|
||||
t.Run("empty", func(t *testing.T) {
|
||||
defer outgoingOauthConnectionsCleanup(t, th)
|
||||
|
||||
outgoingOauthIface := &mocks.OutgoingOAuthConnectionInterface{}
|
||||
th.App.Srv().OutgoingOAuthConnection = outgoingOauthIface
|
||||
outgoingOauthIface.Mock.On("GetConnections", mock.Anything, mock.Anything).Return([]*model.OutgoingOAuthConnection{}, nil)
|
||||
outgoingOauthIface.Mock.On("SanitizeConnections", mock.Anything)
|
||||
|
||||
th.Client.Login(context.Background(), th.BasicUser.Email, th.BasicUser.Password)
|
||||
|
||||
connections, response, err := th.Client.GetOutgoingOAuthConnections(context.Background(), "", 10)
|
||||
require.NoError(t, err)
|
||||
|
||||
require.Equal(t, 200, response.StatusCode)
|
||||
require.Equal(t, 0, len(connections))
|
||||
})
|
||||
|
||||
t.Run("return result", func(t *testing.T) {
|
||||
defer outgoingOauthConnectionsCleanup(t, th)
|
||||
|
||||
conn := newOutgoingOAuthConnection()
|
||||
|
||||
conn, err := th.App.Srv().Store().OutgoingOAuthConnection().SaveConnection(th.Context, conn)
|
||||
require.NoError(t, err)
|
||||
|
||||
outgoingOauthIface := &mocks.OutgoingOAuthConnectionInterface{}
|
||||
th.App.Srv().OutgoingOAuthConnection = outgoingOauthIface
|
||||
outgoingOauthIface.Mock.On("GetConnections", mock.Anything, mock.Anything).Return([]*model.OutgoingOAuthConnection{conn}, nil)
|
||||
outgoingOauthIface.Mock.On("SanitizeConnections", mock.Anything)
|
||||
|
||||
th.Client.Login(context.Background(), th.BasicUser.Email, th.BasicUser.Password)
|
||||
|
||||
connections, response, err := th.Client.GetOutgoingOAuthConnections(context.Background(), "", 10)
|
||||
require.NoError(t, err)
|
||||
|
||||
require.Equal(t, 200, response.StatusCode)
|
||||
require.Equal(t, 1, len(connections))
|
||||
require.Equal(t, conn, connections[0])
|
||||
})
|
||||
}
|
||||
|
||||
func TestGetOutgoingOauthConnection(t *testing.T) {
|
||||
os.Setenv("MM_FEATUREFLAGS_OUTGOINGOAUTHCONNECTIONS", "true")
|
||||
defer os.Unsetenv("MM_FEATUREFLAGS_OUTGOINGOAUTHCONNECTIONS")
|
||||
th := Setup(t).InitBasic()
|
||||
defer th.TearDown()
|
||||
defer th.App.Srv().RemoveLicense()
|
||||
|
||||
license := model.NewTestLicenseSKU(model.LicenseShortSkuEnterprise, "outgoing_oauth_connections")
|
||||
license.Id = "test-license-id"
|
||||
th.App.Srv().SetLicense(license)
|
||||
|
||||
t.Run("return result", func(t *testing.T) {
|
||||
defer outgoingOauthConnectionsCleanup(t, th)
|
||||
|
||||
conn := newOutgoingOAuthConnection()
|
||||
|
||||
conn, err := th.App.Srv().Store().OutgoingOAuthConnection().SaveConnection(th.Context, conn)
|
||||
require.NoError(t, err)
|
||||
|
||||
outgoingOauthIface := &mocks.OutgoingOAuthConnectionInterface{}
|
||||
outgoingOauthIface.Mock.On("GetConnection", mock.Anything, mock.Anything).Return(conn, nil)
|
||||
outgoingOauthIface.Mock.On("SanitizeConnection", mock.Anything)
|
||||
|
||||
outgoingOauthImpl := th.App.Srv().OutgoingOAuthConnection
|
||||
defer func() {
|
||||
th.App.Srv().OutgoingOAuthConnection = outgoingOauthImpl
|
||||
}()
|
||||
th.App.Srv().OutgoingOAuthConnection = outgoingOauthIface
|
||||
|
||||
th.Client.Login(context.Background(), th.BasicUser.Email, th.BasicUser.Password)
|
||||
|
||||
connection, response, err := th.Client.GetOutgoingOAuthConnection(context.Background(), conn.Id)
|
||||
require.NoError(t, err)
|
||||
|
||||
require.Equal(t, 200, response.StatusCode)
|
||||
require.NotNil(t, connection)
|
||||
require.Equal(t, conn.Id, connection.Id)
|
||||
require.Equal(t, conn, connection)
|
||||
})
|
||||
}
|
||||
|
||||
// API tests
|
||||
|
||||
func TestEnsureOutgoingOAuthConnectionInterface(t *testing.T) {
|
||||
t.Run("no feature flag, no interface, no license", func(t *testing.T) {
|
||||
th := Setup(t).InitBasic()
|
||||
defer th.TearDown()
|
||||
|
||||
c := &Context{}
|
||||
c.AppContext = th.Context
|
||||
c.App = th.App
|
||||
c.Logger = th.App.Srv().Log()
|
||||
|
||||
th.App.Srv().OutgoingOAuthConnection = nil
|
||||
|
||||
_, valid := ensureOutgoingOAuthConnectionInterface(c, "api")
|
||||
require.False(t, valid)
|
||||
})
|
||||
|
||||
t.Run("feature flag, no interface, no license", func(t *testing.T) {
|
||||
os.Setenv("MM_FEATUREFLAGS_OUTGOINGOAUTHCONNECTIONS", "true")
|
||||
defer os.Unsetenv("MM_FEATUREFLAGS_OUTGOINGOAUTHCONNECTIONS")
|
||||
|
||||
th := Setup(t).InitBasic()
|
||||
defer th.TearDown()
|
||||
|
||||
c := &Context{}
|
||||
c.AppContext = th.Context
|
||||
c.App = th.App
|
||||
c.Logger = th.App.Srv().Log()
|
||||
|
||||
th.App.Srv().OutgoingOAuthConnection = nil
|
||||
|
||||
_, valid := ensureOutgoingOAuthConnectionInterface(c, "api")
|
||||
require.False(t, valid)
|
||||
})
|
||||
|
||||
t.Run("feature flag, interface defined, no license", func(t *testing.T) {
|
||||
os.Setenv("MM_FEATUREFLAGS_OUTGOINGOAUTHCONNECTIONS", "true")
|
||||
defer os.Unsetenv("MM_FEATUREFLAGS_OUTGOINGOAUTHCONNECTIONS")
|
||||
|
||||
th := Setup(t).InitBasic()
|
||||
defer th.TearDown()
|
||||
|
||||
c := &Context{}
|
||||
c.AppContext = th.Context
|
||||
c.App = th.App
|
||||
c.Logger = th.App.Srv().Log()
|
||||
|
||||
th.App.Srv().OutgoingOAuthConnection = &mocks.OutgoingOAuthConnectionInterface{}
|
||||
|
||||
_, valid := ensureOutgoingOAuthConnectionInterface(c, "api")
|
||||
require.False(t, valid)
|
||||
})
|
||||
|
||||
t.Run("feature flag, interface defined, valid license", func(t *testing.T) {
|
||||
os.Setenv("MM_FEATUREFLAGS_OUTGOINGOAUTHCONNECTIONS", "true")
|
||||
defer os.Unsetenv("MM_FEATUREFLAGS_OUTGOINGOAUTHCONNECTIONS")
|
||||
|
||||
th := Setup(t).InitBasic()
|
||||
defer th.TearDown()
|
||||
|
||||
license := model.NewTestLicenseSKU(model.LicenseShortSkuEnterprise, "outgoing_oauth_connections")
|
||||
license.Id = "test-license-id"
|
||||
th.App.Srv().SetLicense(license)
|
||||
defer th.App.Srv().RemoveLicense()
|
||||
|
||||
th.App.Srv().OutgoingOAuthConnection = &mocks.OutgoingOAuthConnectionInterface{}
|
||||
|
||||
c := &Context{}
|
||||
c.AppContext = th.Context
|
||||
c.App = th.App
|
||||
c.Logger = th.App.Srv().Log()
|
||||
|
||||
svc, valid := ensureOutgoingOAuthConnectionInterface(c, "api")
|
||||
require.True(t, valid)
|
||||
require.NotNil(t, svc)
|
||||
})
|
||||
}
|
||||
|
||||
func TestOutgoingOAuthConnectionAPIHandlers(t *testing.T) {
|
||||
os.Setenv("MM_FEATUREFLAGS_OUTGOINGOAUTHCONNECTIONS", "true")
|
||||
defer os.Unsetenv("MM_FEATUREFLAGS_OUTGOINGOAUTHCONNECTIONS")
|
||||
th := Setup(t).InitBasic()
|
||||
defer th.TearDown()
|
||||
|
||||
license := model.NewTestLicenseSKU(model.LicenseShortSkuEnterprise, "outgoing_oauth_connections")
|
||||
license.Id = "test-license-id"
|
||||
th.App.Srv().SetLicense(license)
|
||||
defer th.App.Srv().RemoveLicense()
|
||||
|
||||
c := &Context{}
|
||||
c.AppContext = th.Context
|
||||
c.App = th.App
|
||||
c.Logger = th.App.Srv().Log()
|
||||
|
||||
conn := newOutgoingOAuthConnection()
|
||||
|
||||
t.Run("getOutgoingOAuthConnection", func(t *testing.T) {
|
||||
req, err := http.NewRequest("GET", "/", nil)
|
||||
if err != nil {
|
||||
t.Error(err)
|
||||
}
|
||||
|
||||
c.Params = &web.Params{
|
||||
OutgoingOAuthConnectionID: conn.Id,
|
||||
}
|
||||
|
||||
outgoingOauthIface := &mocks.OutgoingOAuthConnectionInterface{}
|
||||
th.App.Srv().OutgoingOAuthConnection = outgoingOauthIface
|
||||
outgoingOauthIface.Mock.On("GetConnection", th.Context, c.Params.OutgoingOAuthConnectionID).Return(conn, nil)
|
||||
outgoingOauthIface.Mock.On("SanitizeConnection", mock.Anything)
|
||||
|
||||
httpRecorder := httptest.NewRecorder()
|
||||
handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
getOutgoingOAuthConnection(c, w, r)
|
||||
})
|
||||
|
||||
handler.ServeHTTP(httpRecorder, req)
|
||||
|
||||
require.Equal(t, http.StatusOK, httpRecorder.Code)
|
||||
require.NotEmpty(t, httpRecorder.Body.String())
|
||||
|
||||
var buf bytes.Buffer
|
||||
require.NoError(t, json.NewEncoder(&buf).Encode(conn))
|
||||
})
|
||||
|
||||
t.Run("listOutgoingOAuthConnections", func(t *testing.T) {
|
||||
req, err := http.NewRequest("GET", "/", nil)
|
||||
if err != nil {
|
||||
t.Error(err)
|
||||
}
|
||||
|
||||
conns := []*model.OutgoingOAuthConnection{conn}
|
||||
|
||||
outgoingOauthIface := &mocks.OutgoingOAuthConnectionInterface{}
|
||||
th.App.Srv().OutgoingOAuthConnection = outgoingOauthIface
|
||||
outgoingOauthIface.Mock.On("GetConnections", th.Context, mock.Anything).Return(conns, nil)
|
||||
outgoingOauthIface.Mock.On("SanitizeConnections", mock.Anything)
|
||||
|
||||
httpRecorder := httptest.NewRecorder()
|
||||
handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
listOutgoingOAuthConnections(c, w, r)
|
||||
})
|
||||
|
||||
handler.ServeHTTP(httpRecorder, req)
|
||||
|
||||
require.Equal(t, http.StatusOK, httpRecorder.Code)
|
||||
require.NotEmpty(t, httpRecorder.Body.String())
|
||||
|
||||
var buf bytes.Buffer
|
||||
require.NoError(t, json.NewEncoder(&buf).Encode(conn))
|
||||
})
|
||||
}
|
||||
Ссылка в новой задаче
Block a user