Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
e53e039b
Unverified
Commit
e53e039b
authored
Mar 28, 2018
by
Dan Cech
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
restructure GetUserByAuthInfo
parent
c4168c23
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
50 additions
and
38 deletions
+50
-38
pkg/login/ext_user.go
+26
-26
pkg/models/user_auth.go
+1
-2
pkg/services/sqlstore/user_auth.go
+23
-10
No files found.
pkg/login/ext_user.go
View file @
e53e039b
...
@@ -16,14 +16,14 @@ func init() {
...
@@ -16,14 +16,14 @@ func init() {
func
UpsertUser
(
cmd
*
m
.
UpsertUserCommand
)
error
{
func
UpsertUser
(
cmd
*
m
.
UpsertUserCommand
)
error
{
extUser
:=
cmd
.
ExternalUser
extUser
:=
cmd
.
ExternalUser
userQuery
:=
m
.
GetUserByAuthInfoQuery
{
userQuery
:=
&
m
.
GetUserByAuthInfoQuery
{
AuthModule
:
extUser
.
AuthModule
,
AuthModule
:
extUser
.
AuthModule
,
AuthId
:
extUser
.
AuthId
,
AuthId
:
extUser
.
AuthId
,
UserId
:
extUser
.
UserId
,
UserId
:
extUser
.
UserId
,
Email
:
extUser
.
Email
,
Email
:
extUser
.
Email
,
Login
:
extUser
.
Login
,
Login
:
extUser
.
Login
,
}
}
err
:=
bus
.
Dispatch
(
&
userQuery
)
err
:=
bus
.
Dispatch
(
userQuery
)
if
err
!=
nil
{
if
err
!=
nil
{
if
err
!=
m
.
ErrUserNotFound
{
if
err
!=
m
.
ErrUserNotFound
{
return
err
return
err
...
@@ -47,23 +47,23 @@ func UpsertUser(cmd *m.UpsertUserCommand) error {
...
@@ -47,23 +47,23 @@ func UpsertUser(cmd *m.UpsertUserCommand) error {
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
}
else
{
cmd
.
Result
=
userQuery
.
User
// sync user info
err
=
updateUser
(
cmd
.
Result
,
extUser
)
if
err
!=
nil
{
return
err
}
}
if
userQuery
.
UserAuth
==
nil
&&
extUser
.
AuthModule
!=
""
&&
extUser
.
AuthId
!=
""
{
if
extUser
.
AuthModule
!=
""
&&
extUser
.
AuthId
!=
""
{
cmd2
:=
m
.
SetAuthInfoCommand
{
cmd2
:=
&
m
.
SetAuthInfoCommand
{
UserId
:
cmd
.
Result
.
Id
,
UserId
:
cmd
.
Result
.
Id
,
AuthModule
:
extUser
.
AuthModule
,
AuthModule
:
extUser
.
AuthModule
,
AuthId
:
extUser
.
AuthId
,
AuthId
:
extUser
.
AuthId
,
}
}
if
err
:=
bus
.
Dispatch
(
&
cmd2
);
err
!=
nil
{
if
err
:=
bus
.
Dispatch
(
cmd2
);
err
!=
nil
{
return
err
}
}
}
else
{
cmd
.
Result
=
userQuery
.
Result
// sync user info
err
=
updateUser
(
cmd
.
Result
,
extUser
)
if
err
!=
nil
{
return
err
return
err
}
}
}
}
...
@@ -77,12 +77,12 @@ func UpsertUser(cmd *m.UpsertUserCommand) error {
...
@@ -77,12 +77,12 @@ func UpsertUser(cmd *m.UpsertUserCommand) error {
}
}
func
createUser
(
extUser
*
m
.
ExternalUserInfo
)
(
*
m
.
User
,
error
)
{
func
createUser
(
extUser
*
m
.
ExternalUserInfo
)
(
*
m
.
User
,
error
)
{
cmd
:=
m
.
CreateUserCommand
{
cmd
:=
&
m
.
CreateUserCommand
{
Login
:
extUser
.
Login
,
Login
:
extUser
.
Login
,
Email
:
extUser
.
Email
,
Email
:
extUser
.
Email
,
Name
:
extUser
.
Name
,
Name
:
extUser
.
Name
,
}
}
if
err
:=
bus
.
Dispatch
(
&
cmd
);
err
!=
nil
{
if
err
:=
bus
.
Dispatch
(
cmd
);
err
!=
nil
{
return
nil
,
err
return
nil
,
err
}
}
...
@@ -91,7 +91,7 @@ func createUser(extUser *m.ExternalUserInfo) (*m.User, error) {
...
@@ -91,7 +91,7 @@ func createUser(extUser *m.ExternalUserInfo) (*m.User, error) {
func
updateUser
(
user
*
m
.
User
,
extUser
*
m
.
ExternalUserInfo
)
error
{
func
updateUser
(
user
*
m
.
User
,
extUser
*
m
.
ExternalUserInfo
)
error
{
// sync user info
// sync user info
updateCmd
:=
m
.
UpdateUserCommand
{
updateCmd
:=
&
m
.
UpdateUserCommand
{
UserId
:
user
.
Id
,
UserId
:
user
.
Id
,
}
}
needsUpdate
:=
false
needsUpdate
:=
false
...
@@ -111,7 +111,7 @@ func updateUser(user *m.User, extUser *m.ExternalUserInfo) error {
...
@@ -111,7 +111,7 @@ func updateUser(user *m.User, extUser *m.ExternalUserInfo) error {
if
needsUpdate
{
if
needsUpdate
{
log
.
Debug
(
"Syncing user info"
,
"id"
,
user
.
Id
,
"update"
,
updateCmd
)
log
.
Debug
(
"Syncing user info"
,
"id"
,
user
.
Id
,
"update"
,
updateCmd
)
err
:=
bus
.
Dispatch
(
&
updateCmd
)
err
:=
bus
.
Dispatch
(
updateCmd
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
...
@@ -126,8 +126,8 @@ func syncOrgRoles(user *m.User, extUser *m.ExternalUserInfo) error {
...
@@ -126,8 +126,8 @@ func syncOrgRoles(user *m.User, extUser *m.ExternalUserInfo) error {
return
nil
return
nil
}
}
orgsQuery
:=
m
.
GetUserOrgListQuery
{
UserId
:
user
.
Id
}
orgsQuery
:=
&
m
.
GetUserOrgListQuery
{
UserId
:
user
.
Id
}
if
err
:=
bus
.
Dispatch
(
&
orgsQuery
);
err
!=
nil
{
if
err
:=
bus
.
Dispatch
(
orgsQuery
);
err
!=
nil
{
return
err
return
err
}
}
...
@@ -142,8 +142,8 @@ func syncOrgRoles(user *m.User, extUser *m.ExternalUserInfo) error {
...
@@ -142,8 +142,8 @@ func syncOrgRoles(user *m.User, extUser *m.ExternalUserInfo) error {
deleteOrgIds
=
append
(
deleteOrgIds
,
org
.
OrgId
)
deleteOrgIds
=
append
(
deleteOrgIds
,
org
.
OrgId
)
}
else
if
extUser
.
OrgRoles
[
org
.
OrgId
]
!=
org
.
Role
{
}
else
if
extUser
.
OrgRoles
[
org
.
OrgId
]
!=
org
.
Role
{
// update role
// update role
cmd
:=
m
.
UpdateOrgUserCommand
{
OrgId
:
org
.
OrgId
,
UserId
:
user
.
Id
,
Role
:
extUser
.
OrgRoles
[
org
.
OrgId
]}
cmd
:=
&
m
.
UpdateOrgUserCommand
{
OrgId
:
org
.
OrgId
,
UserId
:
user
.
Id
,
Role
:
extUser
.
OrgRoles
[
org
.
OrgId
]}
if
err
:=
bus
.
Dispatch
(
&
cmd
);
err
!=
nil
{
if
err
:=
bus
.
Dispatch
(
cmd
);
err
!=
nil
{
return
err
return
err
}
}
}
}
...
@@ -156,8 +156,8 @@ func syncOrgRoles(user *m.User, extUser *m.ExternalUserInfo) error {
...
@@ -156,8 +156,8 @@ func syncOrgRoles(user *m.User, extUser *m.ExternalUserInfo) error {
}
}
// add role
// add role
cmd
:=
m
.
AddOrgUserCommand
{
UserId
:
user
.
Id
,
Role
:
orgRole
,
OrgId
:
orgId
}
cmd
:=
&
m
.
AddOrgUserCommand
{
UserId
:
user
.
Id
,
Role
:
orgRole
,
OrgId
:
orgId
}
err
:=
bus
.
Dispatch
(
&
cmd
)
err
:=
bus
.
Dispatch
(
cmd
)
if
err
!=
nil
&&
err
!=
m
.
ErrOrgNotFound
{
if
err
!=
nil
&&
err
!=
m
.
ErrOrgNotFound
{
return
err
return
err
}
}
...
@@ -165,8 +165,8 @@ func syncOrgRoles(user *m.User, extUser *m.ExternalUserInfo) error {
...
@@ -165,8 +165,8 @@ func syncOrgRoles(user *m.User, extUser *m.ExternalUserInfo) error {
// delete any removed org roles
// delete any removed org roles
for
_
,
orgId
:=
range
deleteOrgIds
{
for
_
,
orgId
:=
range
deleteOrgIds
{
cmd
:=
m
.
RemoveOrgUserCommand
{
OrgId
:
orgId
,
UserId
:
user
.
Id
}
cmd
:=
&
m
.
RemoveOrgUserCommand
{
OrgId
:
orgId
,
UserId
:
user
.
Id
}
if
err
:=
bus
.
Dispatch
(
&
cmd
);
err
!=
nil
{
if
err
:=
bus
.
Dispatch
(
cmd
);
err
!=
nil
{
return
err
return
err
}
}
}
}
...
...
pkg/models/user_auth.go
View file @
e53e039b
...
@@ -61,8 +61,7 @@ type GetUserByAuthInfoQuery struct {
...
@@ -61,8 +61,7 @@ type GetUserByAuthInfoQuery struct {
Email
string
Email
string
Login
string
Login
string
User
*
User
Result
*
User
UserAuth
*
UserAuth
}
}
type
GetAuthInfoQuery
struct
{
type
GetAuthInfoQuery
struct
{
...
...
pkg/services/sqlstore/user_auth.go
View file @
e53e039b
...
@@ -18,13 +18,12 @@ func GetUserByAuthInfo(query *m.GetUserByAuthInfoQuery) error {
...
@@ -18,13 +18,12 @@ func GetUserByAuthInfo(query *m.GetUserByAuthInfoQuery) error {
user
:=
&
m
.
User
{}
user
:=
&
m
.
User
{}
has
:=
false
has
:=
false
var
err
error
var
err
error
authQuery
:=
&
m
.
GetAuthInfoQuery
{}
// Try to find the user by auth module and id first
// Try to find the user by auth module and id first
if
query
.
AuthModule
!=
""
&&
query
.
AuthId
!=
""
{
if
query
.
AuthModule
!=
""
&&
query
.
AuthId
!=
""
{
authQuery
:=
&
m
.
GetAuthInfoQuery
{
authQuery
.
AuthModule
=
query
.
AuthModule
AuthModule
:
query
.
AuthModule
,
authQuery
.
AuthId
=
query
.
AuthId
AuthId
:
query
.
AuthId
,
}
err
=
GetAuthInfo
(
authQuery
)
err
=
GetAuthInfo
(
authQuery
)
// if user id was specified and doesn't match the user_auth entry, remove it
// if user id was specified and doesn't match the user_auth entry, remove it
...
@@ -35,15 +34,15 @@ func GetUserByAuthInfo(query *m.GetUserByAuthInfoQuery) error {
...
@@ -35,15 +34,15 @@ func GetUserByAuthInfo(query *m.GetUserByAuthInfoQuery) error {
if
err
!=
nil
{
if
err
!=
nil
{
sqlog
.
Error
(
"Error removing user_auth entry"
,
"error"
,
err
)
sqlog
.
Error
(
"Error removing user_auth entry"
,
"error"
,
err
)
}
}
authQuery
.
Result
=
nil
}
else
if
err
==
nil
{
}
else
if
err
==
nil
{
has
,
err
=
x
.
Id
(
authQuery
.
Result
.
UserId
)
.
Get
(
user
)
has
,
err
=
x
.
Id
(
authQuery
.
Result
.
UserId
)
.
Get
(
user
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
if
has
{
if
!
has
{
query
.
UserAuth
=
authQuery
.
Result
}
else
{
// if the user has been deleted then remove the entry
// if the user has been deleted then remove the entry
err
=
DeleteAuthInfo
(
&
m
.
DeleteAuthInfoCommand
{
err
=
DeleteAuthInfo
(
&
m
.
DeleteAuthInfoCommand
{
UserAuth
:
authQuery
.
Result
,
UserAuth
:
authQuery
.
Result
,
...
@@ -51,6 +50,8 @@ func GetUserByAuthInfo(query *m.GetUserByAuthInfoQuery) error {
...
@@ -51,6 +50,8 @@ func GetUserByAuthInfo(query *m.GetUserByAuthInfoQuery) error {
if
err
!=
nil
{
if
err
!=
nil
{
sqlog
.
Error
(
"Error removing user_auth entry"
,
"error"
,
err
)
sqlog
.
Error
(
"Error removing user_auth entry"
,
"error"
,
err
)
}
}
authQuery
.
Result
=
nil
}
}
}
else
if
err
!=
m
.
ErrUserNotFound
{
}
else
if
err
!=
m
.
ErrUserNotFound
{
return
err
return
err
...
@@ -88,7 +89,19 @@ func GetUserByAuthInfo(query *m.GetUserByAuthInfoQuery) error {
...
@@ -88,7 +89,19 @@ func GetUserByAuthInfo(query *m.GetUserByAuthInfoQuery) error {
return
m
.
ErrUserNotFound
return
m
.
ErrUserNotFound
}
}
query
.
User
=
user
// create authInfo record to link accounts
if
authQuery
.
Result
==
nil
&&
query
.
AuthModule
!=
""
&&
query
.
AuthId
!=
""
{
cmd2
:=
&
m
.
SetAuthInfoCommand
{
UserId
:
user
.
Id
,
AuthModule
:
query
.
AuthModule
,
AuthId
:
query
.
AuthId
,
}
if
err
:=
SetAuthInfo
(
cmd2
);
err
!=
nil
{
return
err
}
}
query
.
Result
=
user
return
nil
return
nil
}
}
...
@@ -111,14 +124,14 @@ func GetAuthInfo(query *m.GetAuthInfoQuery) error {
...
@@ -111,14 +124,14 @@ func GetAuthInfo(query *m.GetAuthInfoQuery) error {
func
SetAuthInfo
(
cmd
*
m
.
SetAuthInfoCommand
)
error
{
func
SetAuthInfo
(
cmd
*
m
.
SetAuthInfoCommand
)
error
{
return
inTransaction
(
func
(
sess
*
DBSession
)
error
{
return
inTransaction
(
func
(
sess
*
DBSession
)
error
{
authUser
:=
m
.
UserAuth
{
authUser
:=
&
m
.
UserAuth
{
UserId
:
cmd
.
UserId
,
UserId
:
cmd
.
UserId
,
AuthModule
:
cmd
.
AuthModule
,
AuthModule
:
cmd
.
AuthModule
,
AuthId
:
cmd
.
AuthId
,
AuthId
:
cmd
.
AuthId
,
Created
:
time
.
Now
(),
Created
:
time
.
Now
(),
}
}
_
,
err
:=
sess
.
Insert
(
&
authUser
)
_
,
err
:=
sess
.
Insert
(
authUser
)
return
err
return
err
})
})
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment