| OLD | NEW |
| 1 // Copyright 2015 The LUCI Authors. All rights reserved. | 1 // Copyright 2015 The LUCI Authors. All rights reserved. |
| 2 // Use of this source code is governed under the Apache License, Version 2.0 | 2 // Use of this source code is governed under the Apache License, Version 2.0 |
| 3 // that can be found in the LICENSE file. | 3 // that can be 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" |
| 11 ) | 11 ) |
| 12 | 12 |
| 13 // useUser adds a user service implementation to context, accessible | 13 // useUser adds a user service implementation to context, accessible |
| 14 // by "github.com/luci/gae/service/user".Get(c) | 14 // by "github.com/luci/gae/service/user".Raw(c) or the exported user service |
| 15 // methods. |
| 15 func useUser(c context.Context) context.Context { | 16 func useUser(c context.Context) context.Context { |
| 16 » return gae_user.SetFactory(c, func(ci context.Context) gae_user.Interfac
e { | 17 » return gae_user.SetFactory(c, func(ci context.Context) gae_user.RawInter
face { |
| 17 return userImpl{AEContext(ci)} | 18 return userImpl{AEContext(ci)} |
| 18 }) | 19 }) |
| 19 } | 20 } |
| 20 | 21 |
| 21 type userImpl struct { | 22 type userImpl struct { |
| 22 aeCtx context.Context | 23 aeCtx context.Context |
| 23 } | 24 } |
| 24 | 25 |
| 25 func (u userImpl) IsAdmin() bool { | 26 func (u userImpl) IsAdmin() bool { |
| 26 return user.IsAdmin(u.aeCtx) | 27 return user.IsAdmin(u.aeCtx) |
| (...skipping 20 matching lines...) Expand all Loading... |
| 47 if err != nil { | 48 if err != nil { |
| 48 return nil, err | 49 return nil, err |
| 49 } | 50 } |
| 50 return (*gae_user.User)(usr), nil | 51 return (*gae_user.User)(usr), nil |
| 51 } | 52 } |
| 52 | 53 |
| 53 func (u userImpl) OAuthConsumerKey() (string, error) { | 54 func (u userImpl) OAuthConsumerKey() (string, error) { |
| 54 return user.OAuthConsumerKey(u.aeCtx) | 55 return user.OAuthConsumerKey(u.aeCtx) |
| 55 } | 56 } |
| 56 | 57 |
| 57 func (u userImpl) Testable() gae_user.Testable { | 58 func (u userImpl) GetTestable() gae_user.Testable { |
| 58 return nil | 59 return nil |
| 59 } | 60 } |
| OLD | NEW |