From 7974b3418350c180df70111da611047f09122fa9 Mon Sep 17 00:00:00 2001 From: Divyam Bhasin Date: Sun, 25 Oct 2020 14:21:49 -0400 Subject: #12897 - add mastodon provider (#13293) * added mastodon provider to oauth code * changed go.mod and vendor/modules.txt to add updated goth * vendored mastodon and new goth * committing result of go mod tidy && go mod vendor * added pic and mastodon to oauth models * handled instance url * applied lafriks suggestion * Update web_src/js/index.js Co-authored-by: techknowlogick Co-authored-by: techknowlogick Co-authored-by: Lauris BH Co-authored-by: techknowlogick --- modules/auth/oauth2/oauth2.go | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'modules') diff --git a/modules/auth/oauth2/oauth2.go b/modules/auth/oauth2/oauth2.go index 2c982e1dca..f69bc61d75 100644 --- a/modules/auth/oauth2/oauth2.go +++ b/modules/auth/oauth2/oauth2.go @@ -23,6 +23,7 @@ import ( "github.com/markbates/goth/providers/github" "github.com/markbates/goth/providers/gitlab" "github.com/markbates/goth/providers/google" + "github.com/markbates/goth/providers/mastodon" "github.com/markbates/goth/providers/nextcloud" "github.com/markbates/goth/providers/openidConnect" "github.com/markbates/goth/providers/twitter" @@ -213,6 +214,12 @@ func createProvider(providerName, providerType, clientID, clientSecret, openIDCo case "yandex": // See https://tech.yandex.com/passport/doc/dg/reference/response-docpage/ provider = yandex.New(clientID, clientSecret, callbackURL, "login:email", "login:info", "login:avatar") + case "mastodon": + instanceURL := mastodon.InstanceURL + if customURLMapping != nil && len(customURLMapping.AuthURL) > 0 { + instanceURL = customURLMapping.AuthURL + } + provider = mastodon.NewCustomisedURL(clientID, clientSecret, callbackURL, instanceURL) } // always set the name if provider is created so we can support multiple setups of 1 provider @@ -249,6 +256,8 @@ func GetDefaultAuthURL(provider string) string { return gitea.AuthURL case "nextcloud": return nextcloud.AuthURL + case "mastodon": + return mastodon.InstanceURL } return "" } -- cgit v1.2.3