@@ -39,6 +39,7 @@ module Network.Google.Auth
3939 , Store
4040 , initStore
4141 , retrieveAuthFromStore
42+ , retrieveTokenFromStore
4243
4344 , Auth (..)
4445 , authToAuthorizedUser
@@ -131,19 +132,22 @@ initStore :: (MonadIO m, MonadCatch m, AllowScopes s)
131132initStore c l m = exchange c l m >>= fmap Store . liftIO . newMVar
132133
133134-- | Retrieve auth from storage
134−retrieveAuthFromStore :: (MonadIO m, MonadCatch m, AllowScopes s)
135− => Store s
136− -> m (Auth s)
137−retrieveAuthFromStore (Store s) = liftIO (readMVar s)
135+retrieveAuthFromStore
136+ :: (MonadIO m, AllowScopes s)
137+ => Store s
138+ -> m (Auth s)
139+retrieveAuthFromStore (Store s) =
140+ liftIO (readMVar s)
138141
139142-- | Concurrently read the current token, and if expired, then
140143-- safely perform a single serial refresh.
141−getToken :: (MonadIO m, MonadCatch m, AllowScopes s)
142− => Store s
143− -> Logger
144− -> Manager
145− -> m (OAuthToken s)
146−getToken (Store s) l m = do
144+retrieveTokenFromStore
145+ :: (MonadIO m, MonadCatch m, AllowScopes s)
146+ => Store s
147+ -> Logger
148+ -> Manager
149+ -> m (OAuthToken s)
150+retrieveTokenFromStore (Store s) l m = do
147151 x <- liftIO (readMVar s)
148152 mx <- validate x
149153 if mx
@@ -193,7 +197,7 @@ authorize :: (MonadIO m, MonadCatch m, AllowScopes s)
193197 -> Logger
194198 -> Manager
195199 -> m Client.Request
196−authorize rq s l m = bearer <$> getToken s l m
200+authorize rq s l m = bearer <$> retrieveTokenFromStore s l m
197201 where
198202 bearer t = rq
199203 { Client.requestHeaders =