Removed unneeded case and new usages

Author: jaliss

module-code/app/securesocial/core/OAuth1Provider.scala

@@ -127,38 +127,36 @@ abstract class OAuth1Provider(
         // this is the 1st step in the auth flow. We need to get the request tokens
         val callbackUrl = routesService.authenticationUrl(id)
         logger.debug("[securesocial] callback url = " + callbackUrl)
-        client.retrieveRequestToken(callbackUrl).flatMap {
-          case accessToken =>
-            val cacheKey = UUID.randomUUID().toString
-            val redirect = Redirect(client.redirectUrl(accessToken.token)).withSession(request.session +
-              (OAuth1Provider.CacheKey -> cacheKey))
-            // set the cache key timeoutfor 5 minutes, plenty of time to log in
-            cacheService.set(cacheKey, accessToken, 300).map {
-              u =>
-                AuthenticationResult.NavigationFlow(redirect)
-            }
+        client.retrieveRequestToken(callbackUrl).flatMap { accessToken =>
+          val cacheKey = UUID.randomUUID().toString
+          val redirect = Redirect(client.redirectUrl(accessToken.token))
+            .withSession(request.session + (OAuth1Provider.CacheKey -> cacheKey))
+          // set the cache key timeoutfor 5 minutes, plenty of time to log in
+          cacheService
+            .set(cacheKey, accessToken, 300)
+            .map(_ => AuthenticationResult.NavigationFlow(redirect))
         } recover {
           case e =>
             logger.error("[securesocial] error retrieving request token", e)
-            throw new AuthenticationException()
+            throw AuthenticationException()
         }
       } else {
         // 2nd step in the oauth flow
         val cacheKey = request.session.get(OAuth1Provider.CacheKey).getOrElse {
           logger.error("[securesocial] missing cache key in session during OAuth1 flow")
-          throw new AuthenticationException()
+          throw AuthenticationException()
         }
         for (
           requestToken <- cacheService.getAs[RequestToken](cacheKey).recover {
             case e =>
               logger.error("[securesocial] error retrieving entry from cache", e)
-              throw new AuthenticationException()
+              throw AuthenticationException()
           };
           accessToken <- client.retrieveOAuth1Info(
             RequestToken(requestToken.get.token, requestToken.get.secret), verifier.get).recover {
               case e =>
                 logger.error("[securesocial] error retrieving access token", e)
-                throw new AuthenticationException()
+                throw AuthenticationException()
             };
           result <- fillProfile(accessToken)
         ) yield {