From 4f2db3cdf60fd9a37492228f4376f57ca1a97251 Mon Sep 17 00:00:00 2001
From: Dmitry Verkhoturov <paskal.07@gmail.com>
Date: Mon, 24 May 2021 20:44:22 +0200
Subject: [PATCH] cover all auth providers with tests, clean up env

---
 backend/app/cmd/server.go      | 13 ++++++++++++-
 backend/app/cmd/server_test.go | 13 +++++++++----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/backend/app/cmd/server.go b/backend/app/cmd/server.go
index e2aa45fb..a45eb1a6 100644
--- a/backend/app/cmd/server.go
+++ b/backend/app/cmd/server.go
@@ -271,7 +271,18 @@ type serverApp struct {
 // Execute is the entry point for "server" command, called by flag parser
 func (s *ServerCommand) Execute(_ []string) error {
 	log.Printf("[INFO] start server on port %s:%d", s.Address, s.Port)
-	resetEnv("SECRET", "AUTH_GOOGLE_CSEC", "AUTH_GITHUB_CSEC", "AUTH_FACEBOOK_CSEC", "AUTH_YANDEX_CSEC", "ADMIN_PASSWD")
+	resetEnv(
+		"SECRET",
+		"AUTH_GOOGLE_CSEC",
+		"AUTH_GITHUB_CSEC",
+		"AUTH_FACEBOOK_CSEC",
+		"AUTH_MICROSOFT_CSEC",
+		"AUTH_TWITTER_CSEC",
+		"AUTH_YANDEX_CSEC",
+		"TELEGRAM_TOKEN",
+		"SMTP_PASSWORD",
+		"ADMIN_PASSWD",
+	)
 
 	ctx, cancel := context.WithCancel(context.Background())
 	go func() { // catch signal and invoke graceful termination
diff --git a/backend/app/cmd/server_test.go b/backend/app/cmd/server_test.go
index 03ab0740..e0fa9552 100644
--- a/backend/app/cmd/server_test.go
+++ b/backend/app/cmd/server_test.go
@@ -77,8 +77,9 @@ func TestServerApp_DevMode(t *testing.T) {
 	go func() { _ = app.run(ctx) }()
 	waitForHTTPServerStart(port)
 
-	require.Equal(t, 5+1, len(app.restSrv.Authenticator.Providers()), "extra auth provider")
-	assert.Equal(t, "dev", app.restSrv.Authenticator.Providers()[4].Name(), "dev auth provider")
+	providers := app.restSrv.Authenticator.Providers()
+	require.Equal(t, 7+1, len(providers), "extra auth provider")
+	assert.Equal(t, "dev", providers[len(providers)-2].Name(), "dev auth provider")
 	// send ping
 	resp, err := http.Get(fmt.Sprintf("http://localhost:%d/api/v1/ping", port))
 	require.NoError(t, err)
@@ -103,8 +104,9 @@ func TestServerApp_AnonMode(t *testing.T) {
 	go func() { _ = app.run(ctx) }()
 	waitForHTTPServerStart(port)
 
-	require.Equal(t, 5+1, len(app.restSrv.Authenticator.Providers()), "extra auth provider for anon")
-	assert.Equal(t, "anonymous", app.restSrv.Authenticator.Providers()[5].Name(), "anon auth provider")
+	providers := app.restSrv.Authenticator.Providers()
+	require.Equal(t, 7+1, len(providers), "extra auth provider for anon")
+	assert.Equal(t, "anonymous", providers[len(providers)-1].Name(), "anon auth provider")
 
 	// send ping
 	resp, err := http.Get(fmt.Sprintf("http://localhost:%d/api/v1/ping", port))
@@ -662,6 +664,9 @@ func prepServerApp(t *testing.T, fn func(o ServerCommand) ServerCommand) (*serve
 	cmd.Auth.Google.CSEC, cmd.Auth.Google.CID = "csec", "cid"
 	cmd.Auth.Facebook.CSEC, cmd.Auth.Facebook.CID = "csec", "cid"
 	cmd.Auth.Yandex.CSEC, cmd.Auth.Yandex.CID = "csec", "cid"
+	cmd.Auth.Microsoft.CSEC, cmd.Auth.Microsoft.CID = "csec", "cid"
+	cmd.Auth.Twitter.CSEC, cmd.Auth.Twitter.CID = "csec", "cid"
+	cmd.Telegram.Token = "token"
 	cmd.Auth.Email.Enable = true
 	cmd.Auth.Email.MsgTemplate = "testdata/email.tmpl"
 	cmd.BackupLocation = "/tmp"