Merge pull request #64 from anatolym/add-yandex-oauth-provider

add Yandex OAuth provider #34

app/main.go

@@ -56,6 +56,8 @@ type Opts struct {
 	GithubCSEC   string `long:"github-csec" env:"REMARK_GITHUB_CSEC" description:"Github OAuth client secret"`
 	FacebookCID  string `long:"facebook-cid" env:"REMARK_FACEBOOK_CID" description:"Facebook OAuth client ID"`
 	FacebookCSEC string `long:"facebook-csec" env:"REMARK_FACEBOOK_CSEC" description:"Facebook OAuth client secret"`
+	YandexCID    string `long:"yandex-cid" env:"REMARK_YANDEX_CID" description:"Yandex OAuth client ID"`
+	YandexCSEC   string `long:"yandex-csec" env:"REMARK_YANDEX_CSEC" description:"Yandex OAuth client secret"`
 
 	Port    int    `long:"port" env:"REMARK_PORT" default:"8080" description:"port"`
 	WebRoot string `long:"web-root" env:"REMARK_WEB_ROOT" default:"./web" description:"web root directory"`
@@ -266,6 +268,9 @@ func makeAuthProviders(jwtService *auth.JWT, avatarProxy *proxy.Avatar, ds servi
 	if opts.FacebookCID != "" && opts.FacebookCSEC != "" {
 		providers = append(providers, auth.NewFacebook(makeParams(opts.FacebookCID, opts.FacebookCSEC)))
 	}
+	if opts.YandexCID != "" && opts.YandexCSEC != "" {
+		providers = append(providers, auth.NewYandex(makeParams(opts.YandexCID, opts.YandexCSEC)))
+	}
 	if len(providers) == 0 {
 		log.Printf("[WARN] no auth providers defined")
 	}

app/main_test.go

@@ -70,6 +70,7 @@ func prepApp(t *testing.T, port int, duration time.Duration) (*Application, cont
 	opts.GithubCSEC, opts.GithubCID = "csec", "cid"
 	opts.GoogleCSEC, opts.GoogleCID = "csec", "cid"
 	opts.FacebookCSEC, opts.FacebookCID = "csec", "cid"
+	opts.YandexCSEC, opts.YandexCID = "csec", "cid"
 	opts.Port = port
 
 	os.Remove(opts.BoltPath + "/remark.db")

app/rest/auth/providers.go

@@ -2,10 +2,12 @@ package auth
 
 import (
 	"encoding/json"
+	"fmt"
 
 	"golang.org/x/oauth2/facebook"
 	"golang.org/x/oauth2/github"
 	"golang.org/x/oauth2/google"
+	"golang.org/x/oauth2/yandex"
 
 	"github.com/umputun/remark/app/store"
 )
@@ -93,3 +95,32 @@ func NewFacebook(p Params) Provider {
 		},
 	})
 }
+
+// NewYandex makes yandex oauth2 provider
+func NewYandex(p Params) Provider {
+	return initProvider(p, Provider{
+		Name:        "yandex",
+		Endpoint:    yandex.Endpoint,
+		RedirectURL: p.RemarkURL + "/auth/yandex/callback",
+		Scopes:      []string{},
+		// See https://tech.yandex.com/passport/doc/dg/reference/response-docpage/
+		InfoURL: "https://login.yandex.ru/info?format=json",
+		MapUser: func(data userData, _ []byte) store.User {
+			userInfo := store.User{
+				ID:   "yandex_" + store.EncodeID(data.value("id")),
+				Name: data.value("display_name"), // using Display Name by default
+			}
+			if userInfo.Name == "" {
+				userInfo.Name = data.value("real_name") // using Real Name (== full name) if Display Name is empty
+			}
+			if userInfo.Name == "" {
+				userInfo.Name = data.value("login") // otherwise using login
+			}
+
+			if data.value("default_avatar_id") != "" {
+				userInfo.Picture = fmt.Sprintf("https://avatars.yandex.net/get-yapic/%s/islands-200", data.value("default_avatar_id"))
+			}
+			return userInfo
+		},
+	})
+}

app/rest/auth/providers_test.go

@@ -52,5 +52,32 @@ func TestProviders_NewFacebook(t *testing.T) {
 	user = r.MapUser(udata, []byte(`{"picture": {"data": {"url": "http://demo.remark42.com/blah.png"} }}`))
 	assert.Equal(t, store.User{Name: "facebook_6e34471", ID: "facebook_6e34471f84557e1713012d64a7477c71bfdac631",
 		Picture: "http://demo.remark42.com/blah.png", Admin: false, Blocked: false, IP: ""}, user, "got %+v", user)
+}
 
+func TestProviders_NewYandex(t *testing.T) {
+	r := NewYandex(Params{RemarkURL: "http://demo.remark42.com", Cid: "cid", Csecret: "cs"})
+	assert.Equal(t, "yandex", r.Name)
+
+	udata := userData{"id": "1234567890", "display_name": "Vasya P", "default_avatar_id": "131652443"}
+	user := r.MapUser(udata, nil)
+	assert.Equal(t, store.User{Name: "Vasya P", ID: "yandex_01b307acba4f54f55aafc33bb06bbbf6ca803e9a",
+		Picture: "https://avatars.yandex.net/get-yapic/131652443/islands-200", Admin: false, Blocked: false, IP: ""}, user, "got %+v", user)
+
+	// "display_name": null, "default_avatar_id": null
+	udata = userData{"id": "1234567890", "login": "vasya", "display_name": nil, "real_name": "Vasya Pupkin", "default_avatar_id": nil}
+	user = r.MapUser(udata, nil)
+	assert.Equal(t, store.User{Name: "Vasya Pupkin", ID: "yandex_01b307acba4f54f55aafc33bb06bbbf6ca803e9a",
+		Picture: "", Admin: false, Blocked: false, IP: ""}, user, "got %+v", user)
+
+	// empty "display_name", empty "default_avatar_id", empty "real_name"
+	udata = userData{"id": "1234567890", "login": "vasya", "display_name": "", "real_name": "", "default_avatar_id": ""}
+	user = r.MapUser(udata, nil)
+	assert.Equal(t, store.User{Name: "vasya", ID: "yandex_01b307acba4f54f55aafc33bb06bbbf6ca803e9a",
+		Picture: "", Admin: false, Blocked: false, IP: ""}, user, "got %+v", user)
+
+	// "real_name": null
+	udata = userData{"id": "1234567890", "login": "vasya", "real_name": nil, "default_avatar_id": ""}
+	user = r.MapUser(udata, nil)
+	assert.Equal(t, store.User{Name: "vasya", ID: "yandex_01b307acba4f54f55aafc33bb06bbbf6ca803e9a",
+		Picture: "", Admin: false, Blocked: false, IP: ""}, user, "got %+v", user)
 }