| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The LUCI 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 under the Apache License, Version 2.0 |
| 3 // 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 |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 } |
| 56 | 56 |
| 57 func (u userImpl) Testable() gae_user.Testable { | 57 func (u userImpl) Testable() gae_user.Testable { |
| 58 return nil | 58 return nil |
| 59 } | 59 } |
| OLD | NEW |