complete repo transfer

Author: adelowo

models/migrations/v79.go

@@ -12,6 +12,7 @@ import (
 func addRepoTransfer(x *xorm.Engine) error {
 	type RepoTransfer struct {
 		ID          int64 `xorm:"pk autoincr"`
+		UserID      int64
 		RecipientID int64
 		RepoID      int64
 		CreatedUnix util.TimeStamp `xorm:"INDEX NOT NULL created"`

models/repo_transfer.go

@@ -31,6 +31,8 @@ const (
 // RepoTransfer is used to manage repository transfers
 type RepoTransfer struct {
 	ID          int64 `xorm:"pk autoincr"`
+	UserID      int64
+	User        *User `xorm:"-"`
 	RecipientID int64
 	Recipient   *User `xorm:"-"`
 	RepoID      int64
@@ -39,18 +41,30 @@ type RepoTransfer struct {
 	Status      TransferStatus
 }
 
-// LoadRecipient fetches the transfer recipient from the database
-func (r *RepoTransfer) LoadRecipient() error {
-	if r.Recipient != nil {
+// LoadAttributes fetches the transfer recipient from the database
+func (r *RepoTransfer) LoadAttributes() error {
+	if r.Recipient != nil && r.User != nil {
 		return nil
 	}
 
-	u, err := GetUserByID(r.RecipientID)
-	if err != nil {
-		return err
+	if r.Recipient == nil {
+		u, err := GetUserByID(r.RecipientID)
+		if err != nil {
+			return err
+		}
+
+		r.Recipient = u
+	}
+
+	if r.User == nil {
+		u, err := GetUserByID(r.UserID)
+		if err != nil {
+			return err
+		}
+
+		r.User = u
 	}
 
-	r.Recipient = u
 	return nil
 }
 
@@ -59,20 +73,26 @@ func (r *RepoTransfer) LoadRecipient() error {
 func GetPendingRepositoryTransfer(repo *Repository) (*RepoTransfer, error) {
 	var transfer = new(RepoTransfer)
 
-	_, err := x.Where("status = ? AND repo_id = ? ", Pending, repo.ID).
+	has, err := x.Where("status = ? AND repo_id = ? ", Pending, repo.ID).
 		Get(transfer)
-
 	if err != nil {
 		return nil, err
 	}
 
-	if transfer.ID == 0 {
+	if transfer.ID == 0 || !has {
 		return nil, ErrNoPendingRepoTransfer{RepoID: repo.ID}
 	}
 
 	return transfer, nil
 }
 
+func acceptRepositoryTransfer(repo *Repository) error {
+	_, err := x.Where("repo_id = ?", repo.ID).Cols("status").Update(&RepoTransfer{
+		Status: Accepted,
+	})
+	return err
+}
+
 // CancelRepositoryTransfer makes sure to set the transfer process as
 // "rejected". Thus ending the transfer process
 func CancelRepositoryTransfer(repoTransfer *RepoTransfer) error {
@@ -85,15 +105,12 @@ func CancelRepositoryTransfer(repoTransfer *RepoTransfer) error {
 
 // StartRepositoryTransfer marks the repository transfer as "pending". It
 // doesn't actually transfer the repository until the user acks the transfer.
-func StartRepositoryTransfer(newOwnerName string, repo *Repository) error {
+func StartRepositoryTransfer(doer *User, newOwnerName string, repo *Repository) error {
 	// Make sure the repo isn't being transferred to someone currently
 	// Only one transfer process can be initiated at a time.
-	// It has to be cancelled for a new transfer to occur
-
-	n, err := x.Count(&RepoTransfer{
-		RepoID: repo.ID,
-		Status: Pending,
-	})
+	// It has to be cancelled for a new one to occur
+	n, err := x.Where("status = ? AND repo_id = ?", Pending, repo.ID).
+		Count(new(RepoTransfer))
 	if err != nil {
 		return err
 	}
@@ -121,25 +138,23 @@ func StartRepositoryTransfer(newOwnerName string, repo *Repository) error {
 		Status:      Pending,
 		CreatedUnix: util.TimeStampNow(),
 		UpdatedUnix: util.TimeStampNow(),
+		UserID:      doer.ID,
 	}
 
 	_, err = x.Insert(transfer)
 	return err
 }
 
-// TransferOwnership transfers all corresponding setting from old user to new one.
-func TransferOwnership(doer *User, newOwnerName string, repo *Repository) error {
-	newOwner, err := GetUserByName(newOwnerName)
-	if err != nil {
-		return fmt.Errorf("get new owner '%s': %v", newOwnerName, err)
-	}
+// TransferOwnership transfers all corresponding setting from one user to
+// another.
+func TransferOwnership(doer, newOwner *User, repo *Repository) error {
 
 	// Check if new owner has repository with same name.
 	has, err := IsRepositoryExist(newOwner, repo.Name)
 	if err != nil {
 		return fmt.Errorf("IsRepositoryExist: %v", err)
 	} else if has {
-		return ErrRepoAlreadyExist{newOwnerName, repo.Name}
+		return ErrRepoAlreadyExist{newOwner.Name, repo.Name}
 	}
 
 	sess := x.NewSession()
@@ -160,6 +175,10 @@ func TransferOwnership(doer *User, newOwnerName string, repo *Repository) error
 		return fmt.Errorf("update owner: %v", err)
 	}
 
+	if err := acceptRepositoryTransfer(repo); err != nil {
+		return err
+	}
+
 	// Remove redundant collaborators.
 	collaborators, err := repo.getCollaborators(sess)
 	if err != nil {

modules/context/repo.go

@@ -437,8 +437,8 @@ func RepoAssignment() macaron.Handler {
 		ctx.Data["PullRequestCtx"] = ctx.Repo.PullRequest
 
 		repoTransfer, err := models.GetPendingRepositoryTransfer(ctx.Repo.Repository)
-		if err == nil && repoTransfer != nil {
-			if err := repoTransfer.LoadRecipient(); err != nil {
+		if err == nil {
+			if err := repoTransfer.LoadAttributes(); err != nil {
 				ctx.ServerError("LoadRecipient", err)
 				return
 			}

options/locale/locale_en-US.ini

@@ -1047,6 +1047,7 @@ settings.transfer_desc = Transfer this repository to a user or to an organizatio
 settings.transfer_notices_1 = - You will lose access to the repository if you transfer it to an individual user.
 settings.transfer_notices_2 = - You will keep access to the repository if you transfer it to an organization that you (co-)own.
 settings.transfer_form_title = Enter the repository name as confirmation:
+settings.transfer.success = Repository transfer was successful.
 settings.wiki_delete = Delete Wiki Data
 settings.wiki_delete_desc = Deleting repository wiki data is permanent and cannot be undone.
 settings.wiki_delete_notices_1 = - This will permanently delete and disable the repository wiki for %s.

routers/repo/repo.go

@@ -291,15 +291,36 @@ func Action(ctx *context.Context) {
 		err = models.StarRepo(ctx.User.ID, ctx.Repo.Repository.ID, true)
 	case "unstar":
 		err = models.StarRepo(ctx.User.ID, ctx.Repo.Repository.ID, false)
-	case "desc": // FIXME: this is not used
-		if !ctx.Repo.IsOwner() {
-			ctx.Error(404)
+	case "acknowledge_transfer":
+		repoTransfer, err := models.GetPendingRepositoryTransfer(ctx.Repo.Repository)
+		if err != nil {
+			ctx.ServerError(fmt.Sprintf("Action (%s)", ctx.Params(":action")), err)
+		}
+
+		if repoTransfer.RecipientID != ctx.User.ID {
+			ctx.Status(404)
 			return
 		}
 
-		ctx.Repo.Repository.Description = ctx.Query("desc")
-		ctx.Repo.Repository.Website = ctx.Query("site")
-		err = models.UpdateRepository(ctx.Repo.Repository, false)
+		if err := repoTransfer.LoadAttributes(); err != nil {
+			ctx.ServerError(fmt.Sprintf("Action (%s)", ctx.Params(":action")), err)
+			return
+		}
+
+		if err := models.TransferOwnership(repoTransfer.User, repoTransfer.Recipient, ctx.Repo.Repository); err != nil {
+			ctx.ServerError(fmt.Sprintf("Action (%s)", ctx.Params(":action")), err)
+			return
+		}
+
+		repo, err := models.GetRepositoryByID(ctx.Repo.Repository.ID)
+		if err != nil {
+			ctx.ServerError(fmt.Sprintf("Action (%s)", ctx.Params(":action")), err)
+			return
+		}
+
+		ctx.Flash.Success(ctx.Tr("repo.settings.transfer.success"))
+		ctx.Redirect(repo.HTMLURL())
+		return
 	}
 
 	if err != nil {

routers/repo/repo_transfer.go

@@ -307,7 +307,7 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) {
 			return
 		}
 
-		if err = models.StartRepositoryTransfer(newOwner, repo); err != nil {
+		if err = models.StartRepositoryTransfer(ctx.User, newOwner, repo); err != nil {
 			if models.IsErrRepoAlreadyExist(err) {
 				ctx.RenderWithErr(ctx.Tr("repo.settings.new_owner_has_same_repo"), tplSettingsOptions, nil)
 			} else if models.IsErrRepoTransferInProgress(err) {
@@ -340,7 +340,7 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) {
 			return
 		}
 
-		if err := repoTransfer.LoadRecipient(); err != nil {
+		if err := repoTransfer.LoadAttributes(); err != nil {
 			ctx.ServerError("LoadRecipient", err)
 			return
 		}

routers/repo/setting.go

@@ -558,8 +558,6 @@ func RegisterRoutes(m *macaron.Macaron) {
 
 	m.Get("/:username/:reponame/action/:action", reqSignIn, context.RepoAssignment(), context.RepoMustNotBeArchived(), repo.Action)
 
-	m.Get("/:username/:reponame/transfer/acknowledge", reqSignIn, context.RepoAssignment(), repo.AcknowledgeTranfer)
-
 	m.Group("/:username/:reponame", func() {
 		m.Group("/issues", func() {
 			m.Combo("/new").Get(context.RepoRef(), repo.NewIssue).