git.iko.soy/gogol
on develop help sign in
fix obtaining access token
commit00c74f1a42cc631de9acd6621418a2f77b710848 authorCthulhu <cthulhu.den@gmail.com> dateFri 10 Feb 2017, 02:55 (10 years ago) parent2f3320d
2 files changed+6−2
compare with develop
unifiedsplit
gogol/src/Network/Google/Auth/ServiceAccount.hs+2−2 gogol/src/Network/Google/Internal/Auth.hs+4
gogol/src/Network/Google/Auth/ServiceAccount.hs+2−2
@@ -86,7 +86,7 @@ serviceAccountToken :: (MonadIO m, MonadCatch m, AllowScopes s)
8686 -> m (OAuthToken s)
8787serviceAccountToken s p l m = do
8888 b <- encodeBearerJWT s p
89− let rq = accountsRequest
89+ let rq = tokenRequest
9090 { Client.requestBody = RequestBodyBS $
9191 "grant_type=urn:ietf:params:oauth:grant-type:jwt-bearer"
9292 <> "&assertion="
@@ -126,7 +126,7 @@ encodeBearerJWT s p = liftIO $ do
126126 ]
127127
128128 payload = base64Encode
129− [ "aud" .= accountsURL
129+ [ "aud" .= tokenURL
130130 , "scope" .= concatScopes (allowScopes p)
131131 , "iat" .= n
132132 , "exp" .= (n + seconds maxTokenLifetime)
gogol/src/Network/Google/Internal/Auth.hs+4
@@ -260,6 +260,10 @@ accountsRequest = Client.defaultRequest
260260 ]
261261 }
262262
263+-- | @https://www.googleapis.com/oauth2/v4/token@.
264+tokenURL :: Text
265+tokenURL = "https://www.googleapis.com/oauth2/v4/token"
266+
263267tokenRequest :: Client.Request
264268tokenRequest = Client.defaultRequest
265269 { Client.host = "www.googleapis.com"