auth: Refactor how authentication methods are passed to server/auth library.

server/auth/auth_test.go

 // Copyright 2015 The LUCI Authors. All rights reserved.
 // Use of this source code is governed under the Apache License, Version 2.0
 // that can be found in the LICENSE file.
 
 package auth
 
 import (
         "errors"
         "net"
         "net/http"
@@ skipping 10 matching lines @@
 
         . "github.com/luci/luci-go/common/testing/assertions"
         . "github.com/smartystreets/goconvey/convey"
 )
 
 func TestAuthenticate(t *testing.T) {
         t.Parallel()
 
         Convey("IsAllowedOAuthClientID on default DB", t, func() {
                 c := context.Background()
-                auth := Authenticator{fakeOAuthMethod{clientID: "some_client_id"}}
+                auth := Authenticator{
+                        Methods: []Method{fakeOAuthMethod{clientID: "some_client_id"}},
+                }
                 _, err := auth.Authenticate(c, makeRequest())
                 So(err, ShouldErrLike, "the library is not properly configured")
         })
 
         Convey("IsAllowedOAuthClientID with valid client_id", t, func() {
                 c := injectTestDB(context.Background(), &fakeDB{
                         allowedClientID: "some_client_id",
                 })
-                auth := Authenticator{fakeOAuthMethod{clientID: "some_client_id"}}
+                auth := Authenticator{
+                        Methods: []Method{fakeOAuthMethod{clientID: "some_client_id"}},
+                }
                 _, err := auth.Authenticate(c, makeRequest())
                 So(err, ShouldBeNil)
         })
 
         Convey("IsAllowedOAuthClientID with invalid client_id", t, func() {
                 c := injectTestDB(context.Background(), &fakeDB{
                         allowedClientID: "some_client_id",
                 })
-                auth := Authenticator{fakeOAuthMethod{clientID: "another_client_id"}}
+                auth := Authenticator{
+                        Methods: []Method{fakeOAuthMethod{clientID: "another_client_id"}},
+                }
                 _, err := auth.Authenticate(c, makeRequest())
                 So(err, ShouldEqual, ErrBadClientID)
         })
 
         Convey("IP whitelist restriction works", t, func() {
                 db, err := authdb.NewSnapshotDB(&protocol.AuthDB{
                         IpWhitelistAssignments: []*protocol.AuthIPWhitelistAssignment{
                                 {
                                         Identity:    strPtr("user:abc@example.com"),
                                         IpWhitelist: strPtr("whitelist"),
                                 },
                         },
                         IpWhitelists: []*protocol.AuthIPWhitelist{
                                 {
                                         Name: strPtr("whitelist"),
                                         Subnets: []string{
                                                 "1.2.3.4/32",
                                         },
                                 },
                         },
                 }, "http://auth-service", 1234)
                 So(err, ShouldBeNil)
 
                 c := injectTestDB(context.Background(), db)
 
                 Convey("User is using IP whitelist and IP is in the whitelist.", func() {
-                        auth := Authenticator{fakeOAuthMethod{email: "abc@example.com"}}
+                        auth := Authenticator{
+                                Methods: []Method{fakeOAuthMethod{email: "abc@example.com"}},
+                        }
                         req := makeRequest()
                         req.RemoteAddr = "1.2.3.4"
                         c, err := auth.Authenticate(c, req)
                         So(err, ShouldBeNil)
                         So(CurrentIdentity(c), ShouldEqual, identity.Identity("user:abc@example.com"))
                 })
 
                 Convey("User is using IP whitelist and IP is NOT in the whitelist.", func() {
-                        auth := Authenticator{fakeOAuthMethod{email: "abc@example.com"}}
+                        auth := Authenticator{
+                                Methods: []Method{fakeOAuthMethod{email: "abc@example.com"}},
+                        }
                         req := makeRequest()
                         req.RemoteAddr = "1.2.3.5"
                         _, err := auth.Authenticate(c, req)
                         So(err, ShouldEqual, ErrIPNotWhitelisted)
                 })
 
                 Convey("User is not using IP whitelist.", func() {
-                        auth := Authenticator{fakeOAuthMethod{email: "def@example.com"}}
+                        auth := Authenticator{
+                                Methods: []Method{fakeOAuthMethod{email: "def@example.com"}},
+                        }
                         req := makeRequest()
                         req.RemoteAddr = "1.2.3.5"
                         c, err := auth.Authenticate(c, req)
                         So(err, ShouldBeNil)
                         So(CurrentIdentity(c), ShouldEqual, identity.Identity("user:def@example.com"))
                 })
         })
 }
 
 ///
@@ skipping 72 matching lines @@
         }
         return db.authServiceURL, nil
 }
 
 func (db *fakeDB) GetTokenServiceURL(c context.Context) (string, error) {
         if db.tokenServiceURL == "" {
                 return "", errors.New("fakeDB: GetTokenServiceURL is not configured")
         }
         return db.tokenServiceURL, nil
 }