Skip to content

Commit e7ba9e8

Browse files
committed
Enforce user type
Use GetOrgByName in place of GetUserByName
1 parent 30787e4 commit e7ba9e8

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

models/user.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1126,7 +1126,10 @@ func GetUserByName(name string) (*User, error) {
11261126
if len(name) == 0 {
11271127
return nil, ErrUserNotExist{0, name, 0}
11281128
}
1129-
u := &User{LowerName: strings.ToLower(name)}
1129+
u := &User{
1130+
LowerName: strings.ToLower(name),
1131+
Type: UserTypeIndividual,
1132+
}
11301133
has, err := x.Get(u)
11311134
if err != nil {
11321135
return nil, err

modules/context/org.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ func HandleOrgAssignment(ctx *Context, args ...bool) {
4848
orgName := ctx.Params(":org")
4949

5050
var err error
51-
ctx.Org.Organization, err = models.GetUserByName(orgName)
51+
ctx.Org.Organization, err = models.GetOrgByName(orgName)
5252
if err != nil {
53-
if models.IsErrUserNotExist(err) {
54-
ctx.Handle(404, "GetUserByName", err)
53+
if models.IsErrOrgNotExist(err) {
54+
ctx.Handle(404, "GetOrgByName", err)
5555
} else {
56-
ctx.Handle(500, "GetUserByName", err)
56+
ctx.Handle(500, "GetOrgByName", err)
5757
}
5858
return
5959
}

routers/user/home.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ func getDashboardContextUser(ctx *context.Context) *models.User {
3131
orgName := ctx.Params(":org")
3232
if len(orgName) > 0 {
3333
// Organization.
34-
org, err := models.GetUserByName(orgName)
34+
org, err := models.GetOrgByName(orgName)
3535
if err != nil {
36-
if models.IsErrUserNotExist(err) {
37-
ctx.Handle(404, "GetUserByName", err)
36+
if models.IsErrOrgNotExist(err) {
37+
ctx.Handle(404, "GetOrgByName", err)
3838
} else {
39-
ctx.Handle(500, "GetUserByName", err)
39+
ctx.Handle(500, "GetOrgByName", err)
4040
}
4141
return nil
4242
}

0 commit comments

Comments
 (0)