diff options
| author | 6543 <6543@obermui.de> | 2020-09-11 00:29:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-10 23:29:19 +0100 |
| commit | fd60ebfe14927657ff5cfa4e75f975eaadae65f1 (patch) | |
| tree | 38c3d70146920a13c228fed91bc1a55c9be72436 /routers/repo/migrate.go | |
| parent | daefdd1385d12bf0c8321f291dbb6ab242b41c99 (diff) | |
| download | gitea-fd60ebfe14927657ff5cfa4e75f975eaadae65f1.tar.gz gitea-fd60ebfe14927657ff5cfa4e75f975eaadae65f1.zip | |
[API] Migration: Change ServiceType String (#12672)
* use different structs for MigrateRepoOptions on UI and API
* Fix TokenAuth and rename UID to an understandable Name
* fix swagger doc
* simplify & mk redable
* R E F A C T O R:
migration has now internal 3 structs to store its options:
* the Options for WebUI: modules/auth/repo_form.go
* the Options for API: modules/structs/repo.go
* the option struct with after validation for internal prossessing: modules/migrations/base/options.go
* Copyright Header
* Deprecate UID - add RepoOwner
* adopt repo.go -> migrate.go
* add comment about each struct purpose
* lint
Diffstat (limited to 'routers/repo/migrate.go')
| -rw-r--r-- | routers/repo/migrate.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/routers/repo/migrate.go b/routers/repo/migrate.go index 497f2ce36f..34060aabde 100644 --- a/routers/repo/migrate.go +++ b/routers/repo/migrate.go @@ -74,7 +74,7 @@ func handleMigrateError(ctx *context.Context, owner *models.User, err error, nam ctx.Data["Err_RepoName"] = true ctx.RenderWithErr(ctx.Tr("repo.form.name_pattern_not_allowed", err.(models.ErrNamePatternNotAllowed).Pattern), tpl, form) default: - remoteAddr, _ := form.ParseRemoteAddr(owner) + remoteAddr, _ := auth.ParseRemoteAddr(form.CloneAddr, form.AuthUsername, form.AuthPassword, owner) err = util.URLSanitizedError(err, remoteAddr) if strings.Contains(err.Error(), "Authentication failed") || strings.Contains(err.Error(), "Bad credentials") || @@ -108,7 +108,7 @@ func MigratePost(ctx *context.Context, form auth.MigrateRepoForm) { return } - remoteAddr, err := form.ParseRemoteAddr(ctx.User) + remoteAddr, err := auth.ParseRemoteAddr(form.CloneAddr, form.AuthUsername, form.AuthPassword, ctx.User) if err != nil { if models.IsErrInvalidCloneAddr(err) { ctx.Data["Err_CloneAddr"] = true |