2021-05-24 19:06:11 +02:00
|
|
|
package mattermostauthlayer
|
|
|
|
|
|
|
|
import (
|
|
|
|
"database/sql"
|
|
|
|
"encoding/json"
|
|
|
|
|
2022-04-04 16:00:40 +02:00
|
|
|
mmModel "github.com/mattermost/mattermost-server/v6/model"
|
2022-02-28 12:28:16 +01:00
|
|
|
"github.com/mattermost/mattermost-server/v6/plugin"
|
|
|
|
|
2021-05-24 19:06:11 +02:00
|
|
|
sq "github.com/Masterminds/squirrel"
|
|
|
|
|
|
|
|
"github.com/mattermost/focalboard/server/model"
|
|
|
|
"github.com/mattermost/focalboard/server/services/store"
|
2021-10-07 13:51:01 +02:00
|
|
|
"github.com/mattermost/focalboard/server/utils"
|
2021-08-25 22:08:01 +02:00
|
|
|
|
|
|
|
"github.com/mattermost/mattermost-server/v6/shared/mlog"
|
2021-05-24 19:06:11 +02:00
|
|
|
)
|
|
|
|
|
2021-07-09 03:09:02 +02:00
|
|
|
type NotSupportedError struct {
|
|
|
|
msg string
|
|
|
|
}
|
|
|
|
|
|
|
|
func (pe NotSupportedError) Error() string {
|
|
|
|
return pe.msg
|
|
|
|
}
|
|
|
|
|
2021-05-24 19:06:11 +02:00
|
|
|
// Store represents the abstraction of the data storage.
|
|
|
|
type MattermostAuthLayer struct {
|
|
|
|
store.Store
|
2022-02-28 12:28:16 +01:00
|
|
|
dbType string
|
|
|
|
mmDB *sql.DB
|
|
|
|
logger *mlog.Logger
|
|
|
|
pluginAPI plugin.API
|
2021-05-24 19:06:11 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// New creates a new SQL implementation of the store.
|
2022-02-28 12:28:16 +01:00
|
|
|
func New(dbType string, db *sql.DB, store store.Store, logger *mlog.Logger, pluginAPI plugin.API) (*MattermostAuthLayer, error) {
|
2021-05-24 19:06:11 +02:00
|
|
|
layer := &MattermostAuthLayer{
|
2022-02-28 12:28:16 +01:00
|
|
|
Store: store,
|
|
|
|
dbType: dbType,
|
|
|
|
mmDB: db,
|
|
|
|
logger: logger,
|
|
|
|
pluginAPI: pluginAPI,
|
2021-05-24 19:06:11 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return layer, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Shutdown close the connection with the store.
|
2021-06-21 11:21:42 +02:00
|
|
|
func (s *MattermostAuthLayer) Shutdown() error {
|
2021-06-25 16:49:06 +02:00
|
|
|
return s.Store.Shutdown()
|
2021-05-24 19:06:11 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
func (s *MattermostAuthLayer) GetRegisteredUserCount() (int, error) {
|
|
|
|
query := s.getQueryBuilder().
|
|
|
|
Select("count(*)").
|
|
|
|
From("Users").
|
2022-04-04 16:00:40 +02:00
|
|
|
Where(sq.Eq{"deleteAt": 0}).
|
|
|
|
Where(sq.NotEq{"roles": "system_guest"})
|
2021-05-24 19:06:11 +02:00
|
|
|
row := query.QueryRow()
|
|
|
|
|
|
|
|
var count int
|
|
|
|
err := row.Scan(&count)
|
|
|
|
if err != nil {
|
|
|
|
return 0, err
|
|
|
|
}
|
|
|
|
|
|
|
|
return count, nil
|
|
|
|
}
|
|
|
|
|
2022-04-04 16:00:40 +02:00
|
|
|
func (s *MattermostAuthLayer) GetUserByID(userID string) (*model.User, error) {
|
|
|
|
mmuser, err := s.pluginAPI.GetUser(userID)
|
2021-09-13 14:12:32 +02:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2022-04-04 16:00:40 +02:00
|
|
|
user := mmUserToFbUser(mmuser)
|
|
|
|
return &user, nil
|
2021-09-13 14:12:32 +02:00
|
|
|
}
|
|
|
|
|
2022-04-04 16:00:40 +02:00
|
|
|
func (s *MattermostAuthLayer) GetUserByEmail(email string) (*model.User, error) {
|
|
|
|
mmuser, err := s.pluginAPI.GetUserByEmail(email)
|
2021-05-24 19:06:11 +02:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2022-04-04 16:00:40 +02:00
|
|
|
user := mmUserToFbUser(mmuser)
|
|
|
|
return &user, nil
|
2021-05-24 19:06:11 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
func (s *MattermostAuthLayer) GetUserByUsername(username string) (*model.User, error) {
|
2022-04-04 16:00:40 +02:00
|
|
|
mmuser, err := s.pluginAPI.GetUserByUsername(username)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
user := mmUserToFbUser(mmuser)
|
|
|
|
return &user, nil
|
2021-05-24 19:06:11 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
func (s *MattermostAuthLayer) CreateUser(user *model.User) error {
|
2021-07-09 03:09:02 +02:00
|
|
|
return NotSupportedError{"no user creation allowed from focalboard, create it using mattermost"}
|
2021-05-24 19:06:11 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
func (s *MattermostAuthLayer) UpdateUser(user *model.User) error {
|
2021-07-09 03:09:02 +02:00
|
|
|
return NotSupportedError{"no update allowed from focalboard, update it using mattermost"}
|
2021-05-24 19:06:11 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
func (s *MattermostAuthLayer) UpdateUserPassword(username, password string) error {
|
2021-07-09 03:09:02 +02:00
|
|
|
return NotSupportedError{"no update allowed from focalboard, update it using mattermost"}
|
2021-05-24 19:06:11 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
func (s *MattermostAuthLayer) UpdateUserPasswordByID(userID, password string) error {
|
2021-07-09 03:09:02 +02:00
|
|
|
return NotSupportedError{"no update allowed from focalboard, update it using mattermost"}
|
2021-05-24 19:06:11 +02:00
|
|
|
}
|
|
|
|
|
2022-02-28 12:28:16 +01:00
|
|
|
func (s *MattermostAuthLayer) PatchUserProps(userID string, patch model.UserPropPatch) error {
|
|
|
|
user, err := s.pluginAPI.GetUser(userID)
|
|
|
|
if err != nil {
|
|
|
|
s.logger.Error("failed to fetch user", mlog.String("userID", userID), mlog.Err(err))
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
props := user.Props
|
|
|
|
|
|
|
|
for _, key := range patch.DeletedFields {
|
|
|
|
delete(props, key)
|
|
|
|
}
|
|
|
|
|
|
|
|
for key, value := range patch.UpdatedFields {
|
|
|
|
props[key] = value
|
|
|
|
}
|
|
|
|
|
|
|
|
user.Props = props
|
|
|
|
|
|
|
|
if _, err := s.pluginAPI.UpdateUser(user); err != nil {
|
|
|
|
s.logger.Error("failed to update user", mlog.String("userID", userID), mlog.Err(err))
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2021-06-21 11:21:42 +02:00
|
|
|
// GetActiveUserCount returns the number of users with active sessions within N seconds ago.
|
2021-05-24 19:06:11 +02:00
|
|
|
func (s *MattermostAuthLayer) GetActiveUserCount(updatedSecondsAgo int64) (int, error) {
|
|
|
|
query := s.getQueryBuilder().
|
|
|
|
Select("count(distinct userId)").
|
|
|
|
From("Sessions").
|
2021-10-07 13:51:01 +02:00
|
|
|
Where(sq.Gt{"LastActivityAt": utils.GetMillis() - utils.SecondsToMillis(updatedSecondsAgo)})
|
2021-05-24 19:06:11 +02:00
|
|
|
|
|
|
|
row := query.QueryRow()
|
|
|
|
|
|
|
|
var count int
|
|
|
|
err := row.Scan(&count)
|
|
|
|
if err != nil {
|
|
|
|
return 0, err
|
|
|
|
}
|
|
|
|
|
|
|
|
return count, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (s *MattermostAuthLayer) GetSession(token string, expireTime int64) (*model.Session, error) {
|
2021-07-09 03:09:02 +02:00
|
|
|
return nil, NotSupportedError{"sessions not used when using mattermost"}
|
2021-05-24 19:06:11 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
func (s *MattermostAuthLayer) CreateSession(session *model.Session) error {
|
2021-07-09 03:09:02 +02:00
|
|
|
return NotSupportedError{"no update allowed from focalboard, update it using mattermost"}
|
2021-05-24 19:06:11 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
func (s *MattermostAuthLayer) RefreshSession(session *model.Session) error {
|
2021-07-09 03:09:02 +02:00
|
|
|
return NotSupportedError{"no update allowed from focalboard, update it using mattermost"}
|
2021-05-24 19:06:11 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
func (s *MattermostAuthLayer) UpdateSession(session *model.Session) error {
|
2021-07-09 03:09:02 +02:00
|
|
|
return NotSupportedError{"no update allowed from focalboard, update it using mattermost"}
|
2021-05-24 19:06:11 +02:00
|
|
|
}
|
|
|
|
|
2021-06-21 11:21:42 +02:00
|
|
|
func (s *MattermostAuthLayer) DeleteSession(sessionID string) error {
|
2021-07-09 03:09:02 +02:00
|
|
|
return NotSupportedError{"no update allowed from focalboard, update it using mattermost"}
|
2021-05-24 19:06:11 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
func (s *MattermostAuthLayer) CleanUpSessions(expireTime int64) error {
|
2021-07-09 03:09:02 +02:00
|
|
|
return NotSupportedError{"no update allowed from focalboard, update it using mattermost"}
|
2021-05-24 19:06:11 +02:00
|
|
|
}
|
|
|
|
|
2022-03-22 15:24:34 +01:00
|
|
|
func (s *MattermostAuthLayer) GetTeam(id string) (*model.Team, error) {
|
2021-06-21 11:21:42 +02:00
|
|
|
if id == "0" {
|
2022-03-22 15:24:34 +01:00
|
|
|
team := model.Team{
|
2021-06-21 11:21:42 +02:00
|
|
|
ID: id,
|
2021-05-24 19:06:11 +02:00
|
|
|
Title: "",
|
|
|
|
}
|
|
|
|
|
2022-03-22 15:24:34 +01:00
|
|
|
return &team, nil
|
2021-05-24 19:06:11 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
query := s.getQueryBuilder().
|
2022-03-22 15:24:34 +01:00
|
|
|
Select("DisplayName").
|
|
|
|
From("Teams").
|
2021-06-21 11:21:42 +02:00
|
|
|
Where(sq.Eq{"ID": id})
|
2021-05-24 19:06:11 +02:00
|
|
|
|
|
|
|
row := query.QueryRow()
|
|
|
|
var displayName string
|
2022-03-22 15:24:34 +01:00
|
|
|
err := row.Scan(&displayName)
|
2021-05-24 19:06:11 +02:00
|
|
|
if err != nil {
|
2022-03-31 00:10:11 +02:00
|
|
|
s.logger.Error("GetTeam scan error",
|
|
|
|
mlog.String("team_id", id),
|
|
|
|
mlog.Err(err),
|
|
|
|
)
|
2021-05-24 19:06:11 +02:00
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
2022-03-22 15:24:34 +01:00
|
|
|
return &model.Team{ID: id, Title: displayName}, nil
|
|
|
|
}
|
2021-05-24 19:06:11 +02:00
|
|
|
|
2022-03-22 15:24:34 +01:00
|
|
|
// GetTeamsForUser retrieves all the teams that the user is a member of.
|
|
|
|
func (s *MattermostAuthLayer) GetTeamsForUser(userID string) ([]*model.Team, error) {
|
|
|
|
query := s.getQueryBuilder().
|
|
|
|
Select("t.Id", "t.DisplayName").
|
|
|
|
From("Teams as t").
|
|
|
|
Join("TeamMembers as tm on t.Id=tm.TeamId").
|
|
|
|
Where(sq.Eq{"tm.UserId": userID})
|
2021-05-24 19:06:11 +02:00
|
|
|
|
|
|
|
rows, err := query.Query()
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2021-07-06 22:44:11 +02:00
|
|
|
defer s.CloseRows(rows)
|
|
|
|
|
2022-03-22 15:24:34 +01:00
|
|
|
teams := []*model.Team{}
|
2021-05-24 19:06:11 +02:00
|
|
|
for rows.Next() {
|
2022-03-22 15:24:34 +01:00
|
|
|
var team model.Team
|
|
|
|
|
|
|
|
err := rows.Scan(
|
|
|
|
&team.ID,
|
|
|
|
&team.Title,
|
|
|
|
)
|
|
|
|
if err != nil {
|
2021-07-09 03:09:02 +02:00
|
|
|
return nil, err
|
2021-05-24 19:06:11 +02:00
|
|
|
}
|
|
|
|
|
2022-03-22 15:24:34 +01:00
|
|
|
teams = append(teams, &team)
|
2021-05-24 19:06:11 +02:00
|
|
|
}
|
|
|
|
|
2022-03-22 15:24:34 +01:00
|
|
|
return teams, nil
|
2021-05-24 19:06:11 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
func (s *MattermostAuthLayer) getQueryBuilder() sq.StatementBuilderType {
|
|
|
|
builder := sq.StatementBuilder
|
2022-03-22 15:24:34 +01:00
|
|
|
if s.dbType == model.PostgresDBType || s.dbType == model.SqliteDBType {
|
2021-05-24 19:06:11 +02:00
|
|
|
builder = builder.PlaceholderFormat(sq.Dollar)
|
|
|
|
}
|
|
|
|
|
|
|
|
return builder.RunWith(s.mmDB)
|
|
|
|
}
|
2021-06-11 12:40:22 +02:00
|
|
|
|
2022-03-22 15:24:34 +01:00
|
|
|
func (s *MattermostAuthLayer) GetUsersByTeam(teamID string) ([]*model.User, error) {
|
2021-06-11 12:40:22 +02:00
|
|
|
query := s.getQueryBuilder().
|
2022-03-22 15:24:34 +01:00
|
|
|
Select("u.id", "u.username", "u.props", "u.CreateAt as create_at", "u.UpdateAt as update_at",
|
|
|
|
"u.DeleteAt as delete_at", "b.UserId IS NOT NULL AS is_bot").
|
|
|
|
From("Users as u").
|
|
|
|
Join("TeamMembers as tm ON tm.UserID = u.ID").
|
2021-12-08 16:04:19 +01:00
|
|
|
LeftJoin("Bots b ON ( b.UserId = Users.ID )").
|
2022-03-22 15:24:34 +01:00
|
|
|
Where(sq.Eq{"u.deleteAt": 0}).
|
2022-04-04 16:00:40 +02:00
|
|
|
Where(sq.NotEq{"u.roles": "system_guest"}).
|
2022-03-22 15:24:34 +01:00
|
|
|
Where(sq.Eq{"tm.TeamId": teamID})
|
|
|
|
|
|
|
|
rows, err := query.Query()
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
defer s.CloseRows(rows)
|
|
|
|
|
|
|
|
users, err := s.usersFromRows(rows)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
return users, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (s *MattermostAuthLayer) SearchUsersByTeam(teamID string, searchQuery string) ([]*model.User, error) {
|
|
|
|
query := s.getQueryBuilder().
|
|
|
|
Select("u.id", "u.username", "u.props", "u.CreateAt as create_at", "u.UpdateAt as update_at",
|
|
|
|
"u.DeleteAt as delete_at", "b.UserId IS NOT NULL AS is_bot").
|
|
|
|
From("Users as u").
|
|
|
|
Join("TeamMembers as tm ON tm.UserID = u.id").
|
|
|
|
LeftJoin("Bots b ON ( b.UserId = u.id )").
|
|
|
|
Where(sq.Eq{"u.deleteAt": 0}).
|
|
|
|
Where(sq.Or{
|
|
|
|
sq.Like{"u.username": "%" + searchQuery + "%"},
|
|
|
|
sq.Like{"u.nickname": "%" + searchQuery + "%"},
|
|
|
|
sq.Like{"u.firstname": "%" + searchQuery + "%"},
|
|
|
|
sq.Like{"u.lastname": "%" + searchQuery + "%"},
|
|
|
|
}).
|
|
|
|
Where(sq.Eq{"tm.TeamId": teamID}).
|
2022-04-04 16:00:40 +02:00
|
|
|
Where(sq.NotEq{"u.roles": "system_guest"}).
|
2022-03-22 15:24:34 +01:00
|
|
|
OrderBy("u.username").
|
|
|
|
Limit(10)
|
2021-06-11 12:40:22 +02:00
|
|
|
|
|
|
|
rows, err := query.Query()
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2021-07-06 22:44:11 +02:00
|
|
|
defer s.CloseRows(rows)
|
2021-06-11 12:40:22 +02:00
|
|
|
|
|
|
|
users, err := s.usersFromRows(rows)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
return users, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (s *MattermostAuthLayer) usersFromRows(rows *sql.Rows) ([]*model.User, error) {
|
|
|
|
users := []*model.User{}
|
|
|
|
|
|
|
|
for rows.Next() {
|
|
|
|
var user model.User
|
|
|
|
var propsBytes []byte
|
|
|
|
|
|
|
|
err := rows.Scan(
|
|
|
|
&user.ID,
|
|
|
|
&user.Username,
|
|
|
|
&propsBytes,
|
|
|
|
&user.CreateAt,
|
|
|
|
&user.UpdateAt,
|
|
|
|
&user.DeleteAt,
|
2021-12-08 16:04:19 +01:00
|
|
|
&user.IsBot,
|
2021-06-11 12:40:22 +02:00
|
|
|
)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
err = json.Unmarshal(propsBytes, &user.Props)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
users = append(users, &user)
|
|
|
|
}
|
|
|
|
|
|
|
|
return users, nil
|
|
|
|
}
|
2021-07-06 22:44:11 +02:00
|
|
|
|
|
|
|
func (s *MattermostAuthLayer) CloseRows(rows *sql.Rows) {
|
|
|
|
if err := rows.Close(); err != nil {
|
|
|
|
s.logger.Error("error closing MattermostAuthLayer row set", mlog.Err(err))
|
|
|
|
}
|
|
|
|
}
|
2021-09-13 14:12:32 +02:00
|
|
|
|
2022-02-28 12:28:16 +01:00
|
|
|
func (s *MattermostAuthLayer) CreatePrivateWorkspace(userID string) (string, error) {
|
|
|
|
// we emulate a private workspace by creating
|
|
|
|
// a DM channel from the user to themselves.
|
|
|
|
channel, err := s.pluginAPI.GetDirectChannel(userID, userID)
|
|
|
|
if err != nil {
|
|
|
|
s.logger.Error("error fetching private workspace", mlog.String("userID", userID), mlog.Err(err))
|
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
|
|
|
|
return channel.Id, nil
|
|
|
|
}
|
GetBoardMetadata API (#2569)
* wip
* Added data migration for populating categories
* wip
* Added data migration for populating categories
* Store WIP
* migration WIP
* category CRUD APIs complete
* category block API WIP
* block category update API done
* Fetcehed data into store
* Started displayting sidebar data
* sidebar WIP
* Dashboard - basic changes
* Sidebar dashboard btn and board switcher UI only
* Sidebar dashboard btn and board switcher UI only
* create category dialog WIP
* Create category webapp side done
* Integrated move card to other category
* board to block
* Disabled dashboard route for now as we'll implement it in phase 2
* WIP
* Added logic to open last board/view on per team level
* Add workspace to teams and boards migrations (#1986)
* Add workspace to teams and boards migrations
* Update json annotations on board models
* boards search dialog WIP
* Seach dialog WIP
* Implemented opening boiard from search results
* Boards switcher styliung
* Handled update category WS event
* Template support
* personal server support and styling fixes
* test fix WIP
* Fixed a bug causing boards to not be moved correctly beteen categories
* Fixed webapp tests
* fix
* Store changes (#2011)
* Permissions phase 1 - Websocket updates (#2014)
* Store changes
* Websockets changes
* Permissions phase 1 - Permissions service (#2015)
* Store changes
* Websockets changes
* Permissions service
* Api and app updates (#2016)
* Store changes
* Websockets changes
* Permissions service
* New API and App changes
* Delete and Patch boards and blocks endpoints
* Used correct variable
* Webapp changes WIP
* Open correct team URL
* Fixed get block API
* Used React context for workspace users
* WIP
* On load navigation sorted out
* WIP
* Nav fix
* categories WS broadcast
* Used real search API
* Fixed unfurl ppreview
* set active team in sidebar
* IMplemented navigation on changing team in sidebar
* Misc fixes
* close rows inside transaction (#2045)
* update syntax for mysql (#2044)
* Upadted mutator for new patchBlock API
* Updated patchBlock API to use new URL
* Listeining to correct event in plugin mode
* Implemented WS messages for category operations:
* Fix duplicated build tags on Makefile
* Sidebar enhancements
* Add missing prefix to SQLite migration and fix flaky tests
* Sidebar boards menu enhancement
* Fix board page interactions (#2144)
* Fix patch board card properties error
* Fix board interactions
* Fix insert blocks interactions
* Fix app tests (#2104)
* Add json1 tag to vscode launch (#2157)
* Fix add, delete and update boards and add board patch generation (#2146)
* Fix update boards and add board patch generation
* Make add board and add template work, as well as deleting a board
* Update the state on board deletion
* Delete unused variable
* Fix bad parenthesis
* Fix board creation inside plugin, options were coming null due websocket message serialization
* update property type mutators to use boards API (#2168)
* Add permissions modal (#2196)
* Initial integration
* Permissions modal, websocket updates and API tests implemented
* Avoid updating/removing user if there is only one admin left
* Fix duplicates on board search
* Adds integration test
* Addressing PR review comments
Co-authored-by: Jesús Espino <jespinog@gmail.com>
* Merge
* I'm able to compile now
* Some fixes around tests execution
* Fixing migrations
* Fixing migrations order
* WIP
* Fixing some other compilation problems on tests
* Some typescript tests fixed
* Fixing javascript tests
* Fixing compilation
* Fixing some problems to create boards
* Load the templates on initial load
* Improvements over initial team templates import
* Adding new fields in the database
* Working on adding duplicate board api
* Removing RootID concept entirely
* Improving a bit the subscriptions
* Fixing store tests for notificationHints
* Fixing more tests
* fixing tests
* Fixing tests
* Fixing tests
* Fixing some small bugs related to templates
* Fixing registration link generation/regeneration
* Fixing cypress tests
* Adding store tests for duplicateBoard and duplicateBlock
* Addressing some TODO comments
* Making the export api simpler
* Add redirect component for old workspace urls
* Removing Dashboard code
* Delete only the built-in templates on update
* fixing tests
* Adding users autocompletion
* Updating snapshots
* Fixing bad merge
* fix panic when creating new card in notifysubscriptions (#2352)
* fix lint errors (#2353)
* fix lint errors
* fix panic when creating new card in notifysubscriptions (#2352)
* fix lint errors
* fix unit test
* Revert "fix unit test"
This reverts commit 0ad78aed65745521c0bb45790c9ea91b6c316c44.
Co-authored-by: Doug Lauder <wiggin77@warpmail.net>
* fix sql syntax error for SearchUsersByTeam (#2357)
* Fix mentions delivery (#2358)
* fix sql syntax error for SearchUsersByTeam
* fix mentions delivery
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
* update api for octoClient calls, pass correct variables to mutator (#2359)
* Fixing tests after merge
* Fix sidebar context menu UI issue (#2399)
* Fix notification diff for text blocks (#2386)
* fix notification diff for text blocks; fix various linter errors.
* fix URLs to cards
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
* Permissions branch: Fix card links (#2391)
* fix notification diff for text blocks; fix various linter errors.
* fix URLs to cards
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
* Fixing sqlite tests
* Fixing server tests
* Update migrations to create global templates. (#2397)
* fix duplicate templates
* revert migrate.go
* update UI for empty templates
* implement updating built-in templates as global (teamId = 0)
* handle error if board not found
* update unit test
* fix more tests
* Update blocks_test.go
Fix merge issue
* fix migration sql error (#2414)
* Fixing frontend tests
* Set target team ID when using a global template (#2419)
* Fix some server tests
* Fixing onboarding creation
* Permissions branch: Fix unit tests and CI errors (part 1) (#2425)
* Fixing some small memory leaks (#2400)
* Fixing some small memory leaks
* fixing tests
* passing the tags to all test targets
* Increasing the timeout of the tests
* Fix some type checkings
* Permissions branch: Fixes all the linter errors (#2429)
* fix linter errors
* Reestructuring the router and splitting in more subcomponents (#2403)
* Reestructuring the router and splitting in more subcomponents
* Removing console.log calls
* Removing unneeded selector
* Addressing PR comment
* Fix redirection to one team when you load directly the boards home path
* Using properly the lastTeamID to redirect the user if needed
* don't allow last admin change/deleted (#2416)
* don't allow last admin change/deleted
* update for i18-extract
* fixed en.json
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Co-authored-by: Harshil Sharma <harshilsharma63@gmail.com>
* Splitting BoardPage component into simpler/smaller components (#2435)
* Splitting BoardPage component into simpler/smaller components
* Removing unneeded import
* Replace go migrate with morph permissions (#2424)
* merge origin/replace-go-migrate-with-morph
* run go mod tidy on mattermost-plugin and increase test timeout
* fix merge issue temprorarily
* remove some debug changes
* fixing the linter
* Allow always team 0 (global) templates fetch (#2472)
* Fix problem with viewId 0 in the URL (#2473)
* Migrate from binddata to goembed (#2471)
* Adding join logic to the board switcher (#2434)
* Adding join logic to the board switcher
* Using already existing client function and removing the joinBoard one
* Adding support for autojoin based on url
* Fixing frontend tests
* fix webapp compile error, missing enableSharedBoards (#2501)
* Fixing duplication on postgres
* Adding back views to the sidebar (#2494)
* Fix #2507. Update Swagger comments (#2508)
* Fix the flash of the template selector on board/team switch (#2490)
* Fix the flash of the template selector on board/team switch
* More fixes specially around error handling
* Fixing the bot badge (#2487)
* simplifying a bit the team store sync between channels and focalboard (#2481)
* Fix menu tests (#2528)
* fix failing menu tests
* fix lint error
* Added keyboard shortcut for boards switcher (#2407)
* Added keyboard shortcut for boards switcher
* Fixed a type error
* Added some inline comments
* Fixed lint
* Fixed bug with scroll jumping when the card is opened: (#2477)
- avoid remounting of `ScrollingComponent` for each render of `Kanban` component
- property `autoFocus` set to false for `CalculationOptions` because it triggers `blur` even for the button in Jest tests and closes the menu
- snapshots for tests with `CalculationOptions` updated
* Adding the frontend support for permissions and applying it to a big part of the interface. (#2536)
* Initial work on permissions gates
* Applying permissions gates in more places
* Adding more checks to the interface
* Adding more permissions gates and keeping the store up to date
* fixing some tests
* Fixing some more tests
* Fixing another test
* Fixing all tests and adding some more
* Adding no-permission snapshot tests
* Addressing PR review comments
* Fixing invert behavior
* Permissions branch: No sqlstore calls after app shutdown (#2530)
* fix webapp compile error, missing enableSharedBoards
* refactor app init wip
* - ensure all block change notifications are finished before shutting down app
- fix unit tests for mysql (insert_at only has 1 second resolution!)
* adjust logging
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
* Fixed migrations to allow upgrading from previous version (#2535)
* Added mechanism to check if schema migration is needed
* WIP
* WIP
* WIP
* WIP
* Fixed migration
* Fixed for SQLite
* minor cleaniup
* Deleted old schema migration table after running migrations
* Removed a debug log
* Fixed a bug where the code always tried to delete a table which may or may not exist
* Show properly the user avatar in the ShareBoard component (#2542)
* Fixing the last CI problems from the permissions-branch (#2541)
* Fix history ordering
* Giving some times to avoid possible race conditions
* Empty
* Reverting accidental change in the config.json
* Optimizing table view (#2540)
* Optimizing table view
* Reducing the amount of rendering for tables
* Some other performance improvements
* Improve the activeView updates
* Some extra simplifications
* Another small improvement
* Fixing tests
* Fixing linter errors
* Reducing a bit the amount of dependency with big objects in the store
* Small simplification
* Removing Commenter role from the user role selector (#2561)
* Shareboard cleanup (#2550)
* Initial work on permissions gates
* Applying permissions gates in more places
* Adding more checks to the interface
* Adding more permissions gates and keeping the store up to date
* fixing some tests
* Fixing some more tests
* Fixing another test
* Fixing all tests and adding some more
* Adding no-permission snapshot tests
* Addressing PR review comments
* cleanup some shareboard settings
* remove unused property, fix for user items being displayed for non admin
* revert change, allow users to show
Co-authored-by: Jesús Espino <jespinog@gmail.com>
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
* GetBoardMetadata API
* Integration tests. WIP
* getBoardHistory
* Working integration test
* Fix ordering, add store tests
* Fix: Update board_history update_at on patch
* sqltests
* Fix unmarshall delete boards_history
* testGetBlockMetadata with delete and undelete
* Handle board not found
* Fixing comments and cards with the new optimizations in the store (#2560)
* Fixing property creation (#2563)
* Cleanup
* Fix user selection in table view (#2565)
* Fixing focus new row in table view (#2567)
* Permissions branch: Fix sqlite table lock (CI) (#2568)
* fix sqlite table lock
* remove test db on teardown
* revert .gitignore
* fix goimport on migration code
* fix typo
* more linter fixes
* clean up tmp db for sqlstore tests
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
* Fixing snapshots
* Remove debug log
* Return metadata for deleted boards
* Migrating center panel to functional component (#2562)
* Migrating center panel to functional component
* Fixing some tests
* Fixing another test
* Fixing linter errors
* Fixing types errors
* Fixing linter error
* Fixing cypress tests
* Fixing the last cypress test
* Simpliying a bit the code
* Making property insertion more robust
* Updating checkbox test
* License check
* Cleanup and update Swagger docs
* Merge from main
* Fix bad merge
* Fix Linux-app build break
* do mod tidy
* Fix server lint
* Require credentials (not only read token)
* Add missing defer CloseRows
* do mod tidy
Co-authored-by: Harshil Sharma <harshilsharma63@gmail.com>
Co-authored-by: Miguel de la Cruz <miguel@mcrx.me>
Co-authored-by: Scott Bishel <scott.bishel@mattermost.com>
Co-authored-by: Jesús Espino <jespinog@gmail.com>
Co-authored-by: Doug Lauder <wiggin77@warpmail.net>
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Co-authored-by: Harshil Sharma <18575143+harshilsharma63@users.noreply.github.com>
Co-authored-by: Ibrahim Serdar Acikgoz <serdaracikgoz86@gmail.com>
Co-authored-by: kamre <eremchenko@gmail.com>
2022-03-29 23:47:49 +02:00
|
|
|
|
2022-04-04 16:00:40 +02:00
|
|
|
func mmUserToFbUser(mmUser *mmModel.User) model.User {
|
|
|
|
props := map[string]interface{}{}
|
|
|
|
for key, value := range mmUser.Props {
|
|
|
|
props[key] = value
|
|
|
|
}
|
|
|
|
authData := ""
|
|
|
|
if mmUser.AuthData != nil {
|
|
|
|
authData = *mmUser.AuthData
|
|
|
|
}
|
|
|
|
return model.User{
|
|
|
|
ID: mmUser.Id,
|
|
|
|
Username: mmUser.Username,
|
|
|
|
Email: mmUser.Email,
|
|
|
|
Password: mmUser.Password,
|
|
|
|
MfaSecret: mmUser.MfaSecret,
|
|
|
|
AuthService: mmUser.AuthService,
|
|
|
|
AuthData: authData,
|
|
|
|
Props: props,
|
|
|
|
CreateAt: mmUser.CreateAt,
|
|
|
|
UpdateAt: mmUser.UpdateAt,
|
|
|
|
DeleteAt: mmUser.DeleteAt,
|
|
|
|
IsBot: mmUser.IsBot,
|
|
|
|
IsGuest: mmUser.IsGuest(),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
GetBoardMetadata API (#2569)
* wip
* Added data migration for populating categories
* wip
* Added data migration for populating categories
* Store WIP
* migration WIP
* category CRUD APIs complete
* category block API WIP
* block category update API done
* Fetcehed data into store
* Started displayting sidebar data
* sidebar WIP
* Dashboard - basic changes
* Sidebar dashboard btn and board switcher UI only
* Sidebar dashboard btn and board switcher UI only
* create category dialog WIP
* Create category webapp side done
* Integrated move card to other category
* board to block
* Disabled dashboard route for now as we'll implement it in phase 2
* WIP
* Added logic to open last board/view on per team level
* Add workspace to teams and boards migrations (#1986)
* Add workspace to teams and boards migrations
* Update json annotations on board models
* boards search dialog WIP
* Seach dialog WIP
* Implemented opening boiard from search results
* Boards switcher styliung
* Handled update category WS event
* Template support
* personal server support and styling fixes
* test fix WIP
* Fixed a bug causing boards to not be moved correctly beteen categories
* Fixed webapp tests
* fix
* Store changes (#2011)
* Permissions phase 1 - Websocket updates (#2014)
* Store changes
* Websockets changes
* Permissions phase 1 - Permissions service (#2015)
* Store changes
* Websockets changes
* Permissions service
* Api and app updates (#2016)
* Store changes
* Websockets changes
* Permissions service
* New API and App changes
* Delete and Patch boards and blocks endpoints
* Used correct variable
* Webapp changes WIP
* Open correct team URL
* Fixed get block API
* Used React context for workspace users
* WIP
* On load navigation sorted out
* WIP
* Nav fix
* categories WS broadcast
* Used real search API
* Fixed unfurl ppreview
* set active team in sidebar
* IMplemented navigation on changing team in sidebar
* Misc fixes
* close rows inside transaction (#2045)
* update syntax for mysql (#2044)
* Upadted mutator for new patchBlock API
* Updated patchBlock API to use new URL
* Listeining to correct event in plugin mode
* Implemented WS messages for category operations:
* Fix duplicated build tags on Makefile
* Sidebar enhancements
* Add missing prefix to SQLite migration and fix flaky tests
* Sidebar boards menu enhancement
* Fix board page interactions (#2144)
* Fix patch board card properties error
* Fix board interactions
* Fix insert blocks interactions
* Fix app tests (#2104)
* Add json1 tag to vscode launch (#2157)
* Fix add, delete and update boards and add board patch generation (#2146)
* Fix update boards and add board patch generation
* Make add board and add template work, as well as deleting a board
* Update the state on board deletion
* Delete unused variable
* Fix bad parenthesis
* Fix board creation inside plugin, options were coming null due websocket message serialization
* update property type mutators to use boards API (#2168)
* Add permissions modal (#2196)
* Initial integration
* Permissions modal, websocket updates and API tests implemented
* Avoid updating/removing user if there is only one admin left
* Fix duplicates on board search
* Adds integration test
* Addressing PR review comments
Co-authored-by: Jesús Espino <jespinog@gmail.com>
* Merge
* I'm able to compile now
* Some fixes around tests execution
* Fixing migrations
* Fixing migrations order
* WIP
* Fixing some other compilation problems on tests
* Some typescript tests fixed
* Fixing javascript tests
* Fixing compilation
* Fixing some problems to create boards
* Load the templates on initial load
* Improvements over initial team templates import
* Adding new fields in the database
* Working on adding duplicate board api
* Removing RootID concept entirely
* Improving a bit the subscriptions
* Fixing store tests for notificationHints
* Fixing more tests
* fixing tests
* Fixing tests
* Fixing tests
* Fixing some small bugs related to templates
* Fixing registration link generation/regeneration
* Fixing cypress tests
* Adding store tests for duplicateBoard and duplicateBlock
* Addressing some TODO comments
* Making the export api simpler
* Add redirect component for old workspace urls
* Removing Dashboard code
* Delete only the built-in templates on update
* fixing tests
* Adding users autocompletion
* Updating snapshots
* Fixing bad merge
* fix panic when creating new card in notifysubscriptions (#2352)
* fix lint errors (#2353)
* fix lint errors
* fix panic when creating new card in notifysubscriptions (#2352)
* fix lint errors
* fix unit test
* Revert "fix unit test"
This reverts commit 0ad78aed65745521c0bb45790c9ea91b6c316c44.
Co-authored-by: Doug Lauder <wiggin77@warpmail.net>
* fix sql syntax error for SearchUsersByTeam (#2357)
* Fix mentions delivery (#2358)
* fix sql syntax error for SearchUsersByTeam
* fix mentions delivery
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
* update api for octoClient calls, pass correct variables to mutator (#2359)
* Fixing tests after merge
* Fix sidebar context menu UI issue (#2399)
* Fix notification diff for text blocks (#2386)
* fix notification diff for text blocks; fix various linter errors.
* fix URLs to cards
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
* Permissions branch: Fix card links (#2391)
* fix notification diff for text blocks; fix various linter errors.
* fix URLs to cards
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
* Fixing sqlite tests
* Fixing server tests
* Update migrations to create global templates. (#2397)
* fix duplicate templates
* revert migrate.go
* update UI for empty templates
* implement updating built-in templates as global (teamId = 0)
* handle error if board not found
* update unit test
* fix more tests
* Update blocks_test.go
Fix merge issue
* fix migration sql error (#2414)
* Fixing frontend tests
* Set target team ID when using a global template (#2419)
* Fix some server tests
* Fixing onboarding creation
* Permissions branch: Fix unit tests and CI errors (part 1) (#2425)
* Fixing some small memory leaks (#2400)
* Fixing some small memory leaks
* fixing tests
* passing the tags to all test targets
* Increasing the timeout of the tests
* Fix some type checkings
* Permissions branch: Fixes all the linter errors (#2429)
* fix linter errors
* Reestructuring the router and splitting in more subcomponents (#2403)
* Reestructuring the router and splitting in more subcomponents
* Removing console.log calls
* Removing unneeded selector
* Addressing PR comment
* Fix redirection to one team when you load directly the boards home path
* Using properly the lastTeamID to redirect the user if needed
* don't allow last admin change/deleted (#2416)
* don't allow last admin change/deleted
* update for i18-extract
* fixed en.json
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Co-authored-by: Harshil Sharma <harshilsharma63@gmail.com>
* Splitting BoardPage component into simpler/smaller components (#2435)
* Splitting BoardPage component into simpler/smaller components
* Removing unneeded import
* Replace go migrate with morph permissions (#2424)
* merge origin/replace-go-migrate-with-morph
* run go mod tidy on mattermost-plugin and increase test timeout
* fix merge issue temprorarily
* remove some debug changes
* fixing the linter
* Allow always team 0 (global) templates fetch (#2472)
* Fix problem with viewId 0 in the URL (#2473)
* Migrate from binddata to goembed (#2471)
* Adding join logic to the board switcher (#2434)
* Adding join logic to the board switcher
* Using already existing client function and removing the joinBoard one
* Adding support for autojoin based on url
* Fixing frontend tests
* fix webapp compile error, missing enableSharedBoards (#2501)
* Fixing duplication on postgres
* Adding back views to the sidebar (#2494)
* Fix #2507. Update Swagger comments (#2508)
* Fix the flash of the template selector on board/team switch (#2490)
* Fix the flash of the template selector on board/team switch
* More fixes specially around error handling
* Fixing the bot badge (#2487)
* simplifying a bit the team store sync between channels and focalboard (#2481)
* Fix menu tests (#2528)
* fix failing menu tests
* fix lint error
* Added keyboard shortcut for boards switcher (#2407)
* Added keyboard shortcut for boards switcher
* Fixed a type error
* Added some inline comments
* Fixed lint
* Fixed bug with scroll jumping when the card is opened: (#2477)
- avoid remounting of `ScrollingComponent` for each render of `Kanban` component
- property `autoFocus` set to false for `CalculationOptions` because it triggers `blur` even for the button in Jest tests and closes the menu
- snapshots for tests with `CalculationOptions` updated
* Adding the frontend support for permissions and applying it to a big part of the interface. (#2536)
* Initial work on permissions gates
* Applying permissions gates in more places
* Adding more checks to the interface
* Adding more permissions gates and keeping the store up to date
* fixing some tests
* Fixing some more tests
* Fixing another test
* Fixing all tests and adding some more
* Adding no-permission snapshot tests
* Addressing PR review comments
* Fixing invert behavior
* Permissions branch: No sqlstore calls after app shutdown (#2530)
* fix webapp compile error, missing enableSharedBoards
* refactor app init wip
* - ensure all block change notifications are finished before shutting down app
- fix unit tests for mysql (insert_at only has 1 second resolution!)
* adjust logging
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
* Fixed migrations to allow upgrading from previous version (#2535)
* Added mechanism to check if schema migration is needed
* WIP
* WIP
* WIP
* WIP
* Fixed migration
* Fixed for SQLite
* minor cleaniup
* Deleted old schema migration table after running migrations
* Removed a debug log
* Fixed a bug where the code always tried to delete a table which may or may not exist
* Show properly the user avatar in the ShareBoard component (#2542)
* Fixing the last CI problems from the permissions-branch (#2541)
* Fix history ordering
* Giving some times to avoid possible race conditions
* Empty
* Reverting accidental change in the config.json
* Optimizing table view (#2540)
* Optimizing table view
* Reducing the amount of rendering for tables
* Some other performance improvements
* Improve the activeView updates
* Some extra simplifications
* Another small improvement
* Fixing tests
* Fixing linter errors
* Reducing a bit the amount of dependency with big objects in the store
* Small simplification
* Removing Commenter role from the user role selector (#2561)
* Shareboard cleanup (#2550)
* Initial work on permissions gates
* Applying permissions gates in more places
* Adding more checks to the interface
* Adding more permissions gates and keeping the store up to date
* fixing some tests
* Fixing some more tests
* Fixing another test
* Fixing all tests and adding some more
* Adding no-permission snapshot tests
* Addressing PR review comments
* cleanup some shareboard settings
* remove unused property, fix for user items being displayed for non admin
* revert change, allow users to show
Co-authored-by: Jesús Espino <jespinog@gmail.com>
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
* GetBoardMetadata API
* Integration tests. WIP
* getBoardHistory
* Working integration test
* Fix ordering, add store tests
* Fix: Update board_history update_at on patch
* sqltests
* Fix unmarshall delete boards_history
* testGetBlockMetadata with delete and undelete
* Handle board not found
* Fixing comments and cards with the new optimizations in the store (#2560)
* Fixing property creation (#2563)
* Cleanup
* Fix user selection in table view (#2565)
* Fixing focus new row in table view (#2567)
* Permissions branch: Fix sqlite table lock (CI) (#2568)
* fix sqlite table lock
* remove test db on teardown
* revert .gitignore
* fix goimport on migration code
* fix typo
* more linter fixes
* clean up tmp db for sqlstore tests
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
* Fixing snapshots
* Remove debug log
* Return metadata for deleted boards
* Migrating center panel to functional component (#2562)
* Migrating center panel to functional component
* Fixing some tests
* Fixing another test
* Fixing linter errors
* Fixing types errors
* Fixing linter error
* Fixing cypress tests
* Fixing the last cypress test
* Simpliying a bit the code
* Making property insertion more robust
* Updating checkbox test
* License check
* Cleanup and update Swagger docs
* Merge from main
* Fix bad merge
* Fix Linux-app build break
* do mod tidy
* Fix server lint
* Require credentials (not only read token)
* Add missing defer CloseRows
* do mod tidy
Co-authored-by: Harshil Sharma <harshilsharma63@gmail.com>
Co-authored-by: Miguel de la Cruz <miguel@mcrx.me>
Co-authored-by: Scott Bishel <scott.bishel@mattermost.com>
Co-authored-by: Jesús Espino <jespinog@gmail.com>
Co-authored-by: Doug Lauder <wiggin77@warpmail.net>
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Co-authored-by: Harshil Sharma <18575143+harshilsharma63@users.noreply.github.com>
Co-authored-by: Ibrahim Serdar Acikgoz <serdaracikgoz86@gmail.com>
Co-authored-by: kamre <eremchenko@gmail.com>
2022-03-29 23:47:49 +02:00
|
|
|
func (s *MattermostAuthLayer) GetLicense() *mmModel.License {
|
|
|
|
return s.pluginAPI.GetLicense()
|
|
|
|
}
|