Skip to content

Fix Forgejo clone authentication and SSH URL support #204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rdowavic wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix Forgejo clone authentication and SSH URL support #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ func newForgejoClient(gitHostURLParsed *url.URL) *forgejo.Client {
url = gitHostURLParsed.String()
}

gitHostToken = forgejoToken
log.Println("Creating forgejo client", url)
client, err := forgejo.NewClient(url, forgejo.SetToken(forgejoToken), forgejo.SetForgejoVersion(""))
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion forgejo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ func paginateForgejoRepositories(fetch func(page int) ([]*forgejo.Repository, *f

for _, repo := range results {
repositories = append(repositories, &Repository{
CloneURL: repo.CloneURL,
CloneURL: getCloneURL(repo.CloneURL, repo.SSHURL),
Name: repo.Name,
Namespace: repo.Owner.UserName,
Private: repo.Private,
Expand Down
9 changes: 9 additions & 0 deletions helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"log"

forgejo "codeberg.org/mvdkleijn/forgejo-sdk/forgejo/v2"
"github.com/google/go-github/v34/github"
"github.com/ktrysmt/go-bitbucket"
gitlab "github.com/xanzy/go-gitlab"
Expand Down Expand Up @@ -41,6 +42,14 @@ func getUsername(client interface{}, service string) string {
return user.Username
}

if service == "forgejo" {
user, _, err := client.(*forgejo.Client).GetMyUserInfo()
if err != nil {
log.Fatal("Error retrieving username", err.Error())
}
return user.UserName
}

return ""
}

Expand Down
4 changes: 2 additions & 2 deletions repositories_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ func TestGetForgejoRepositories(t *testing.T) {
defer teardownRepositoryTests()

mux.HandleFunc("/api/v1/user/repos", func(w http.ResponseWriter, r *http.Request) {
fmt.Fprint(w, `[{"clone_url":"git@codeberg.org:abc/def.git","name":"def","owner":{"login":"abc"},"private":true}]`)
fmt.Fprint(w, `[{"clone_url":"https://codeberg.org/abc/def.git","ssh_url":"git@codeberg.org:abc/def.git","name":"def","owner":{"login":"abc"},"private":true}]`)
})

repos, err := getRepositories(ForgejoClient, "forgejo", "", []string{}, "", "", false, "")
Expand All @@ -285,7 +285,7 @@ func TestGetForgejoStarredRepositories(t *testing.T) {
})

mux.HandleFunc("/api/v1/repos/search", func(w http.ResponseWriter, r *http.Request) {
fmt.Fprint(w, `{"data":[{"clone_url":"git@codeberg.org:abc/def.git","name":"def","owner":{"login":"abc"},"private":true}]}`)
fmt.Fprint(w, `{"data":[{"clone_url":"https://codeberg.org/abc/def.git","ssh_url":"git@codeberg.org:abc/def.git","name":"def","owner":{"login":"abc"},"private":true}]}`)
})

repos, err := getRepositories(ForgejoClient, "forgejo", "", []string{}, "", "", false, "starred")
Expand Down
Loading