OAuth2: add Yandex provider (go-gitea#8335) (go-gitea#10564)

* OAuth2: add Yandex provider (go-gitea#8335) * remove changes from locale ru-RU * fmt modules/auth/oauth2/oauth2.go Co-Authored-By: 6543 <[email protected]> * fix fmt * Update templates/admin/auth/new.tmpl * fix fmt Co-authored-by: Lunny Xiao <[email protected]> Co-authored-by: 6543 <[email protected]> Co-authored-by: guillep2k <[email protected]> Co-authored-by: techknowlogick <[email protected]> Co-authored-by: Lauris BH <[email protected]>
S7evinK · Mar 4, 2020 · 3d5d211 · 3d5d211
1 parent afa1e1a
commit 3d5d211
Show file tree

Hide file tree

Showing 8 changed files with 256 additions and 0 deletions.
diff --git a/models/oauth2.go b/models/oauth2.go
@@ -58,6 +58,7 @@ var OAuth2Providers = map[string]OAuth2Provider{
 			ProfileURL: oauth2.GetDefaultProfileURL("nextcloud"),
 		},
 	},
+	"yandex": {Name: "yandex", DisplayName: "Yandex", Image: "/img/auth/yandex.png"},
 }
 
 // OAuth2DefaultCustomURLMappings contains the map of default URL's for OAuth2 providers that are allowed to have custom urls

diff --git a/modules/auth/oauth2/oauth2.go b/modules/auth/oauth2/oauth2.go
@@ -25,6 +25,7 @@ import (
 	"github.com/markbates/goth/providers/nextcloud"
 	"github.com/markbates/goth/providers/openidConnect"
 	"github.com/markbates/goth/providers/twitter"
+	"github.com/markbates/goth/providers/yandex"
 	"github.com/satori/go.uuid"
 	"xorm.io/xorm"
 )
@@ -209,6 +210,9 @@ func createProvider(providerName, providerType, clientID, clientSecret, openIDCo
 			}
 		}
 		provider = nextcloud.NewCustomisedURL(clientID, clientSecret, callbackURL, authURL, tokenURL, profileURL)
+	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")
 	}
 
 	// always set the name if provider is created so we can support multiple setups of 1 provider

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
@@ -1937,6 +1937,7 @@ auths.tip.openid_connect = Use the OpenID Connect Discovery URL (<server>/.well-
 auths.tip.twitter = Go to https://dev.twitter.com/apps, create an application and ensure that the “Allow this application to be used to Sign in with Twitter” option is enabled
 auths.tip.discord = Register a new application on https://discordapp.com/developers/applications/me
 auths.tip.gitea = Register a new OAuth2 application. Guide can be found at https://docs.gitea.io/en-us/oauth2-provider/
+auths.tip.yandex = Create a new application at https://oauth.yandex.com/client/new. Select following permissions from the "Yandex.Passport API" section: "Access to email address", "Access to user avatar" and "Access to username, first name and surname, gender"
 auths.edit = Edit Authentication Source
 auths.activated = This Authentication Source is Activated
 auths.new_success = The authentication '%s' has been added.

diff --git a/public/img/auth/yandex.png b/public/img/auth/yandex.png
diff --git a/templates/admin/auth/new.tmpl b/templates/admin/auth/new.tmpl
@@ -117,6 +117,8 @@
 				<span>{{.i18n.Tr "admin.auths.tip.gitea"}}</span>
 				<li>Nextcloud</li>
 				<span>{{.i18n.Tr "admin.auths.tip.nextcloud"}}</span>
+				<li>Yandex</li>
+				<span>{{.i18n.Tr "admin.auths.tip.yandex"}}</span>
 			</div>
 		</div>
 	</div>

diff --git a/vendor/github.com/markbates/goth/providers/yandex/session.go b/vendor/github.com/markbates/goth/providers/yandex/session.go
diff --git a/vendor/github.com/markbates/goth/providers/yandex/yandex.go b/vendor/github.com/markbates/goth/providers/yandex/yandex.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -314,6 +314,7 @@ github.com/markbates/goth/providers/google
 github.com/markbates/goth/providers/nextcloud
 github.com/markbates/goth/providers/openidConnect
 github.com/markbates/goth/providers/twitter
+github.com/markbates/goth/providers/yandex
 # github.com/mattn/go-isatty v0.0.7
 github.com/mattn/go-isatty
 # github.com/mattn/go-sqlite3 v1.11.0
-Original file line number
+Diff line change
@@ Expand Up / @@ -58,6 +58,7 @@ var OAuth2Providers = map[string]OAuth2Provider{ @@
     			ProfileURL: oauth2.GetDefaultProfileURL("nextcloud"),
     		},
     	},
+    	"yandex": {Name: "yandex", DisplayName: "Yandex", Image: "/img/auth/yandex.png"},
     }
     // OAuth2DefaultCustomURLMappings contains the map of default URL's for OAuth2 providers that are allowed to have custom urls
@@ Expand Down @@