diff options
author | Christopher Speller <crspeller@gmail.com> | 2018-04-16 05:37:14 -0700 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2018-04-16 08:37:14 -0400 |
commit | 6e2cb00008cbf09e556b00f87603797fcaa47e09 (patch) | |
tree | 3c0eb55ff4226a3f024aad373140d1fb860a6404 /vendor/google.golang.org/appengine/user | |
parent | bf24f51c4e1cc6286885460672f7f449e8c6f5ef (diff) | |
download | chat-6e2cb00008cbf09e556b00f87603797fcaa47e09.tar.gz chat-6e2cb00008cbf09e556b00f87603797fcaa47e09.tar.bz2 chat-6e2cb00008cbf09e556b00f87603797fcaa47e09.zip |
Depenancy upgrades and movign to dep. (#8630)
Diffstat (limited to 'vendor/google.golang.org/appengine/user')
-rw-r--r-- | vendor/google.golang.org/appengine/user/oauth.go | 52 | ||||
-rw-r--r-- | vendor/google.golang.org/appengine/user/user.go | 84 | ||||
-rw-r--r-- | vendor/google.golang.org/appengine/user/user_classic.go | 44 | ||||
-rw-r--r-- | vendor/google.golang.org/appengine/user/user_test.go | 99 | ||||
-rw-r--r-- | vendor/google.golang.org/appengine/user/user_vm.go | 38 |
5 files changed, 0 insertions, 317 deletions
diff --git a/vendor/google.golang.org/appengine/user/oauth.go b/vendor/google.golang.org/appengine/user/oauth.go deleted file mode 100644 index ffad57182..000000000 --- a/vendor/google.golang.org/appengine/user/oauth.go +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright 2012 Google Inc. All rights reserved. -// Use of this source code is governed by the Apache 2.0 -// license that can be found in the LICENSE file. - -package user - -import ( - "golang.org/x/net/context" - - "google.golang.org/appengine/internal" - pb "google.golang.org/appengine/internal/user" -) - -// CurrentOAuth returns the user associated with the OAuth consumer making this -// request. If the OAuth consumer did not make a valid OAuth request, or the -// scopes is non-empty and the current user does not have at least one of the -// scopes, this method will return an error. -func CurrentOAuth(c context.Context, scopes ...string) (*User, error) { - req := &pb.GetOAuthUserRequest{} - if len(scopes) != 1 || scopes[0] != "" { - // The signature for this function used to be CurrentOAuth(Context, string). - // Ignore the singular "" scope to preserve existing behavior. - req.Scopes = scopes - } - - res := &pb.GetOAuthUserResponse{} - - err := internal.Call(c, "user", "GetOAuthUser", req, res) - if err != nil { - return nil, err - } - return &User{ - Email: *res.Email, - AuthDomain: *res.AuthDomain, - Admin: res.GetIsAdmin(), - ID: *res.UserId, - ClientID: res.GetClientId(), - }, nil -} - -// OAuthConsumerKey returns the OAuth consumer key provided with the current -// request. This method will return an error if the OAuth request was invalid. -func OAuthConsumerKey(c context.Context) (string, error) { - req := &pb.CheckOAuthSignatureRequest{} - res := &pb.CheckOAuthSignatureResponse{} - - err := internal.Call(c, "user", "CheckOAuthSignature", req, res) - if err != nil { - return "", err - } - return *res.OauthConsumerKey, err -} diff --git a/vendor/google.golang.org/appengine/user/user.go b/vendor/google.golang.org/appengine/user/user.go deleted file mode 100644 index eb76f59b7..000000000 --- a/vendor/google.golang.org/appengine/user/user.go +++ /dev/null @@ -1,84 +0,0 @@ -// Copyright 2011 Google Inc. All rights reserved. -// Use of this source code is governed by the Apache 2.0 -// license that can be found in the LICENSE file. - -// Package user provides a client for App Engine's user authentication service. -package user // import "google.golang.org/appengine/user" - -import ( - "strings" - - "github.com/golang/protobuf/proto" - "golang.org/x/net/context" - - "google.golang.org/appengine/internal" - pb "google.golang.org/appengine/internal/user" -) - -// User represents a user of the application. -type User struct { - Email string - AuthDomain string - Admin bool - - // ID is the unique permanent ID of the user. - // It is populated if the Email is associated - // with a Google account, or empty otherwise. - ID string - - // ClientID is the ID of the pre-registered client so its identity can be verified. - // See https://developers.google.com/console/help/#generatingoauth2 for more information. - ClientID string - - FederatedIdentity string - FederatedProvider string -} - -// String returns a displayable name for the user. -func (u *User) String() string { - if u.AuthDomain != "" && strings.HasSuffix(u.Email, "@"+u.AuthDomain) { - return u.Email[:len(u.Email)-len("@"+u.AuthDomain)] - } - if u.FederatedIdentity != "" { - return u.FederatedIdentity - } - return u.Email -} - -// LoginURL returns a URL that, when visited, prompts the user to sign in, -// then redirects the user to the URL specified by dest. -func LoginURL(c context.Context, dest string) (string, error) { - return LoginURLFederated(c, dest, "") -} - -// LoginURLFederated is like LoginURL but accepts a user's OpenID identifier. -func LoginURLFederated(c context.Context, dest, identity string) (string, error) { - req := &pb.CreateLoginURLRequest{ - DestinationUrl: proto.String(dest), - } - if identity != "" { - req.FederatedIdentity = proto.String(identity) - } - res := &pb.CreateLoginURLResponse{} - if err := internal.Call(c, "user", "CreateLoginURL", req, res); err != nil { - return "", err - } - return *res.LoginUrl, nil -} - -// LogoutURL returns a URL that, when visited, signs the user out, -// then redirects the user to the URL specified by dest. -func LogoutURL(c context.Context, dest string) (string, error) { - req := &pb.CreateLogoutURLRequest{ - DestinationUrl: proto.String(dest), - } - res := &pb.CreateLogoutURLResponse{} - if err := internal.Call(c, "user", "CreateLogoutURL", req, res); err != nil { - return "", err - } - return *res.LogoutUrl, nil -} - -func init() { - internal.RegisterErrorCodeMap("user", pb.UserServiceError_ErrorCode_name) -} diff --git a/vendor/google.golang.org/appengine/user/user_classic.go b/vendor/google.golang.org/appengine/user/user_classic.go deleted file mode 100644 index 81315094c..000000000 --- a/vendor/google.golang.org/appengine/user/user_classic.go +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright 2015 Google Inc. All rights reserved. -// Use of this source code is governed by the Apache 2.0 -// license that can be found in the LICENSE file. - -// +build appengine - -package user - -import ( - "appengine/user" - - "golang.org/x/net/context" - - "google.golang.org/appengine/internal" -) - -func Current(ctx context.Context) *User { - c, err := internal.ClassicContextFromContext(ctx) - if err != nil { - panic(err) - } - u := user.Current(c) - if u == nil { - return nil - } - // Map appengine/user.User to this package's User type. - return &User{ - Email: u.Email, - AuthDomain: u.AuthDomain, - Admin: u.Admin, - ID: u.ID, - FederatedIdentity: u.FederatedIdentity, - FederatedProvider: u.FederatedProvider, - } -} - -func IsAdmin(ctx context.Context) bool { - c, err := internal.ClassicContextFromContext(ctx) - if err != nil { - panic(err) - } - - return user.IsAdmin(c) -} diff --git a/vendor/google.golang.org/appengine/user/user_test.go b/vendor/google.golang.org/appengine/user/user_test.go deleted file mode 100644 index 5fc5957a8..000000000 --- a/vendor/google.golang.org/appengine/user/user_test.go +++ /dev/null @@ -1,99 +0,0 @@ -// Copyright 2011 Google Inc. All rights reserved. -// Use of this source code is governed by the Apache 2.0 -// license that can be found in the LICENSE file. - -// +build !appengine - -package user - -import ( - "fmt" - "net/http" - "testing" - - "github.com/golang/protobuf/proto" - - "google.golang.org/appengine/internal" - "google.golang.org/appengine/internal/aetesting" - pb "google.golang.org/appengine/internal/user" -) - -func baseReq() *http.Request { - return &http.Request{ - Header: http.Header{}, - } -} - -type basicUserTest struct { - nickname, email, authDomain, admin string - // expectations - isNil, isAdmin bool - displayName string -} - -var basicUserTests = []basicUserTest{ - {"", "", "", "0", true, false, ""}, - {"ken", "ken@example.com", "example.com", "0", false, false, "ken"}, - {"ken", "ken@example.com", "auth_domain.com", "1", false, true, "ken@example.com"}, -} - -func TestBasicUserAPI(t *testing.T) { - for i, tc := range basicUserTests { - req := baseReq() - req.Header.Set("X-AppEngine-User-Nickname", tc.nickname) - req.Header.Set("X-AppEngine-User-Email", tc.email) - req.Header.Set("X-AppEngine-Auth-Domain", tc.authDomain) - req.Header.Set("X-AppEngine-User-Is-Admin", tc.admin) - - c := internal.ContextForTesting(req) - - if ga := IsAdmin(c); ga != tc.isAdmin { - t.Errorf("test %d: expected IsAdmin(c) = %v, got %v", i, tc.isAdmin, ga) - } - - u := Current(c) - if tc.isNil { - if u != nil { - t.Errorf("test %d: expected u == nil, got %+v", i, u) - } - continue - } - if u == nil { - t.Errorf("test %d: expected u != nil, got nil", i) - continue - } - if u.Email != tc.email { - t.Errorf("test %d: expected u.Email = %q, got %q", i, tc.email, u.Email) - } - if gs := u.String(); gs != tc.displayName { - t.Errorf("test %d: expected u.String() = %q, got %q", i, tc.displayName, gs) - } - if u.Admin != tc.isAdmin { - t.Errorf("test %d: expected u.Admin = %v, got %v", i, tc.isAdmin, u.Admin) - } - } -} - -func TestLoginURL(t *testing.T) { - expectedQuery := &pb.CreateLoginURLRequest{ - DestinationUrl: proto.String("/destination"), - } - const expectedDest = "/redir/dest" - c := aetesting.FakeSingleContext(t, "user", "CreateLoginURL", func(req *pb.CreateLoginURLRequest, res *pb.CreateLoginURLResponse) error { - if !proto.Equal(req, expectedQuery) { - return fmt.Errorf("got %v, want %v", req, expectedQuery) - } - res.LoginUrl = proto.String(expectedDest) - return nil - }) - - url, err := LoginURL(c, "/destination") - if err != nil { - t.Fatalf("LoginURL failed: %v", err) - } - if url != expectedDest { - t.Errorf("got %v, want %v", url, expectedDest) - } -} - -// TODO(dsymonds): Add test for LogoutURL. diff --git a/vendor/google.golang.org/appengine/user/user_vm.go b/vendor/google.golang.org/appengine/user/user_vm.go deleted file mode 100644 index 8dc672e92..000000000 --- a/vendor/google.golang.org/appengine/user/user_vm.go +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright 2014 Google Inc. All rights reserved. -// Use of this source code is governed by the Apache 2.0 -// license that can be found in the LICENSE file. - -// +build !appengine - -package user - -import ( - "golang.org/x/net/context" - - "google.golang.org/appengine/internal" -) - -// Current returns the currently logged-in user, -// or nil if the user is not signed in. -func Current(c context.Context) *User { - h := internal.IncomingHeaders(c) - u := &User{ - Email: h.Get("X-AppEngine-User-Email"), - AuthDomain: h.Get("X-AppEngine-Auth-Domain"), - ID: h.Get("X-AppEngine-User-Id"), - Admin: h.Get("X-AppEngine-User-Is-Admin") == "1", - FederatedIdentity: h.Get("X-AppEngine-Federated-Identity"), - FederatedProvider: h.Get("X-AppEngine-Federated-Provider"), - } - if u.Email == "" && u.FederatedIdentity == "" { - return nil - } - return u -} - -// IsAdmin returns true if the current user is signed in and -// is currently registered as an administrator of the application. -func IsAdmin(c context.Context) bool { - h := internal.IncomingHeaders(c) - return h.Get("X-AppEngine-User-Is-Admin") == "1" -} |