Restyle

- Restyled by brittany
- Restyled by stylish-haskell

src/Yesod/Auth/OAuth2/AzureAD.hs

@@ -9,8 +9,7 @@
 module Yesod.Auth.OAuth2.AzureAD
   ( oauth2AzureAD
   , oauth2AzureADScoped
-    )
+  ) where
-where
 
 import Prelude
 import Yesod.Auth.OAuth2.Prelude
@@ -38,8 +37,7 @@ oauth2AzureADScoped scopes clientId clientSecret =
       token
       "https://graph.microsoft.com/v1.0/me"
 
-        pure Creds
+    pure Creds { credsPlugin = pluginName
-            { credsPlugin = pluginName
                , credsIdent  = userId
                , credsExtra  = setExtra token userResponse
                }
@@ -52,7 +50,6 @@ oauth2AzureADScoped scopes clientId clientSecret =
         `withQuery` [ scopeParam "," scopes
                     , ("resource", "https://graph.microsoft.com")
                     ]
-        , oauth2TokenEndpoint =
+    , oauth2TokenEndpoint     = "https://login.windows.net/common/oauth2/token"
-            "https://login.windows.net/common/oauth2/token"
     , oauth2RedirectUri       = Nothing
     }

src/Yesod/Auth/OAuth2/BattleNet.hs

@@ -11,8 +11,7 @@
 module Yesod.Auth.OAuth2.BattleNet
   ( oauth2BattleNet
   , oAuth2BattleNet
-    )
+  ) where
-where
 
 import Yesod.Auth.OAuth2.Prelude
 
@@ -38,13 +37,9 @@ oauth2BattleNet widget region clientId clientSecret =
   authOAuth2Widget widget pluginName oauth2 $ \manager token -> do
     (User userId, userResponse) <-
       authGetProfile pluginName manager token
-                $ fromRelative
+        $ fromRelative "https" (apiHost $ T.toLower region) "/account/user"
-                      "https"
-                      (apiHost $ T.toLower region)
-                      "/account/user"
 
-        pure Creds
+    pure Creds { credsPlugin = pluginName
-            { credsPlugin = pluginName
                , credsIdent  = T.pack $ show userId
                , credsExtra  = setExtra token userResponse
                }

src/Yesod/Auth/OAuth2/Bitbucket.hs

@@ -9,8 +9,7 @@
 module Yesod.Auth.OAuth2.Bitbucket
   ( oauth2Bitbucket
   , oauth2BitbucketScoped
-    )
+  ) where
-where
 
 import Yesod.Auth.OAuth2.Prelude
 
@@ -39,8 +38,7 @@ oauth2BitbucketScoped scopes clientId clientSecret =
       token
       "https://api.bitbucket.com/2.0/user"
 
