internal: move packages under this directory (#5836)

* Rename pkg -> internal

* Rename routes -> route

* Move route -> internal/route

* Rename models -> db

* Move db -> internal/db

* Fix route2 -> route

* Move cmd -> internal/cmd

* Bump version
This commit is contained in:
Unknwon
2019-10-24 01:51:46 -07:00
committed by GitHub
parent 613139e7be
commit 01c8df01ec
178 changed files with 1609 additions and 1608 deletions

View File

@@ -0,0 +1,123 @@
// Copyright 2014 The Gogs Authors. All rights reserved.
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package org
import (
"github.com/unknwon/com"
log "gopkg.in/clog.v1"
"gogs.io/gogs/internal/context"
"gogs.io/gogs/internal/db"
"gogs.io/gogs/internal/db/errors"
"gogs.io/gogs/internal/setting"
)
const (
MEMBERS = "org/member/members"
MEMBER_INVITE = "org/member/invite"
)
func Members(c *context.Context) {
org := c.Org.Organization
c.Data["Title"] = org.FullName
c.Data["PageIsOrgMembers"] = true
if err := org.GetMembers(); err != nil {
c.Handle(500, "GetMembers", err)
return
}
c.Data["Members"] = org.Members
c.HTML(200, MEMBERS)
}
func MembersAction(c *context.Context) {
uid := com.StrTo(c.Query("uid")).MustInt64()
if uid == 0 {
c.Redirect(c.Org.OrgLink + "/members")
return
}
org := c.Org.Organization
var err error
switch c.Params(":action") {
case "private":
if c.User.ID != uid && !c.Org.IsOwner {
c.Error(404)
return
}
err = db.ChangeOrgUserStatus(org.ID, uid, false)
case "public":
if c.User.ID != uid && !c.Org.IsOwner {
c.Error(404)
return
}
err = db.ChangeOrgUserStatus(org.ID, uid, true)
case "remove":
if !c.Org.IsOwner {
c.Error(404)
return
}
err = org.RemoveMember(uid)
if db.IsErrLastOrgOwner(err) {
c.Flash.Error(c.Tr("form.last_org_owner"))
c.Redirect(c.Org.OrgLink + "/members")
return
}
case "leave":
err = org.RemoveMember(c.User.ID)
if db.IsErrLastOrgOwner(err) {
c.Flash.Error(c.Tr("form.last_org_owner"))
c.Redirect(c.Org.OrgLink + "/members")
return
}
}
if err != nil {
log.Error(4, "Action(%s): %v", c.Params(":action"), err)
c.JSON(200, map[string]interface{}{
"ok": false,
"err": err.Error(),
})
return
}
if c.Params(":action") != "leave" {
c.Redirect(c.Org.OrgLink + "/members")
} else {
c.Redirect(setting.AppSubURL + "/")
}
}
func Invitation(c *context.Context) {
org := c.Org.Organization
c.Data["Title"] = org.FullName
c.Data["PageIsOrgMembers"] = true
if c.Req.Method == "POST" {
uname := c.Query("uname")
u, err := db.GetUserByName(uname)
if err != nil {
if errors.IsUserNotExist(err) {
c.Flash.Error(c.Tr("form.user_not_exist"))
c.Redirect(c.Org.OrgLink + "/invitations/new")
} else {
c.Handle(500, " GetUserByName", err)
}
return
}
if err = org.AddMember(u.ID); err != nil {
c.Handle(500, " AddMember", err)
return
}
log.Trace("New member added(%s): %s", org.Name, u.Name)
c.Redirect(c.Org.OrgLink + "/members")
return
}
c.HTML(200, MEMBER_INVITE)
}

56
internal/route/org/org.go Normal file
View File

@@ -0,0 +1,56 @@
// Copyright 2014 The Gogs Authors. All rights reserved.
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package org
import (
log "gopkg.in/clog.v1"
"gogs.io/gogs/internal/context"
"gogs.io/gogs/internal/db"
"gogs.io/gogs/internal/form"
"gogs.io/gogs/internal/setting"
)
const (
CREATE = "org/create"
)
func Create(c *context.Context) {
c.Data["Title"] = c.Tr("new_org")
c.HTML(200, CREATE)
}
func CreatePost(c *context.Context, f form.CreateOrg) {
c.Data["Title"] = c.Tr("new_org")
if c.HasError() {
c.HTML(200, CREATE)
return
}
org := &db.User{
Name: f.OrgName,
IsActive: true,
Type: db.USER_TYPE_ORGANIZATION,
}
if err := db.CreateOrganization(org, c.User); err != nil {
c.Data["Err_OrgName"] = true
switch {
case db.IsErrUserAlreadyExist(err):
c.RenderWithErr(c.Tr("form.org_name_been_taken"), CREATE, &f)
case db.IsErrNameReserved(err):
c.RenderWithErr(c.Tr("org.form.name_reserved", err.(db.ErrNameReserved).Name), CREATE, &f)
case db.IsErrNamePatternNotAllowed(err):
c.RenderWithErr(c.Tr("org.form.name_pattern_not_allowed", err.(db.ErrNamePatternNotAllowed).Pattern), CREATE, &f)
default:
c.Handle(500, "CreateOrganization", err)
}
return
}
log.Trace("Organization created: %s", org.Name)
c.Redirect(setting.AppSubURL + "/org/" + f.OrgName + "/dashboard")
}

View File

@@ -0,0 +1,168 @@
// Copyright 2014 The Gogs Authors. All rights reserved.
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package org
import (
user2 "gogs.io/gogs/internal/route/user"
"strings"
log "gopkg.in/clog.v1"
"gogs.io/gogs/internal/context"
"gogs.io/gogs/internal/db"
"gogs.io/gogs/internal/db/errors"
"gogs.io/gogs/internal/form"
"gogs.io/gogs/internal/setting"
)
const (
SETTINGS_OPTIONS = "org/settings/options"
SETTINGS_DELETE = "org/settings/delete"
SETTINGS_WEBHOOKS = "org/settings/webhooks"
)
func Settings(c *context.Context) {
c.Data["Title"] = c.Tr("org.settings")
c.Data["PageIsSettingsOptions"] = true
c.HTML(200, SETTINGS_OPTIONS)
}
func SettingsPost(c *context.Context, f form.UpdateOrgSetting) {
c.Data["Title"] = c.Tr("org.settings")
c.Data["PageIsSettingsOptions"] = true
if c.HasError() {
c.HTML(200, SETTINGS_OPTIONS)
return
}
org := c.Org.Organization
// Check if organization name has been changed.
if org.LowerName != strings.ToLower(f.Name) {
isExist, err := db.IsUserExist(org.ID, f.Name)
if err != nil {
c.Handle(500, "IsUserExist", err)
return
} else if isExist {
c.Data["OrgName"] = true
c.RenderWithErr(c.Tr("form.username_been_taken"), SETTINGS_OPTIONS, &f)
return
} else if err = db.ChangeUserName(org, f.Name); err != nil {
c.Data["OrgName"] = true
switch {
case db.IsErrNameReserved(err):
c.RenderWithErr(c.Tr("user.form.name_reserved"), SETTINGS_OPTIONS, &f)
case db.IsErrNamePatternNotAllowed(err):
c.RenderWithErr(c.Tr("user.form.name_pattern_not_allowed"), SETTINGS_OPTIONS, &f)
default:
c.Handle(500, "ChangeUserName", err)
}
return
}
// reset c.org.OrgLink with new name
c.Org.OrgLink = setting.AppSubURL + "/org/" + f.Name
log.Trace("Organization name changed: %s -> %s", org.Name, f.Name)
}
// In case it's just a case change.
org.Name = f.Name
org.LowerName = strings.ToLower(f.Name)
if c.User.IsAdmin {
org.MaxRepoCreation = f.MaxRepoCreation
}
org.FullName = f.FullName
org.Description = f.Description
org.Website = f.Website
org.Location = f.Location
if err := db.UpdateUser(org); err != nil {
c.Handle(500, "UpdateUser", err)
return
}
log.Trace("Organization setting updated: %s", org.Name)
c.Flash.Success(c.Tr("org.settings.update_setting_success"))
c.Redirect(c.Org.OrgLink + "/settings")
}
func SettingsAvatar(c *context.Context, f form.Avatar) {
f.Source = form.AVATAR_LOCAL
if err := user2.UpdateAvatarSetting(c, f, c.Org.Organization); err != nil {
c.Flash.Error(err.Error())
} else {
c.Flash.Success(c.Tr("org.settings.update_avatar_success"))
}
c.Redirect(c.Org.OrgLink + "/settings")
}
func SettingsDeleteAvatar(c *context.Context) {
if err := c.Org.Organization.DeleteAvatar(); err != nil {
c.Flash.Error(err.Error())
}
c.Redirect(c.Org.OrgLink + "/settings")
}
func SettingsDelete(c *context.Context) {
c.Title("org.settings")
c.PageIs("SettingsDelete")
org := c.Org.Organization
if c.Req.Method == "POST" {
if _, err := db.UserLogin(c.User.Name, c.Query("password"), c.User.LoginSource); err != nil {
if errors.IsUserNotExist(err) {
c.RenderWithErr(c.Tr("form.enterred_invalid_password"), SETTINGS_DELETE, nil)
} else {
c.ServerError("UserLogin", err)
}
return
}
if err := db.DeleteOrganization(org); err != nil {
if db.IsErrUserOwnRepos(err) {
c.Flash.Error(c.Tr("form.org_still_own_repo"))
c.Redirect(c.Org.OrgLink + "/settings/delete")
} else {
c.ServerError("DeleteOrganization", err)
}
} else {
log.Trace("Organization deleted: %s", org.Name)
c.Redirect(setting.AppSubURL + "/")
}
return
}
c.Success(SETTINGS_DELETE)
}
func Webhooks(c *context.Context) {
c.Data["Title"] = c.Tr("org.settings")
c.Data["PageIsSettingsHooks"] = true
c.Data["BaseLink"] = c.Org.OrgLink
c.Data["Description"] = c.Tr("org.settings.hooks_desc")
c.Data["Types"] = setting.Webhook.Types
ws, err := db.GetWebhooksByOrgID(c.Org.Organization.ID)
if err != nil {
c.Handle(500, "GetWebhooksByOrgId", err)
return
}
c.Data["Webhooks"] = ws
c.HTML(200, SETTINGS_WEBHOOKS)
}
func DeleteWebhook(c *context.Context) {
if err := db.DeleteWebhookOfOrgByID(c.Org.Organization.ID, c.QueryInt64("id")); err != nil {
c.Flash.Error("DeleteWebhookByOrgID: " + err.Error())
} else {
c.Flash.Success(c.Tr("repo.settings.webhook_deletion_success"))
}
c.JSON(200, map[string]interface{}{
"redirect": c.Org.OrgLink + "/settings/hooks",
})
}

271
internal/route/org/teams.go Normal file
View File

@@ -0,0 +1,271 @@
// Copyright 2014 The Gogs Authors. All rights reserved.
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package org
import (
"path"
"github.com/unknwon/com"
log "gopkg.in/clog.v1"
"gogs.io/gogs/internal/context"
"gogs.io/gogs/internal/db"
"gogs.io/gogs/internal/db/errors"
"gogs.io/gogs/internal/form"
)
const (
TEAMS = "org/team/teams"
TEAM_NEW = "org/team/new"
TEAM_MEMBERS = "org/team/members"
TEAM_REPOSITORIES = "org/team/repositories"
)
func Teams(c *context.Context) {
org := c.Org.Organization
c.Data["Title"] = org.FullName
c.Data["PageIsOrgTeams"] = true
for _, t := range org.Teams {
if err := t.GetMembers(); err != nil {
c.Handle(500, "GetMembers", err)
return
}
}
c.Data["Teams"] = org.Teams
c.HTML(200, TEAMS)
}
func TeamsAction(c *context.Context) {
uid := com.StrTo(c.Query("uid")).MustInt64()
if uid == 0 {
c.Redirect(c.Org.OrgLink + "/teams")
return
}
page := c.Query("page")
var err error
switch c.Params(":action") {
case "join":
if !c.Org.IsOwner {
c.Error(404)
return
}
err = c.Org.Team.AddMember(c.User.ID)
case "leave":
err = c.Org.Team.RemoveMember(c.User.ID)
case "remove":
if !c.Org.IsOwner {
c.Error(404)
return
}
err = c.Org.Team.RemoveMember(uid)
page = "team"
case "add":
if !c.Org.IsOwner {
c.Error(404)
return
}
uname := c.Query("uname")
var u *db.User
u, err = db.GetUserByName(uname)
if err != nil {
if errors.IsUserNotExist(err) {
c.Flash.Error(c.Tr("form.user_not_exist"))
c.Redirect(c.Org.OrgLink + "/teams/" + c.Org.Team.LowerName)
} else {
c.Handle(500, " GetUserByName", err)
}
return
}
err = c.Org.Team.AddMember(u.ID)
page = "team"
}
if err != nil {
if db.IsErrLastOrgOwner(err) {
c.Flash.Error(c.Tr("form.last_org_owner"))
} else {
log.Error(3, "Action(%s): %v", c.Params(":action"), err)
c.JSON(200, map[string]interface{}{
"ok": false,
"err": err.Error(),
})
return
}
}
switch page {
case "team":
c.Redirect(c.Org.OrgLink + "/teams/" + c.Org.Team.LowerName)
default:
c.Redirect(c.Org.OrgLink + "/teams")
}
}
func TeamsRepoAction(c *context.Context) {
if !c.Org.IsOwner {
c.Error(404)
return
}
var err error
switch c.Params(":action") {
case "add":
repoName := path.Base(c.Query("repo_name"))
var repo *db.Repository
repo, err = db.GetRepositoryByName(c.Org.Organization.ID, repoName)
if err != nil {
if errors.IsRepoNotExist(err) {
c.Flash.Error(c.Tr("org.teams.add_nonexistent_repo"))
c.Redirect(c.Org.OrgLink + "/teams/" + c.Org.Team.LowerName + "/repositories")
return
}
c.Handle(500, "GetRepositoryByName", err)
return
}
err = c.Org.Team.AddRepository(repo)
case "remove":
err = c.Org.Team.RemoveRepository(com.StrTo(c.Query("repoid")).MustInt64())
}
if err != nil {
log.Error(3, "Action(%s): '%s' %v", c.Params(":action"), c.Org.Team.Name, err)
c.Handle(500, "TeamsRepoAction", err)
return
}
c.Redirect(c.Org.OrgLink + "/teams/" + c.Org.Team.LowerName + "/repositories")
}
func NewTeam(c *context.Context) {
c.Data["Title"] = c.Org.Organization.FullName
c.Data["PageIsOrgTeams"] = true
c.Data["PageIsOrgTeamsNew"] = true
c.Data["Team"] = &db.Team{}
c.HTML(200, TEAM_NEW)
}
func NewTeamPost(c *context.Context, f form.CreateTeam) {
c.Data["Title"] = c.Org.Organization.FullName
c.Data["PageIsOrgTeams"] = true
c.Data["PageIsOrgTeamsNew"] = true
t := &db.Team{
OrgID: c.Org.Organization.ID,
Name: f.TeamName,
Description: f.Description,
Authorize: db.ParseAccessMode(f.Permission),
}
c.Data["Team"] = t
if c.HasError() {
c.HTML(200, TEAM_NEW)
return
}
if err := db.NewTeam(t); err != nil {
c.Data["Err_TeamName"] = true
switch {
case db.IsErrTeamAlreadyExist(err):
c.RenderWithErr(c.Tr("form.team_name_been_taken"), TEAM_NEW, &f)
case db.IsErrNameReserved(err):
c.RenderWithErr(c.Tr("org.form.team_name_reserved", err.(db.ErrNameReserved).Name), TEAM_NEW, &f)
default:
c.Handle(500, "NewTeam", err)
}
return
}
log.Trace("Team created: %s/%s", c.Org.Organization.Name, t.Name)
c.Redirect(c.Org.OrgLink + "/teams/" + t.LowerName)
}
func TeamMembers(c *context.Context) {
c.Data["Title"] = c.Org.Team.Name
c.Data["PageIsOrgTeams"] = true
if err := c.Org.Team.GetMembers(); err != nil {
c.Handle(500, "GetMembers", err)
return
}
c.HTML(200, TEAM_MEMBERS)
}
func TeamRepositories(c *context.Context) {
c.Data["Title"] = c.Org.Team.Name
c.Data["PageIsOrgTeams"] = true
if err := c.Org.Team.GetRepositories(); err != nil {
c.Handle(500, "GetRepositories", err)
return
}
c.HTML(200, TEAM_REPOSITORIES)
}
func EditTeam(c *context.Context) {
c.Data["Title"] = c.Org.Organization.FullName
c.Data["PageIsOrgTeams"] = true
c.Data["team_name"] = c.Org.Team.Name
c.Data["desc"] = c.Org.Team.Description
c.HTML(200, TEAM_NEW)
}
func EditTeamPost(c *context.Context, f form.CreateTeam) {
t := c.Org.Team
c.Data["Title"] = c.Org.Organization.FullName
c.Data["PageIsOrgTeams"] = true
c.Data["Team"] = t
if c.HasError() {
c.HTML(200, TEAM_NEW)
return
}
isAuthChanged := false
if !t.IsOwnerTeam() {
// Validate permission level.
var auth db.AccessMode
switch f.Permission {
case "read":
auth = db.ACCESS_MODE_READ
case "write":
auth = db.ACCESS_MODE_WRITE
case "admin":
auth = db.ACCESS_MODE_ADMIN
default:
c.Error(401)
return
}
t.Name = f.TeamName
if t.Authorize != auth {
isAuthChanged = true
t.Authorize = auth
}
}
t.Description = f.Description
if err := db.UpdateTeam(t, isAuthChanged); err != nil {
c.Data["Err_TeamName"] = true
switch {
case db.IsErrTeamAlreadyExist(err):
c.RenderWithErr(c.Tr("form.team_name_been_taken"), TEAM_NEW, &f)
default:
c.Handle(500, "UpdateTeam", err)
}
return
}
c.Redirect(c.Org.OrgLink + "/teams/" + t.LowerName)
}
func DeleteTeam(c *context.Context) {
if err := db.DeleteTeam(c.Org.Team); err != nil {
c.Flash.Error("DeleteTeam: " + err.Error())
} else {
c.Flash.Success(c.Tr("org.teams.delete_team_success"))
}
c.JSON(200, map[string]interface{}{
"redirect": c.Org.OrgLink + "/teams",
})
}