From 15fa8d11302cb7d34e971210b9572c339c281b62 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 5 Apr 2019 22:45:03 +0200
Subject: [PATCH] =?UTF-8?q?(Get|Post)Token=20=E2=86=92=20(Get|Post)Bearer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Handler/Profile.hs                     | 4 ++--
 src/Jobs/Handler/SendNotification/Utils.hs | 2 +-
 src/Model/Token.hs                         | 4 ++--
 src/Utils/Parameters.hs                    | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Handler/Profile.hs b/src/Handler/Profile.hs
index f01f34281..71e718da9 100644
--- a/src/Handler/Profile.hs
+++ b/src/Handler/Profile.hs
@@ -599,11 +599,11 @@ postUserNotificationR cID = do
         = [whamlet|
             $newline never
             $maybe jwt <- mJwt
-              <input type=hidden name=#{toPathPiece PostToken} value=#{toPathPiece jwt}>
+              <input type=hidden name=#{toPathPiece PostBearer} value=#{toPathPiece jwt}>
             ^{nsInnerWdgt}
           |]
 
-  formResultModal nsRes (UserNotificationR cID, [ (toPathPiece GetToken, toPathPiece jwt) | Just jwt <- pure mJwt ]) $ \ns -> do
+  formResultModal nsRes (UserNotificationR cID, [ (toPathPiece GetBearer, toPathPiece jwt) | Just jwt <- pure mJwt ]) $ \ns -> do
     lift . runDB $ update uid [ UserNotificationSettings =. ns ]
     tell . pure =<< messageI Success MsgNotificationSettingsUpdate
 
diff --git a/src/Jobs/Handler/SendNotification/Utils.hs b/src/Jobs/Handler/SendNotification/Utils.hs
index d7ca82a76..c91199db9 100644
--- a/src/Jobs/Handler/SendNotification/Utils.hs
+++ b/src/Jobs/Handler/SendNotification/Utils.hs
@@ -15,6 +15,6 @@ mkEditNotifications uid = liftHandlerT $ do
   jwt <- encodeToken =<< bearerToken uid (Just . HashSet.singleton $ UserNotificationR cID) Nothing Nothing Nothing
   let
     editNotificationsUrl :: SomeRoute UniWorX
-    editNotificationsUrl = SomeRoute (UserNotificationR cID, [(toPathPiece GetToken, toPathPiece jwt)])
+    editNotificationsUrl = SomeRoute (UserNotificationR cID, [(toPathPiece GetBearer, toPathPiece jwt)])
   editNotificationsUrl' <- toTextUrl editNotificationsUrl
   return ($(ihamletFile "templates/mail/editNotifications.hamlet") :: HtmlUrlI18n UniWorXMessage (Route UniWorX))
diff --git a/src/Model/Token.hs b/src/Model/Token.hs
index cfaaacb55..f84fc970a 100644
--- a/src/Model/Token.hs
+++ b/src/Model/Token.hs
@@ -215,6 +215,6 @@ askJwt :: forall m.
 -- | Retrieve current `Jwt` from HTTP-Header, POST-Parameter, or GET-Parameter
 askJwt = runMaybeT $ asum
   [ MaybeT lookupBearerAuth >>= hoistMaybe . fromPathPiece
-  , MaybeT $ lookupGlobalPostParam PostToken
-  , MaybeT $ lookupGlobalGetParam GetToken
+  , MaybeT $ lookupGlobalPostParam PostBearer
+  , MaybeT $ lookupGlobalGetParam GetBearer
   ]
diff --git a/src/Utils/Parameters.hs b/src/Utils/Parameters.hs
index f7922adcb..bc3735620 100644
--- a/src/Utils/Parameters.hs
+++ b/src/Utils/Parameters.hs
@@ -20,7 +20,7 @@ import Data.Universe
 import Control.Monad.Trans.Maybe (MaybeT(..))
 
 
-data GlobalGetParam = GetReferer | GetToken
+data GlobalGetParam = GetReferer | GetBearer
   deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic)
 
 instance Universe GlobalGetParam
@@ -51,7 +51,7 @@ globalGetParamField ident Field{fieldParse} = runMaybeT $ do
 data GlobalPostParam = PostFormIdentifier
                      | PostDeleteTarget
                      | PostMassInputShape
-                     | PostToken
+                     | PostBearer
   deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic)
 
 instance Universe GlobalPostParam