Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
mattermost-server
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
2
Merge Requests
2
Analytics
Analytics
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
sysadmin
mattermost
mattermost-server
Commits
75f8729e
Commit
75f8729e
authored
Jan 20, 2016
by
=Corey Hulen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
PLT-7 adding loc db calls for users table
parent
aac8d121
Changes
33
Show whitespace changes
Inline
Side-by-side
Showing
33 changed files
with
323 additions
and
320 deletions
+323
-320
api/admin.go
api/admin.go
+1
-1
api/admin_test.go
api/admin_test.go
+7
-7
api/api_test.go
api/api_test.go
+1
-1
api/auto_users.go
api/auto_users.go
+2
-2
api/channel.go
api/channel.go
+8
-8
api/channel_benchmark_test.go
api/channel_benchmark_test.go
+1
-1
api/channel_test.go
api/channel_test.go
+30
-30
api/command.go
api/command.go
+1
-1
api/command_test.go
api/command_test.go
+6
-6
api/context.go
api/context.go
+1
-1
api/export.go
api/export.go
+3
-3
api/file_test.go
api/file_test.go
+5
-5
api/import.go
api/import.go
+2
-2
api/oauth_test.go
api/oauth_test.go
+2
-2
api/post.go
api/post.go
+2
-2
api/post_test.go
api/post_test.go
+21
-21
api/preference_test.go
api/preference_test.go
+8
-7
api/team.go
api/team.go
+3
-3
api/team_test.go
api/team_test.go
+10
-10
api/user.go
api/user.go
+42
-42
api/user_test.go
api/user_test.go
+29
-29
api/web_conn.go
api/web_conn.go
+3
-3
api/web_socket_test.go
api/web_socket_test.go
+2
-2
api/webhook_test.go
api/webhook_test.go
+7
-7
manualtesting/manual_testing.go
manualtesting/manual_testing.go
+1
-1
mattermost.go
mattermost.go
+7
-7
store/sql_channel_store_test.go
store/sql_channel_store_test.go
+8
-8
store/sql_team_store_test.go
store/sql_team_store_test.go
+1
-1
store/sql_user_store.go
store/sql_user_store.go
+24
-22
store/sql_user_store_test.go
store/sql_user_store_test.go
+54
-54
store/store.go
store/store.go
+21
-21
web/web.go
web/web.go
+8
-8
web/web_test.go
web/web_test.go
+2
-2
No files found.
api/admin.go
View file @
75f8729e
...
...
@@ -128,7 +128,7 @@ func testEmail(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
if
result
:=
<-
Srv
.
Store
.
User
()
.
Get
(
c
.
Session
.
UserId
);
result
.
Err
!=
nil
{
if
result
:=
<-
Srv
.
Store
.
User
()
.
Get
(
c
.
T
,
c
.
Session
.
UserId
);
result
.
Err
!=
nil
{
c
.
Err
=
result
.
Err
return
}
else
{
...
...
api/admin_test.go
View file @
75f8729e
...
...
@@ -19,7 +19,7 @@ func TestGetLogs(t *testing.T) {
user
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
user
=
Client
.
Must
(
Client
.
CreateUser
(
user
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser
.
Id
))
Client
.
LoginByEmail
(
team
.
Name
,
user
.
Email
,
"pwd"
)
...
...
@@ -63,7 +63,7 @@ func TestGetConfig(t *testing.T) {
user
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
user
=
Client
.
Must
(
Client
.
CreateUser
(
user
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser
.
Id
))
Client
.
LoginByEmail
(
team
.
Name
,
user
.
Email
,
"pwd"
)
...
...
@@ -97,7 +97,7 @@ func TestSaveConfig(t *testing.T) {
user
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
user
=
Client
.
Must
(
Client
.
CreateUser
(
user
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser
.
Id
))
Client
.
LoginByEmail
(
team
.
Name
,
user
.
Email
,
"pwd"
)
...
...
@@ -131,7 +131,7 @@ func TestEmailTest(t *testing.T) {
user
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
user
=
Client
.
Must
(
Client
.
CreateUser
(
user
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser
.
Id
))
Client
.
LoginByEmail
(
team
.
Name
,
user
.
Email
,
"pwd"
)
...
...
@@ -159,7 +159,7 @@ func TestGetAnalyticsStandard(t *testing.T) {
user
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
user
=
Client
.
Must
(
Client
.
CreateUser
(
user
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser
.
Id
))
Client
.
LoginByEmail
(
team
.
Name
,
user
.
Email
,
"pwd"
)
...
...
@@ -225,7 +225,7 @@ func TestGetPostCount(t *testing.T) {
user
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
user
=
Client
.
Must
(
Client
.
CreateUser
(
user
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser
.
Id
))
Client
.
LoginByEmail
(
team
.
Name
,
user
.
Email
,
"pwd"
)
...
...
@@ -270,7 +270,7 @@ func TestUserCountsWithPostsByDay(t *testing.T) {
user
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
user
=
Client
.
Must
(
Client
.
CreateUser
(
user
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser
.
Id
))
Client
.
LoginByEmail
(
team
.
Name
,
user
.
Email
,
"pwd"
)
...
...
api/api_test.go
View file @
75f8729e
...
...
@@ -31,7 +31,7 @@ func SetupBenchmark() (*model.Team, *model.User, *model.Channel) {
team
=
Client
.
Must
(
Client
.
CreateTeam
(
team
))
.
Data
.
(
*
model
.
Team
)
user
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"benchmark@test.com"
,
Nickname
:
"Mr. Benchmarker"
,
Password
:
"pwd"
}
user
=
Client
.
Must
(
Client
.
CreateUser
(
user
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser
.
Id
))
Client
.
LoginByEmail
(
team
.
Name
,
user
.
Email
,
"pwd"
)
channel
:=
&
model
.
Channel
{
DisplayName
:
"Benchmark Channel"
,
Name
:
"a"
+
model
.
NewId
()
+
"a"
,
Type
:
model
.
CHANNEL_OPEN
,
TeamId
:
team
.
Id
}
channel
=
Client
.
Must
(
Client
.
CreateChannel
(
channel
))
.
Data
.
(
*
model
.
Channel
)
...
...
api/auto_users.go
View file @
75f8729e
...
...
@@ -46,7 +46,7 @@ func CreateBasicUser(client *model.Client) *model.AppError {
if
err
!=
nil
{
return
err
}
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
result
.
Data
.
(
*
model
.
User
)
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
utils
.
T
,
result
.
Data
.
(
*
model
.
User
)
.
Id
))
}
return
nil
}
...
...
@@ -73,7 +73,7 @@ func (cfg *AutoUserCreator) createRandomUser() (*model.User, bool) {
return
nil
,
false
}
// We need to cheat to verify the user's email
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
result
.
Data
.
(
*
model
.
User
)
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
utils
.
T
,
result
.
Data
.
(
*
model
.
User
)
.
Id
))
return
result
.
Data
.
(
*
model
.
User
),
true
}
...
...
api/channel.go
View file @
75f8729e
...
...
@@ -125,7 +125,7 @@ func CreateDirectChannel(c *Context, otherUserId string) (*model.Channel, *model
return
nil
,
model
.
NewAppError
(
"CreateDirectChannel"
,
"Invalid other user id "
,
otherUserId
)
}
uc
:=
Srv
.
Store
.
User
()
.
Get
(
otherUserId
)
uc
:=
Srv
.
Store
.
User
()
.
Get
(
c
.
T
,
otherUserId
)
channel
:=
new
(
model
.
Channel
)
...
...
@@ -292,7 +292,7 @@ func updateChannelHeader(c *Context, w http.ResponseWriter, r *http.Request) {
func
PostUpdateChannelHeaderMessageAndForget
(
c
*
Context
,
channelId
string
,
oldChannelHeader
,
newChannelHeader
string
)
{
go
func
()
{
uc
:=
Srv
.
Store
.
User
()
.
Get
(
c
.
Session
.
UserId
)
uc
:=
Srv
.
Store
.
User
()
.
Get
(
c
.
T
,
c
.
Session
.
UserId
)
if
uresult
:=
<-
uc
;
uresult
.
Err
!=
nil
{
l4g
.
Error
(
"Failed to retrieve user while trying to save update channel header message %v"
,
uresult
.
Err
)
...
...
@@ -371,7 +371,7 @@ func getChannels(c *Context, w http.ResponseWriter, r *http.Request) {
if
result
:=
<-
Srv
.
Store
.
Channel
()
.
GetChannels
(
c
.
T
,
c
.
Session
.
TeamId
,
c
.
Session
.
UserId
);
result
.
Err
!=
nil
{
if
result
.
Err
.
Message
==
"No channels were found"
{
// lets make sure the user is valid
if
result
:=
<-
Srv
.
Store
.
User
()
.
Get
(
c
.
Session
.
UserId
);
result
.
Err
!=
nil
{
if
result
:=
<-
Srv
.
Store
.
User
()
.
Get
(
c
.
T
,
c
.
Session
.
UserId
);
result
.
Err
!=
nil
{
c
.
Err
=
result
.
Err
c
.
RemoveSessionCookie
(
w
,
r
)
l4g
.
Error
(
"Error in getting users profile for id=%v forcing logout"
,
c
.
Session
.
UserId
)
...
...
@@ -440,7 +440,7 @@ func join(c *Context, w http.ResponseWriter, r *http.Request) {
func
JoinChannel
(
c
*
Context
,
channelId
string
,
role
string
)
{
sc
:=
Srv
.
Store
.
Channel
()
.
Get
(
c
.
T
,
channelId
)
uc
:=
Srv
.
Store
.
User
()
.
Get
(
c
.
Session
.
UserId
)
uc
:=
Srv
.
Store
.
User
()
.
Get
(
c
.
T
,
c
.
Session
.
UserId
)
if
cresult
:=
<-
sc
;
cresult
.
Err
!=
nil
{
c
.
Err
=
cresult
.
Err
...
...
@@ -544,7 +544,7 @@ func leave(c *Context, w http.ResponseWriter, r *http.Request) {
id
:=
params
[
"id"
]
sc
:=
Srv
.
Store
.
Channel
()
.
Get
(
c
.
T
,
id
)
uc
:=
Srv
.
Store
.
User
()
.
Get
(
c
.
Session
.
UserId
)
uc
:=
Srv
.
Store
.
User
()
.
Get
(
c
.
T
,
c
.
Session
.
UserId
)
if
cresult
:=
<-
sc
;
cresult
.
Err
!=
nil
{
c
.
Err
=
cresult
.
Err
...
...
@@ -594,7 +594,7 @@ func deleteChannel(c *Context, w http.ResponseWriter, r *http.Request) {
sc
:=
Srv
.
Store
.
Channel
()
.
Get
(
c
.
T
,
id
)
scm
:=
Srv
.
Store
.
Channel
()
.
GetMember
(
c
.
T
,
id
,
c
.
Session
.
UserId
)
uc
:=
Srv
.
Store
.
User
()
.
Get
(
c
.
Session
.
UserId
)
uc
:=
Srv
.
Store
.
User
()
.
Get
(
c
.
T
,
c
.
Session
.
UserId
)
ihc
:=
Srv
.
Store
.
Webhook
()
.
GetIncomingByChannel
(
c
.
T
,
id
)
ohc
:=
Srv
.
Store
.
Webhook
()
.
GetOutgoingByChannel
(
c
.
T
,
id
)
...
...
@@ -818,8 +818,8 @@ func addMember(c *Context, w http.ResponseWriter, r *http.Request) {
cchan
:=
Srv
.
Store
.
Channel
()
.
CheckPermissionsTo
(
c
.
T
,
c
.
Session
.
TeamId
,
id
,
c
.
Session
.
UserId
)
sc
:=
Srv
.
Store
.
Channel
()
.
Get
(
c
.
T
,
id
)
ouc
:=
Srv
.
Store
.
User
()
.
Get
(
c
.
Session
.
UserId
)
nuc
:=
Srv
.
Store
.
User
()
.
Get
(
userId
)
ouc
:=
Srv
.
Store
.
User
()
.
Get
(
c
.
T
,
c
.
Session
.
UserId
)
nuc
:=
Srv
.
Store
.
User
()
.
Get
(
c
.
T
,
userId
)
// Only need to be a member of the channel to add a new member
if
!
c
.
HasPermissionsToChannel
(
cchan
,
"addMember"
)
{
...
...
api/channel_benchmark_test.go
View file @
75f8729e
...
...
@@ -140,7 +140,7 @@ func BenchmarkJoinChannel(b *testing.B) {
// Secondary test user to join channels created by primary test user
user
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"random@test.com"
,
Nickname
:
"That Guy"
,
Password
:
"pwd"
}
user
=
Client
.
Must
(
Client
.
CreateUser
(
user
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser
.
Id
))
Client
.
LoginByEmail
(
team
.
Name
,
user
.
Email
,
"pwd"
)
// Benchmark Start
...
...
api/channel_test.go
View file @
75f8729e
...
...
@@ -24,7 +24,7 @@ func TestCreateChannel(t *testing.T) {
user
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
user
=
Client
.
Must
(
Client
.
CreateUser
(
user
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser
.
Id
))
Client
.
LoginByEmail
(
team
.
Name
,
user
.
Email
,
"pwd"
)
...
...
@@ -101,11 +101,11 @@ func TestCreateDirectChannel(t *testing.T) {
user
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
user
=
Client
.
Must
(
Client
.
CreateUser
(
user
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser
.
Id
))
user2
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
user2
=
Client
.
Must
(
Client
.
CreateUser
(
user2
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user2
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser2
.
Id
))
Client
.
LoginByEmail
(
team
.
Name
,
user
.
Email
,
"pwd"
)
...
...
@@ -156,15 +156,15 @@ func TestUpdateChannel(t *testing.T) {
userTeamAdmin
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
team
.
Email
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
userTeamAdmin
=
Client
.
Must
(
Client
.
CreateUser
(
userTeamAdmin
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
userTeamAdmin
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
serTeamAdmin
.
Id
))
userChannelAdmin
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
userChannelAdmin
=
Client
.
Must
(
Client
.
CreateUser
(
userChannelAdmin
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
userChannelAdmin
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
serChannelAdmin
.
Id
))
userStd
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
userStd
=
Client
.
Must
(
Client
.
CreateUser
(
userStd
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
userStd
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
serStd
.
Id
))
userStd
.
Roles
=
""
Client
.
LoginByEmail
(
team
.
Name
,
userChannelAdmin
.
Email
,
"pwd"
)
...
...
@@ -238,7 +238,7 @@ func TestUpdateChannelHeader(t *testing.T) {
user
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
user
=
Client
.
Must
(
Client
.
CreateUser
(
user
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser
.
Id
))
Client
.
LoginByEmail
(
team
.
Name
,
user
.
Email
,
"pwd"
)
...
...
@@ -278,7 +278,7 @@ func TestUpdateChannelHeader(t *testing.T) {
user2
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
user2
=
Client
.
Must
(
Client
.
CreateUser
(
user2
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user2
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser2
.
Id
))
Client
.
LoginByEmail
(
team
.
Name
,
user2
.
Email
,
"pwd"
)
...
...
@@ -297,7 +297,7 @@ func TestUpdateChannelPurpose(t *testing.T) {
user
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
user
=
Client
.
Must
(
Client
.
CreateUser
(
user
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser
.
Id
))
Client
.
LoginByEmail
(
team
.
Name
,
user
.
Email
,
"pwd"
)
...
...
@@ -337,7 +337,7 @@ func TestUpdateChannelPurpose(t *testing.T) {
user2
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
user2
=
Client
.
Must
(
Client
.
CreateUser
(
user2
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user2
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser2
.
Id
))
Client
.
LoginByEmail
(
team
.
Name
,
user2
.
Email
,
"pwd"
)
...
...
@@ -356,7 +356,7 @@ func TestGetChannel(t *testing.T) {
user
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
user
=
Client
.
Must
(
Client
.
CreateUser
(
user
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser
.
Id
))
Client
.
LoginByEmail
(
team
.
Name
,
user
.
Email
,
"pwd"
)
...
...
@@ -419,7 +419,7 @@ func TestGetMoreChannel(t *testing.T) {
user1
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
user1
=
Client
.
Must
(
Client
.
CreateUser
(
user1
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user1
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser1
.
Id
))
Client
.
LoginByEmail
(
team
.
Name
,
user1
.
Email
,
"pwd"
)
...
...
@@ -431,7 +431,7 @@ func TestGetMoreChannel(t *testing.T) {
user2
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
user2
=
Client
.
Must
(
Client
.
CreateUser
(
user2
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user2
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser2
.
Id
))
Client
.
LoginByEmail
(
team
.
Name
,
user2
.
Email
,
"pwd"
)
...
...
@@ -463,7 +463,7 @@ func TestGetChannelCounts(t *testing.T) {
user
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
user
=
Client
.
Must
(
Client
.
CreateUser
(
user
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser
.
Id
))
Client
.
LoginByEmail
(
team
.
Name
,
user
.
Email
,
"pwd"
)
...
...
@@ -504,7 +504,7 @@ func TestJoinChannel(t *testing.T) {
user1
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
user1
=
Client
.
Must
(
Client
.
CreateUser
(
user1
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user1
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser1
.
Id
))
Client
.
LoginByEmail
(
team
.
Name
,
user1
.
Email
,
"pwd"
)
...
...
@@ -516,7 +516,7 @@ func TestJoinChannel(t *testing.T) {
user2
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
user2
=
Client
.
Must
(
Client
.
CreateUser
(
user2
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user2
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser2
.
Id
))
Client
.
LoginByEmail
(
team
.
Name
,
user2
.
Email
,
"pwd"
)
...
...
@@ -548,7 +548,7 @@ func TestLeaveChannel(t *testing.T) {
user1
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
user1
=
Client
.
Must
(
Client
.
CreateUser
(
user1
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user1
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser1
.
Id
))
Client
.
LoginByEmail
(
team
.
Name
,
user1
.
Email
,
"pwd"
)
...
...
@@ -560,7 +560,7 @@ func TestLeaveChannel(t *testing.T) {
user2
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
user2
=
Client
.
Must
(
Client
.
CreateUser
(
user2
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user2
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser2
.
Id
))
Client
.
LoginByEmail
(
team
.
Name
,
user2
.
Email
,
"pwd"
)
...
...
@@ -597,11 +597,11 @@ func TestDeleteChannel(t *testing.T) {
userTeamAdmin
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
team
.
Email
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
userTeamAdmin
=
Client
.
Must
(
Client
.
CreateUser
(
userTeamAdmin
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
userTeamAdmin
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
serTeamAdmin
.
Id
))
userChannelAdmin
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
userChannelAdmin
=
Client
.
Must
(
Client
.
CreateUser
(
userChannelAdmin
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
userChannelAdmin
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
serChannelAdmin
.
Id
))
Client
.
LoginByEmail
(
team
.
Name
,
userChannelAdmin
.
Email
,
"pwd"
)
...
...
@@ -633,7 +633,7 @@ func TestDeleteChannel(t *testing.T) {
userStd
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
userStd
=
Client
.
Must
(
Client
.
CreateUser
(
userStd
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
userStd
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
serStd
.
Id
))
Client
.
LoginByEmail
(
team
.
Name
,
userStd
.
Email
,
"pwd"
)
...
...
@@ -667,7 +667,7 @@ func TestGetChannelExtraInfo(t *testing.T) {
user
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
user
=
Client
.
Must
(
Client
.
CreateUser
(
user
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser
.
Id
))
Client
.
LoginByEmail
(
team
.
Name
,
user
.
Email
,
"pwd"
)
...
...
@@ -703,7 +703,7 @@ func TestGetChannelExtraInfo(t *testing.T) {
user2
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"tester2@test.com"
,
Nickname
:
"Tester 2"
,
Password
:
"pwd"
}
user2
=
Client2
.
Must
(
Client2
.
CreateUser
(
user2
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user2
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser2
.
Id
))
Client2
.
LoginByEmail
(
team
.
Name
,
user2
.
Email
,
"pwd"
)
Client2
.
Must
(
Client2
.
JoinChannel
(
channel1
.
Id
))
...
...
@@ -791,7 +791,7 @@ func TestAddChannelMember(t *testing.T) {
user1
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
user1
=
Client
.
Must
(
Client
.
CreateUser
(
user1
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user1
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser1
.
Id
))
Client
.
LoginByEmail
(
team
.
Name
,
user1
.
Email
,
"pwd"
)
...
...
@@ -800,7 +800,7 @@ func TestAddChannelMember(t *testing.T) {
user2
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
user2
=
Client
.
Must
(
Client
.
CreateUser
(
user2
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user2
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser2
.
Id
))
if
_
,
err
:=
Client
.
AddChannelMember
(
channel1
.
Id
,
user2
.
Id
);
err
!=
nil
{
t
.
Fatal
(
err
)
...
...
@@ -849,11 +849,11 @@ func TestRemoveChannelMember(t *testing.T) {
userTeamAdmin
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
team
.
Email
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
userTeamAdmin
=
Client
.
Must
(
Client
.
CreateUser
(
userTeamAdmin
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
userTeamAdmin
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
serTeamAdmin
.
Id
))
userChannelAdmin
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
userChannelAdmin
=
Client
.
Must
(
Client
.
CreateUser
(
userChannelAdmin
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
userChannelAdmin
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
serChannelAdmin
.
Id
))
Client
.
LoginByEmail
(
team
.
Name
,
userChannelAdmin
.
Email
,
"pwd"
)
...
...
@@ -869,7 +869,7 @@ func TestRemoveChannelMember(t *testing.T) {
userStd
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
userStd
=
Client
.
Must
(
Client
.
CreateUser
(
userStd
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
userStd
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
serStd
.
Id
))
Client
.
Must
(
Client
.
AddChannelMember
(
channel1
.
Id
,
userStd
.
Id
))
...
...
@@ -919,7 +919,7 @@ func TestUpdateNotifyProps(t *testing.T) {
user
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
user
=
Client
.
Must
(
Client
.
CreateUser
(
user
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser
.
Id
))
Client
.
LoginByEmail
(
team
.
Name
,
user
.
Email
,
"pwd"
)
...
...
@@ -1041,7 +1041,7 @@ func TestFuzzyChannel(t *testing.T) {
user
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
user
=
Client
.
Must
(
Client
.
CreateUser
(
user
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser
.
Id
))
Client
.
LoginByEmail
(
team
.
Name
,
user
.
Email
,
"pwd"
)
...
...
api/command.go
View file @
75f8729e
...
...
@@ -544,7 +544,7 @@ func loadTestPostsCommand(c *Context, command *model.Command) bool {
}
var
usernames
[]
string
if
result
:=
<-
Srv
.
Store
.
User
()
.
GetProfiles
(
c
.
Session
.
TeamId
);
result
.
Err
==
nil
{
if
result
:=
<-
Srv
.
Store
.
User
()
.
GetProfiles
(
c
.
T
,
c
.
Session
.
TeamId
);
result
.
Err
==
nil
{
profileUsers
:=
result
.
Data
.
(
map
[
string
]
*
model
.
User
)
usernames
=
make
([]
string
,
len
(
profileUsers
))
i
:=
0
...
...
api/command_test.go
View file @
75f8729e
...
...
@@ -21,7 +21,7 @@ func TestSuggestRootCommands(t *testing.T) {
user1
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
user1
=
Client
.
Must
(
Client
.
CreateUser
(
user1
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user1
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser1
.
Id
))
Client
.
LoginByEmail
(
team
.
Name
,
user1
.
Email
,
"pwd"
)
...
...
@@ -70,7 +70,7 @@ func TestLogoutCommands(t *testing.T) {
user1
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
user1
=
Client
.
Must
(
Client
.
CreateUser
(
user1
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user1
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser1
.
Id
))
Client
.
LoginByEmail
(
team
.
Name
,
user1
.
Email
,
"pwd"
)
...
...
@@ -88,7 +88,7 @@ func TestJoinCommands(t *testing.T) {
user1
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
user1
=
Client
.
Must
(
Client
.
CreateUser
(
user1
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user1
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser1
.
Id
))
Client
.
LoginByEmail
(
team
.
Name
,
user1
.
Email
,
"pwd"
)
...
...
@@ -102,7 +102,7 @@ func TestJoinCommands(t *testing.T) {
user2
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
user2
=
Client
.
Must
(
Client
.
CreateUser
(
user2
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user1
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser1
.
Id
))
data
:=
make
(
map
[
string
]
string
)
data
[
"user_id"
]
=
user2
.
Id
...
...
@@ -164,7 +164,7 @@ func TestEchoCommand(t *testing.T) {
user1
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
user1
=
Client
.
Must
(
Client
.
CreateUser
(
user1
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user1
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser1
.
Id
))
Client
.
LoginByEmail
(
team
.
Name
,
user1
.
Email
,
"pwd"
)
...
...
@@ -202,7 +202,7 @@ func TestLoadTestUrlCommand(t *testing.T) {
user
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
user
=
Client
.
Must
(
Client
.
CreateUser
(
user
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser
.
Id
))
Client
.
LoginByEmail
(
team
.
Name
,
user
.
Email
,
"pwd"
)
...
...
api/context.go
View file @
75f8729e
...
...
@@ -195,7 +195,7 @@ func (h handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
if
c
.
Err
==
nil
&&
h
.
isUserActivity
&&
token
!=
""
&&
len
(
c
.
Session
.
UserId
)
>
0
{
go
func
()
{
if
err
:=
(
<-
Srv
.
Store
.
User
()
.
UpdateUserAndSessionActivity
(
c
.
Session
.
UserId
,
c
.
Session
.
Id
,
model
.
GetMillis
()))
.
Err
;
err
!=
nil
{
if
err
:=
(
<-
Srv
.
Store
.
User
()
.
UpdateUserAndSessionActivity
(
c
.
T
,
c
.
Session
.
UserId
,
c
.
Session
.
Id
,
model
.
GetMillis
()))
.
Err
;
err
!=
nil
{
l4g
.
Error
(
"Failed to update LastActivityAt for user_id=%v and session_id=%v, err=%v"
,
c
.
Session
.
UserId
,
c
.
Session
.
Id
,
err
)
}
}()
...
...
api/export.go
View file @
75f8729e
...
...
@@ -125,7 +125,7 @@ func ExportTeams(T goi18n.TranslateFunc, writer ExportWriter, options *ExportOpt
if
err
:=
ExportChannels
(
T
,
writer
,
options
,
team
.
Id
);
err
!=
nil
{
return
err
}
if
err
:=
ExportUsers
(
writer
,
options
,
team
.
Id
);
err
!=
nil
{
if
err
:=
ExportUsers
(
T
,
writer
,
options
,
team
.
Id
);
err
!=
nil
{
return
err
}
if
err
:=
ExportLocalStorage
(
writer
,
options
,
team
.
Id
);
err
!=
nil
{
...
...
@@ -225,10 +225,10 @@ func ExportPosts(T goi18n.TranslateFunc, writer ExportWriter, options *ExportOpt
return
nil
}
func
ExportUsers
(
writer
ExportWriter
,
options
*
ExportOptions
,
teamId
string
)
*
model
.
AppError
{
func
ExportUsers
(
T
goi18n
.
TranslateFunc
,
writer
ExportWriter
,
options
*
ExportOptions
,
teamId
string
)
*
model
.
AppError
{
// Get the users
var
users
[]
*
model
.
User
if
result
:=
<-
Srv
.
Store
.
User
()
.
GetForExport
(
teamId
);
result
.
Err
!=
nil
{
if
result
:=
<-
Srv
.
Store
.
User
()
.
GetForExport
(
T
,
teamId
);
result
.
Err
!=
nil
{
return
result
.
Err
}
else
{
users
=
result
.
Data
.
([]
*
model
.
User
)
...
...
api/file_test.go
View file @
75f8729e
...
...
@@ -29,7 +29,7 @@ func TestUploadFile(t *testing.T) {
user1
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
user1
=
Client
.
Must
(
Client
.
CreateUser
(
user1
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user1
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser1
.
Id
))
Client
.
LoginByEmail
(
team
.
Name
,
user1
.
Email
,
"pwd"
)
...
...
@@ -144,7 +144,7 @@ func TestGetFile(t *testing.T) {
user1
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
user1
=
Client
.
Must
(
Client
.
CreateUser
(
user1
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user1
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser1
.
Id
))
Client
.
LoginByEmail
(
team
.
Name
,
user1
.
Email
,
"pwd"
)
...
...
@@ -214,7 +214,7 @@ func TestGetFile(t *testing.T) {
user2
:=
&
model
.
User
{
TeamId
:
team2
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
user2
=
Client
.
Must
(
Client
.
CreateUser
(
user2
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user2
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser2
.
Id
))
newProps
:=
make
(
map
[
string
]
string
)
newProps
[
"filename"
]
=
filenames
[
0
]
...
...
@@ -322,11 +322,11 @@ func TestGetPublicLink(t *testing.T) {
user1
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
user1
=
Client
.
Must
(
Client
.
CreateUser
(
user1
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user1
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser1
.
Id
))
user2
:=
&
model
.
User
{
TeamId
:
team
.
Id
,
Email
:
model
.
NewId
()
+
"corey+test@test.com"
,
Nickname
:
"Corey Hulen"
,
Password
:
"pwd"
}
user2
=
Client
.
Must
(
Client
.
CreateUser
(
user2
,
""
))
.
Data
.
(
*
model
.
User
)
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
user2
.
Id
))
store
.
Must
(
Srv
.
Store
.
User
()
.
VerifyEmail
(
u
tils
.
T
,
u
ser2
.
Id
))
Client
.
LoginByEmail
(
team
.
Name
,
user1
.
Email
,
"pwd"
)
...
...
api/import.go
View file @
75f8729e
...
...
@@ -25,7 +25,7 @@ func ImportPost(T goi18n.TranslateFunc, post *model.Post) {
func
ImportUser
(
T
goi18n
.
TranslateFunc
,
user
*
model
.
User
)
*
model
.
User
{
user
.
MakeNonNil
()
if
result
:=
<-
Srv
.
Store
.
User
()
.
Save
(
user
);
result
.
Err
!=
nil
{
if
result
:=
<-
Srv
.
Store
.
User
()
.
Save
(
T
,
user
);
result
.
Err
!=
nil
{
l4g
.
Error
(
"Error saving user. err=%v"
,
result
.
Err
)
return
nil
}
else
{
...
...
@@ -35,7 +35,7 @@ func ImportUser(T goi18n.TranslateFunc, user *model.User) *model.User {
l4g
.
Error
(
"Encountered an issue joining default channels user_id=%s, team_id=%s, err=%v"
,
ruser
.
Id
,
ruser
.
TeamId
,
err
)
}