-        pure Creds
+    pure Creds { credsPlugin = pluginName
-            { credsPlugin = pluginName
         -- FIXME: Preserved bug. This should just be userId (it's already
         -- a Text), but because this code was shipped, folks likely have
         -- Idents in their database like @"\"...\""@, and if we fixed this
@@ -54,10 +52,8 @@ oauth2BitbucketScoped scopes clientId clientSecret =
   oauth2 = OAuth2
     { oauth2ClientId          = clientId
     , oauth2ClientSecret      = Just clientSecret
-        , oauth2AuthorizeEndpoint =
+    , oauth2AuthorizeEndpoint = "https://bitbucket.com/site/oauth2/authorize"
-            "https://bitbucket.com/site/oauth2/authorize"
                                   `withQuery` [scopeParam "," scopes]
-        , oauth2TokenEndpoint =
+    , oauth2TokenEndpoint     = "https://bitbucket.com/site/oauth2/access_token"
-            "https://bitbucket.com/site/oauth2/access_token"
     , oauth2RedirectUri       = Nothing
     }

src/Yesod/Auth/OAuth2/ClassLink.hs

@@ -3,8 +3,7 @@
 module Yesod.Auth.OAuth2.ClassLink
   ( oauth2ClassLink
   , oauth2ClassLinkScoped
-    )
+  ) where
-where
 
 import Yesod.Auth.OAuth2.Prelude
 
@@ -33,8 +32,7 @@ oauth2ClassLinkScoped scopes clientId clientSecret =
       token
       "https://nodeapi.classlink.com/v2/my/info"
 
-        pure Creds
+    pure Creds { credsPlugin = pluginName
-            { credsPlugin = pluginName
                , credsIdent  = T.pack $ show userId
                , credsExtra  = setExtra token userResponse
                }
@@ -42,10 +40,8 @@ oauth2ClassLinkScoped scopes clientId clientSecret =
   oauth2 = OAuth2
     { oauth2ClientId          = clientId
     , oauth2ClientSecret      = Just clientSecret
-        , oauth2AuthorizeEndpoint =
+    , oauth2AuthorizeEndpoint = "https://launchpad.classlink.com/oauth2/v2/auth"
-            "https://launchpad.classlink.com/oauth2/v2/auth"
                                   `withQuery` [scopeParam "," scopes]
-        , oauth2TokenEndpoint =
+    , oauth2TokenEndpoint = "https://launchpad.classlink.com/oauth2/v2/token"
-            "https://launchpad.classlink.com/oauth2/v2/token"
     , oauth2RedirectUri       = Nothing
     }

src/Yesod/Auth/OAuth2/Dispatch.hs

@@ -105,8 +105,7 @@ withCallbackAndState name oauth2 csrf = do
   callback <- maybe (throwError $ InvalidCallbackUri uri) pure $ fromText uri
   pure oauth2
     { oauth2RedirectUri       = Just callback
-        , oauth2AuthorizeEndpoint =
+    , oauth2AuthorizeEndpoint = oauth2AuthorizeEndpoint oauth2
-            oauth2AuthorizeEndpoint oauth2
                                   `withQuery` [("state", encodeUtf8 csrf)]
     }
 
@@ -135,8 +134,7 @@ verifySessionCSRF sessionKey = do
   token        <- requireGetParam "state"
   sessionToken <- lookupSession sessionKey
   deleteSession sessionKey
-    token <$ unless
+  token <$ unless (sessionToken == Just token)
-        (sessionToken == Just token)
                   (throwError $ InvalidStateToken sessionToken token)
 
 requireGetParam

src/Yesod/Auth/OAuth2/EveOnline.hs

@@ -11,8 +11,7 @@ module Yesod.Auth.OAuth2.EveOnline
   ( oauth2Eve
   , oauth2EveScoped
   , WidgetType(..)
-    )
+  ) where
-where
 
 import Yesod.Auth.OAuth2.Prelude
 
@@ -56,16 +55,15 @@ oauth2Eve = oauth2EveScoped defaultScopes
 oauth2EveScoped
   :: YesodAuth m => [Text] -> WidgetType m -> Text -> Text -> AuthPlugin m
 oauth2EveScoped scopes widgetType clientId clientSecret =
-    authOAuth2Widget (asWidget widgetType) pluginName oauth2
+  authOAuth2Widget (asWidget widgetType) pluginName oauth2 $ \manager token ->
-        $ \manager token -> do
+    do
       (User userId, userResponse) <- authGetProfile
         pluginName
         manager
         token
         "https://login.eveonline.com/oauth/verify"
 
-              pure Creds
+      pure Creds { credsPlugin = "eveonline"
-                  { credsPlugin = "eveonline"
           -- FIXME: Preserved bug. See similar comment in Bitbucket provider.
                  , credsIdent  = T.pack $ show userId
                  , credsExtra  = setExtra token userResponse
@@ -74,9 +72,10 @@ oauth2EveScoped scopes widgetType clientId clientSecret =
   oauth2 = OAuth2
     { oauth2ClientId          = clientId
     , oauth2ClientSecret      = Just clientSecret
-        , oauth2AuthorizeEndpoint =
+    , oauth2AuthorizeEndpoint = "https://login.eveonline.com/oauth/authorize"
-            "https://login.eveonline.com/oauth/authorize"
+                                  `withQuery` [ ("response_type", "code")
-                `withQuery` [("response_type", "code"), scopeParam " " scopes]
+                                              , scopeParam " " scopes
+                                              ]
     , oauth2TokenEndpoint     = "https://login.eveonline.com/oauth/token"
     , oauth2RedirectUri       = Nothing
     }

src/Yesod/Auth/OAuth2/GitHub.hs

@@ -9,8 +9,7 @@
 module Yesod.Auth.OAuth2.GitHub
   ( oauth2GitHub
   , oauth2GitHubScoped
-    )
+  ) where
-where
 
 import Yesod.Auth.OAuth2.Prelude
 
@@ -39,8 +38,7 @@ oauth2GitHubScoped scopes clientId clientSecret =
       token
       "https://api.github.com/user"
 
-        pure Creds
+    pure Creds { credsPlugin = pluginName
-            { credsPlugin = pluginName
                , credsIdent  = T.pack $ show userId
                , credsExtra  = setExtra token userResponse
                }
@@ -48,10 +46,8 @@ oauth2GitHubScoped scopes clientId clientSecret =
   oauth2 = OAuth2
     { oauth2ClientId          = clientId
     , oauth2ClientSecret      = Just clientSecret
-        , oauth2AuthorizeEndpoint =
+    , oauth2AuthorizeEndpoint = "https://github.com/login/oauth/authorize"
-            "https://github.com/login/oauth/authorize"
                                   `withQuery` [scopeParam "," scopes]
-        , oauth2TokenEndpoint =
+    , oauth2TokenEndpoint     = "https://github.com/login/oauth/access_token"
-            "https://github.com/login/oauth/access_token"
     , oauth2RedirectUri       = Nothing
     }

src/Yesod/Auth/OAuth2/GitLab.hs

@@ -4,8 +4,7 @@ module Yesod.Auth.OAuth2.GitLab
   , oauth2GitLabHostScopes
   , defaultHost
   , defaultScopes
-    )
+  ) where
-where
 
 import Yesod.Auth.OAuth2.Prelude
 
@@ -42,12 +41,9 @@ oauth2GitLabHostScopes
 oauth2GitLabHostScopes host scopes clientId clientSecret =
   authOAuth2 pluginName oauth2 $ \manager token -> do
     (User userId, userResponse) <-
-            authGetProfile pluginName manager token
+      authGetProfile pluginName manager token $ host `withPath` "/api/v4/user"
-            $ host
-            `withPath` "/api/v4/user"
 
-        pure Creds
+    pure Creds { credsPlugin = pluginName
-            { credsPlugin = pluginName
                , credsIdent  = T.pack $ show userId
                , credsExtra  = setExtra token userResponse
                }
@@ -55,8 +51,7 @@ oauth2GitLabHostScopes host scopes clientId clientSecret =
   oauth2 = OAuth2
     { oauth2ClientId          = clientId
     , oauth2ClientSecret      = Just clientSecret
-        , oauth2AuthorizeEndpoint =
+    , oauth2AuthorizeEndpoint = host
-            host
                                 `withPath`  "/oauth/authorize"
                                 `withQuery` [scopeParam " " scopes]
     , oauth2TokenEndpoint     = host `withPath` "/oauth/token"

src/Yesod/Auth/OAuth2/Google.hs

@@ -29,8 +29,7 @@ module Yesod.Auth.OAuth2.Google
   , oauth2GoogleWidget
   , oauth2GoogleScoped
   , oauth2GoogleScopedWidget
-    )
+  ) where
-where
 
 import Yesod.Auth.OAuth2.Prelude
 import Yesod.Core (WidgetFor, whamlet)
@@ -52,13 +51,16 @@ defaultScopes = ["openid", "email"]
 oauth2Google :: YesodAuth m => Text -> Text -> AuthPlugin m
 oauth2Google = oauth2GoogleScoped defaultScopes
 
-oauth2GoogleWidget :: YesodAuth m => WidgetFor m () -> Text -> Text -> AuthPlugin m
+oauth2GoogleWidget
+  :: YesodAuth m => WidgetFor m () -> Text -> Text -> AuthPlugin m
 oauth2GoogleWidget widget = oauth2GoogleScopedWidget widget defaultScopes
 
 oauth2GoogleScoped :: YesodAuth m => [Text] -> Text -> Text -> AuthPlugin m
-oauth2GoogleScoped = oauth2GoogleScopedWidget [whamlet|Login via #{pluginName}|]
+oauth2GoogleScoped =
+  oauth2GoogleScopedWidget [whamlet|Login via #{pluginName}|]
 
-oauth2GoogleScopedWidget :: YesodAuth m => WidgetFor m () -> [Text] -> Text -> Text -> AuthPlugin m
+oauth2GoogleScopedWidget
+  :: YesodAuth m => WidgetFor m () -> [Text] -> Text -> Text -> AuthPlugin m
 oauth2GoogleScopedWidget widget scopes clientId clientSecret =
   authOAuth2Widget widget pluginName oauth2 $ \manager token -> do
     (User userId, userResponse) <- authGetProfile
@@ -67,8 +69,7 @@ oauth2GoogleScopedWidget widget scopes clientId clientSecret =
       token
       "https://www.googleapis.com/oauth2/v3/userinfo"
 
-        pure Creds
+    pure Creds { credsPlugin = pluginName
-            { credsPlugin = pluginName
                , credsIdent  = userId
                , credsExtra  = setExtra token userResponse
                }
@@ -76,10 +77,8 @@ oauth2GoogleScopedWidget widget scopes clientId clientSecret =
   oauth2 = OAuth2
     { oauth2ClientId          = clientId
     , oauth2ClientSecret      = Just clientSecret
-        , oauth2AuthorizeEndpoint =
+    , oauth2AuthorizeEndpoint = "https://accounts.google.com/o/oauth2/auth"
-            "https://accounts.google.com/o/oauth2/auth"
                                   `withQuery` [scopeParam " " scopes]
-        , oauth2TokenEndpoint =
+    , oauth2TokenEndpoint     = "https://www.googleapis.com/oauth2/v3/token"
-            "https://www.googleapis.com/oauth2/v3/token"
     , oauth2RedirectUri       = Nothing
     }

src/Yesod/Auth/OAuth2/Nylas.hs

@@ -2,8 +2,7 @@
 
 module Yesod.Auth.OAuth2.Nylas
   ( oauth2Nylas
-    )
+  ) where
-where
 
 import Yesod.Auth.OAuth2.Prelude
 
@@ -42,8 +41,7 @@ oauth2Nylas clientId clientSecret =
 
     either
         (throwIO . YesodOAuth2Exception.JSONDecodingError pluginName)
-                (\(User userId) -> pure Creds
+        (\(User userId) -> pure Creds { credsPlugin = pluginName
-                    { credsPlugin = pluginName
                                       , credsIdent = userId
                                       , credsExtra = setExtra token userResponse
                                       }
@@ -53,8 +51,7 @@ oauth2Nylas clientId clientSecret =
   oauth = OAuth2
     { oauth2ClientId          = clientId
     , oauth2ClientSecret      = Just clientSecret
-        , oauth2AuthorizeEndpoint =
+    , oauth2AuthorizeEndpoint = "https://api.nylas.com/oauth/authorize"
-            "https://api.nylas.com/oauth/authorize"
                                   `withQuery` [ ("response_type", "code")
                                               , ( "client_id"
                                                 , encodeUtf8 clientId

src/Yesod/Auth/OAuth2/Salesforce.hs

@@ -11,8 +11,7 @@ module Yesod.Auth.OAuth2.Salesforce
   , oauth2SalesforceScoped
   , oauth2SalesforceSandbox
   , oauth2SalesforceSandboxScoped
-    )
+  ) where
-where
 
 import Yesod.Auth.OAuth2.Prelude
 
@@ -60,14 +59,9 @@ salesforceHelper
   -> AuthPlugin m
 salesforceHelper name profileUri authorizeUri tokenUri scopes clientId clientSecret
   = authOAuth2 name oauth2 $ \manager token -> do
-        (User userId, userResponse) <- authGetProfile
+    (User userId, userResponse) <- authGetProfile name manager token profileUri
-            name
-            manager
-            token
-            profileUri
 
-        pure Creds
+    pure Creds { credsPlugin = pluginName
-            { credsPlugin = pluginName
                , credsIdent  = userId
                , credsExtra  = setExtra token userResponse
                }
@@ -75,8 +69,7 @@ salesforceHelper name profileUri authorizeUri tokenUri scopes clientId clientSec
   oauth2 = OAuth2
     { oauth2ClientId          = clientId
     , oauth2ClientSecret      = Just clientSecret
-        , oauth2AuthorizeEndpoint =
+    , oauth2AuthorizeEndpoint = authorizeUri `withQuery` [scopeParam " " scopes]
-            authorizeUri `withQuery` [scopeParam " " scopes]
     , oauth2TokenEndpoint     = tokenUri
     , oauth2RedirectUri       = Nothing
     }

src/Yesod/Auth/OAuth2/Slack.hs

@@ -9,8 +9,7 @@ module Yesod.Auth.OAuth2.Slack
   ( SlackScope(..)
   , oauth2Slack
   , oauth2SlackScoped
-    )
+  ) where
-where
 
 import Yesod.Auth.OAuth2.Prelude
 
@@ -46,7 +45,8 @@ defaultScopes = [SlackBasicScope]
 oauth2Slack :: YesodAuth m => Text -> Text -> AuthPlugin m
 oauth2Slack = oauth2SlackScoped defaultScopes
 
-oauth2SlackScoped :: YesodAuth m => [SlackScope] -> Text -> Text -> AuthPlugin m
+oauth2SlackScoped
+  :: YesodAuth m => [SlackScope] -> Text -> Text -> AuthPlugin m
 oauth2SlackScoped scopes clientId clientSecret =
   authOAuth2 pluginName oauth2 $ \manager token -> do
     let param = encodeUtf8 $ atoken $ accessToken token
@@ -56,8 +56,7 @@ oauth2SlackScoped scopes clientId clientSecret =
 
     either
         (throwIO . YesodOAuth2Exception.JSONDecodingError pluginName)
-                (\(User userId) -> pure Creds
+        (\(User userId) -> pure Creds { credsPlugin = pluginName
-                    { credsPlugin = pluginName
                                       , credsIdent = userId
                                       , credsExtra = setExtra token userResponse
                                       }
@@ -67,9 +66,10 @@ oauth2SlackScoped scopes clientId clientSecret =
   oauth2 = OAuth2
     { oauth2ClientId          = clientId
     , oauth2ClientSecret      = Just clientSecret
-        , oauth2AuthorizeEndpoint =
+    , oauth2AuthorizeEndpoint = "https://slack.com/oauth/authorize"
-            "https://slack.com/oauth/authorize"
+                                  `withQuery` [ scopeParam ","
-                `withQuery` [scopeParam "," $ map scopeText scopes]
+                                                  $ map scopeText scopes
+                                              ]
     , oauth2TokenEndpoint     = "https://slack.com/api/oauth.access"
     , oauth2RedirectUri       = Nothing
     }

src/Yesod/Auth/OAuth2/Spotify.hs

@@ -5,8 +5,7 @@
 --
 module Yesod.Auth.OAuth2.Spotify
   ( oauth2Spotify
-    )
+  ) where
-where
 
 import Yesod.Auth.OAuth2.Prelude
 
@@ -27,8 +26,7 @@ oauth2Spotify scopes clientId clientSecret =
       token
       "https://api.spotify.com/v1/me"
 
-        pure Creds
+    pure Creds { credsPlugin = pluginName
-            { credsPlugin = pluginName
                , credsIdent  = userId
                , credsExtra  = setExtra token userResponse
                }
@@ -36,8 +34,7 @@ oauth2Spotify scopes clientId clientSecret =
   oauth2 = OAuth2
     { oauth2ClientId          = clientId
     , oauth2ClientSecret      = Just clientSecret
-        , oauth2AuthorizeEndpoint =
+    , oauth2AuthorizeEndpoint = "https://accounts.spotify.com/authorize"
-            "https://accounts.spotify.com/authorize"
                                   `withQuery` [scopeParam " " scopes]
     , oauth2TokenEndpoint     = "https://accounts.spotify.com/api/token"
     , oauth2RedirectUri       = Nothing

src/Yesod/Auth/OAuth2/Upcase.hs

@@ -8,8 +8,7 @@
 --
 module Yesod.Auth.OAuth2.Upcase
   ( oauth2Upcase
-    )
+  ) where
-where
 
 import Yesod.Auth.OAuth2.Prelude
 
@@ -34,8 +33,7 @@ oauth2Upcase clientId clientSecret =
       token
       "http://upcase.com/api/v1/me.json"
 
-        pure Creds
+    pure Creds { credsPlugin = pluginName
-            { credsPlugin = pluginName
                , credsIdent  = T.pack $ show userId
                , credsExtra  = setExtra token userResponse
                }

src/Yesod/Auth/OAuth2/WordPressDotCom.hs

@@ -2,8 +2,7 @@
 
 module Yesod.Auth.OAuth2.WordPressDotCom
   ( oauth2WordPressDotCom
-    )
+  ) where
-where
 
 import qualified Data.Text as T
 import Yesod.Auth.OAuth2.Prelude
@@ -29,8 +28,7 @@ oauth2WordPressDotCom clientId clientSecret =
       token
       "https://public-api.wordpress.com/rest/v1/me/"
 
-        pure Creds
+    pure Creds { credsPlugin = pluginName
-            { credsPlugin = pluginName
                , credsIdent  = T.pack $ show userId
                , credsExtra  = setExtra token userResponse
                }
@@ -42,7 +40,6 @@ oauth2WordPressDotCom clientId clientSecret =
     , oauth2AuthorizeEndpoint =
       "https://public-api.wordpress.com/oauth2/authorize"
         `withQuery` [scopeParam "," ["auth"]]
-        , oauth2TokenEndpoint =
+    , oauth2TokenEndpoint     = "https://public-api.wordpress.com/oauth2/token"
-            "https://public-api.wordpress.com/oauth2/token"
     , oauth2RedirectUri       = Nothing
     }