simplify

Assistant/WebApp/Configurators/AWS.hs

@@ -102,9 +102,7 @@ getAddS3R = awsConfigurator $ do
 				, ("datacenter", T.unpack $ datacenter input)
 				, ("storageclass", show $ storageClass input)
 				]
-		_ -> do
-			let authtoken = webAppFormAuthToken
-			$(widgetFile "configurators/adds3")
+		_ -> $(widgetFile "configurators/adds3")
   where
 	setgroup r = runAnnex () $
 		setStandardGroup (Remote.uuid r) TransferGroup
@@ -124,9 +122,7 @@ getAddGlacierR = glacierConfigurator $ do
 				, ("type", "glacier")
 				, ("datacenter", T.unpack $ datacenter input)
 				]
-		_ -> do
-			let authtoken = webAppFormAuthToken
-			$(widgetFile "configurators/addglacier")
+		_ -> $(widgetFile "configurators/addglacier")
   where
 	setgroup r = runAnnex () $
 		setStandardGroup (Remote.uuid r) SmallArchiveGroup
@@ -152,7 +148,6 @@ enableAWSRemote remotetype uuid = do
 				fromJust $ M.lookup uuid m
 			makeAWSRemote remotetype creds name (const noop) M.empty
 		_ -> do
-			let authtoken = webAppFormAuthToken
 			description <- lift $ runAnnex "" $
 				T.pack . concat <$> Remote.prettyListUUIDs [uuid]
 			$(widgetFile "configurators/enableaws")

Assistant/WebApp/Configurators/Edit.hs

@@ -126,7 +126,6 @@ editForm new uuid = page "Configure repository" (Just Config) $ do
   where
 	showform form enctype curr = do
 		let istransfer = repoGroup curr == RepoGroupStandard TransferGroup
-		let authtoken = webAppFormAuthToken
 		$(widgetFile "configurators/editrepository")
 
 	{- Makes a toplevel archive directory, so the user can get on with

Assistant/WebApp/Configurators/Local.hs

@@ -184,9 +184,7 @@ getAddDriveR = page "AAdd a removable drive" (Just Config) $ do
 	case res of
 		FormSuccess (RemovableDrive { mountPoint = d }) -> lift $
 			make (T.unpack d) >>= redirect . EditNewRepositoryR
-		_ -> do
-			let authtoken = webAppFormAuthToken
-			$(widgetFile "configurators/adddrive")
+		_ -> $(widgetFile "configurators/adddrive")
   where
 	make mountpoint = do
 		liftIO $ makerepo dir

Assistant/WebApp/Configurators/Pairing.hs

@@ -259,7 +259,6 @@ promptSecret msg cont = pairPage $ do
 			(verifiableVal . fromPairMsg <$> msg)
 		u <- T.pack <$> liftIO myUserName
 		let sameusername = username == u
-		let authtoken = webAppFormAuthToken
 		$(widgetFile "configurators/pairing/local/prompt")
 
 {- This counts unicode characters as more than one character,

Assistant/WebApp/Configurators/Ssh.hs

@@ -100,9 +100,7 @@ getAddSshR = sshConfigurator $ do
 				Right sshdata -> lift $ redirect $ ConfirmSshR sshdata
 		_ -> showform form enctype UntestedServer
   where
-	showform form enctype status = do
-		let authtoken = webAppFormAuthToken
-		$(widgetFile "configurators/ssh/add")
+	showform form enctype status = $(widgetFile "configurators/ssh/add")
 
 {- To enable an existing rsync special remote, parse the SshInput from
  - its rsyncurl, and display a form whose only real purpose is to check
@@ -135,7 +133,6 @@ getEnableRsyncR u = do
 	showform form enctype status = do
 		description <- lift $ runAnnex "" $
 			T.pack . concat <$> prettyListUUIDs [u]
-		let authtoken = webAppFormAuthToken
 		$(widgetFile "configurators/ssh/enable")
 	enable sshdata = lift $ redirect $ ConfirmSshR $
 		sshdata { rsyncOnly = True }
@@ -237,8 +234,7 @@ showSshErr msg = sshConfigurator $
 	$(widgetFile "configurators/ssh/error")
 
 getConfirmSshR :: SshData -> Handler RepHtml
-getConfirmSshR sshdata = sshConfigurator $ do
-	let authtoken = webAppFormAuthToken
+getConfirmSshR sshdata = sshConfigurator $
 	$(widgetFile "configurators/ssh/confirm")
 
 getMakeSshGitR :: SshData -> Handler RepHtml

Assistant/WebApp/Configurators/WebDAV.hs

@@ -62,9 +62,7 @@ getAddBoxComR = boxConfigurator $ do
 				-- performance.
 				, ("chunksize", "10mb")
 				]
-		_ -> do
-			let authtoken = webAppFormAuthToken
-			$(widgetFile "configurators/addbox.com")
+		_ -> $(widgetFile "configurators/addbox.com")
   where
 	setgroup r = runAnnex () $
 		setStandardGroup (Remote.uuid r) TransferGroup
@@ -88,7 +86,6 @@ getEnableWebDAVR uuid = do
 			FormSuccess creds -> lift $
 				makeWebDavRemote name creds (const noop) M.empty
 			_ -> do
-				let authtoken = webAppFormAuthToken
 				description <- lift $ runAnnex "" $
 					T.pack . concat <$> Remote.prettyListUUIDs [uuid]
 				$(widgetFile "configurators/enablewebdav")

Assistant/WebApp/Configurators/XMPP.hs

@@ -70,9 +70,7 @@ getXMPPR' redirto = xmppPage $ do
 		oldcreds <- runAnnex Nothing getXMPPCreds
 		runFormGet $ renderBootstrap $ xmppAForm $
 			creds2Form <$> oldcreds
-	let showform problem = do
-		let authtoken = webAppFormAuthToken
-		$(widgetFile "configurators/xmpp")
+	let showform problem = $(widgetFile "configurators/xmpp")
 	case result of
 		FormSuccess f -> either (showform . Just . show) (lift . storecreds)
 			=<< liftIO (validateForm f)