| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 package prod | 5 package prod |
| 6 | 6 |
| 7 import ( | 7 import ( |
| 8 gae_user "github.com/luci/gae/service/user" | 8 gae_user "github.com/luci/gae/service/user" |
| 9 "golang.org/x/net/context" | 9 "golang.org/x/net/context" |
| 10 "google.golang.org/appengine/user" | 10 "google.golang.org/appengine/user" |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 } | 35 } |
| 36 | 36 |
| 37 func (u userImpl) LogoutURL(dest string) (string, error) { | 37 func (u userImpl) LogoutURL(dest string) (string, error) { |
| 38 return user.LogoutURL(u.aeCtx, dest) | 38 return user.LogoutURL(u.aeCtx, dest) |
| 39 } | 39 } |
| 40 | 40 |
| 41 func (u userImpl) Current() *gae_user.User { | 41 func (u userImpl) Current() *gae_user.User { |
| 42 return (*gae_user.User)(user.Current(u.aeCtx)) | 42 return (*gae_user.User)(user.Current(u.aeCtx)) |
| 43 } | 43 } |
| 44 | 44 |
| 45 func (u userImpl) CurrentOAuth() (*gae_user.User, error) { | 45 func (u userImpl) CurrentOAuth(scopes ...string) (*gae_user.User, error) { |
| 46 » usr, err := user.CurrentOAuth(u.aeCtx) | 46 » usr, err := user.CurrentOAuth(u.aeCtx, scopes...) |
| 47 if err != nil { | 47 if err != nil { |
| 48 return nil, err | 48 return nil, err |
| 49 } | 49 } |
| 50 return (*gae_user.User)(usr), nil | 50 return (*gae_user.User)(usr), nil |
| 51 } | 51 } |
| 52 | 52 |
| 53 func (u userImpl) OAuthConsumerKey() (string, error) { | 53 func (u userImpl) OAuthConsumerKey() (string, error) { |
| 54 return user.OAuthConsumerKey(u.aeCtx) | 54 return user.OAuthConsumerKey(u.aeCtx) |
| 55 } | 55 } |
| OLD | NEW |