don't use user for token on gogs

cooperspencer · Sep 2, 2024 · c68a3ae · c68a3ae
1 parent d346b1d
commit c68a3ae
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/gogs/gogs.go b/gogs/gogs.go
@@ -197,6 +197,7 @@ func Get(conf *types.Conf) ([]types.Repo, bool) {
 					Description:   r.Description,
 					Private:       r.Private,
 					Issues:        GetIssues(r, client, repo),
+					NoTokenUser:   true,
 				})
 				if repo.Wiki {
 					repos = append(repos, types.Repo{
@@ -210,6 +211,7 @@ func Get(conf *types.Conf) ([]types.Repo, bool) {
 						Hoster:        types.GetHost(repo.URL),
 						Description:   r.Description,
 						Private:       r.Private,
+						NoTokenUser:   true,
 					})
 				}
 
@@ -233,6 +235,7 @@ func Get(conf *types.Conf) ([]types.Repo, bool) {
 					Description:   r.Description,
 					Private:       r.Private,
 					Issues:        GetIssues(r, client, repo),
+					NoTokenUser:   true,
 				})
 				if repo.Wiki {
 					repos = append(repos, types.Repo{
@@ -246,6 +249,7 @@ func Get(conf *types.Conf) ([]types.Repo, bool) {
 						Hoster:        types.GetHost(repo.URL),
 						Description:   r.Description,
 						Private:       r.Private,
+						NoTokenUser:   true,
 					})
 				}
 			}
@@ -324,6 +328,7 @@ func Get(conf *types.Conf) ([]types.Repo, bool) {
 					Description:   r.Description,
 					Private:       r.Private,
 					Issues:        GetIssues(r, client, repo),
+					NoTokenUser:   true,
 				})
 				if repo.Wiki {
 					repos = append(repos, types.Repo{
@@ -337,6 +342,7 @@ func Get(conf *types.Conf) ([]types.Repo, bool) {
 						Hoster:        types.GetHost(repo.URL),
 						Description:   r.Description,
 						Private:       r.Private,
+						NoTokenUser:   true,
 					})
 				}
 
@@ -360,6 +366,7 @@ func Get(conf *types.Conf) ([]types.Repo, bool) {
 					Description:   r.Description,
 					Private:       r.Private,
 					Issues:        GetIssues(r, client, repo),
+					NoTokenUser:   true,
 				})
 
 				if repo.Wiki {
@@ -374,6 +381,7 @@ func Get(conf *types.Conf) ([]types.Repo, bool) {
 						Hoster:        types.GetHost(repo.URL),
 						Description:   r.Description,
 						Private:       r.Private,
+						NoTokenUser:   true,
 					})
 				}
 			}

diff --git a/local/local.go b/local/local.go
@@ -93,9 +93,15 @@ func Locally(repo types.Repo, l types.Local, dry bool) bool {
 			return false
 		}
 	case repo.Token != "":
-		auth = &http.BasicAuth{
-			Username: "xyz",
-			Password: repo.Token,
+		if repo.NoTokenUser {
+			auth = &http.BasicAuth{
+				Username: repo.Token,
+			}
+		} else {
+			auth = &http.BasicAuth{
+				Username: "xyz",
+				Password: repo.Token,
+			}
 		}
 	case repo.Origin.Username != "" && repo.Origin.Password != "":
 		auth = &http.BasicAuth{

diff --git a/types/types.go b/types/types.go
@@ -396,6 +396,7 @@ type Repo struct {
 	Description   string
 	Issues        map[string]interface{}
 	Private       bool
+	NoTokenUser   bool
 }
 
 // Site TODO.