ref: Update many variable names for *Calls to call.
In a previous change I renamed many types from *Context to *Call.
In this change I am trying to also update as many variable names
as can easily be changed. I have only altered variables whose
type was trivially determined.
MultiPart: 3/8
Change-Id: I0d71623921d14b42857d7d59140e9ad15c50da7f
diff --git a/services/identity/blesser/oauth.go b/services/identity/blesser/oauth.go
index 0af1ae1..52d4d39 100644
--- a/services/identity/blesser/oauth.go
+++ b/services/identity/blesser/oauth.go
@@ -58,18 +58,18 @@
})
}
-func (b *oauthBlesser) BlessUsingAccessToken(ctx ipc.ServerCall, accessToken string) (security.Blessings, string, error) {
+func (b *oauthBlesser) BlessUsingAccessToken(call ipc.ServerCall, accessToken string) (security.Blessings, string, error) {
var noblessings security.Blessings
email, clientName, err := b.oauthProvider.GetEmailAndClientName(accessToken, b.accessTokenClients)
if err != nil {
return noblessings, "", err
}
- return b.bless(ctx, email, clientName)
+ return b.bless(call, email, clientName)
}
-func (b *oauthBlesser) bless(ctx ipc.ServerCall, email, clientName string) (security.Blessings, string, error) {
+func (b *oauthBlesser) bless(call ipc.ServerCall, email, clientName string) (security.Blessings, string, error) {
var noblessings security.Blessings
- self := ctx.LocalPrincipal()
+ self := call.LocalPrincipal()
if self == nil {
return noblessings, "", fmt.Errorf("server error: no authentication happened")
}
@@ -93,7 +93,7 @@
// (say, via ACLs).
clientName,
}, security.ChainSeparator)
- blessing, err := self.Bless(ctx.RemoteBlessings().PublicKey(), ctx.LocalBlessings(), extension, caveat)
+ blessing, err := self.Bless(call.RemoteBlessings().PublicKey(), call.LocalBlessings(), extension, caveat)
if err != nil {
return noblessings, "", err
}
