on develop help sign in
Merge pull request #57 from CthulhuDen/fix-authorization
b0f7884Brendan Hay
gogol/src/Network/Google/Auth/ServiceAccount.hs+2−2
@@ -86,7 +86,7 @@ serviceAccountToken :: (MonadIO m, MonadCatch m, AllowScopes s)
86 -> m (OAuthToken s)
86 -> m (OAuthToken s)
87serviceAccountToken s p l m = do
87serviceAccountToken s p l m = do
88 b <- encodeBearerJWT s p
88 b <- encodeBearerJWT s p
89− let rq = accountsRequest
89+ let rq = tokenRequest
90 { Client.requestBody = RequestBodyBS $
90 { Client.requestBody = RequestBodyBS $
91 "grant_type=urn:ietf:params:oauth:grant-type:jwt-bearer"
91 "grant_type=urn:ietf:params:oauth:grant-type:jwt-bearer"
92 <> "&assertion="
92 <> "&assertion="
@@ -126,7 +126,7 @@ encodeBearerJWT s p = liftIO $ do
126 ]
126 ]
127
127
128 payload = base64Encode
128 payload = base64Encode
129− [ "aud" .= accountsURL
129+ [ "aud" .= tokenURL
130 , "scope" .= concatScopes (allowScopes p)
130 , "scope" .= concatScopes (allowScopes p)
131 , "iat" .= n
131 , "iat" .= n
132 , "exp" .= (n + seconds maxTokenLifetime)
132 , "exp" .= (n + seconds maxTokenLifetime)
gogol/src/Network/Google/Internal/Auth.hs+4
@@ -260,6 +260,10 @@ accountsRequest = Client.defaultRequest
260 ]
260 ]
261 }
261 }
262
262
263+-- | @https://www.googleapis.com/oauth2/v4/token@.
264+tokenURL :: Text
265+tokenURL = "https://www.googleapis.com/oauth2/v4/token"
266+
263tokenRequest :: Client.Request
267tokenRequest :: Client.Request
264tokenRequest = Client.defaultRequest
268tokenRequest = Client.defaultRequest
265 { Client.host = "www.googleapis.com"
269 { Client.host = "www.googleapis.com"