PODS-9123: #216
PODS-9123: #216
Conversation
Code: - Added auth action which cross references data from the list of legacy schemes and legacy scheme details APIs. It checks whether a given PSA or PSA/PSTR combination has access to data for a scheme and uses the schemeName field, common to both responses, for matching purposes. If the schemeName doesn't match or other failures occur you will reach Page not found. - Removed unused custom exception
|
| val futureMaybeListOfSchemesForPsa: Future[Option[List[Items]]] = listOfSchemes.flatMap { | ||
| case Right(list) => Future.successful(list.items) | ||
| case _ => | ||
| logger.info("getListOfSchemes returned None for this PsaID") | ||
| Future.successful(None) | ||
| } | ||
|
|
||
| val futureSchemeDetailsForPsaWithPstr = legacySchemeDetails.flatMap { | ||
| case Right(data) => Future.successful(data.as[JsObject]) | ||
| case _ => | ||
| logger.info("getLegacySchemeDetails returned no data for this PsaId and PSTR") | ||
| Future.successful(Json.obj()) | ||
| } |
There was a problem hiding this comment.
No need for flatMap here.
There was a problem hiding this comment.
Using flatMap here to avoid nested futures of type Future[Future[Option[List[Items]]]] and Future[Future[JsObject]] respectively
There was a problem hiding this comment.
In all 4 outcomes of those you are choosing to return a future.
You don't have to.
Instead of Future.successful(list.items) return list.items
|
I will take a look at the actual authentication later today. |
Code: - Added type annotations - Changed comparison of String results in for comprehension - Added logger statements - General formatting
|
|
For authentication we want to just send a request to get legacy scheme details 1815. If it responds it's authenticated if not it's not authenticated. We also want to log any non 2xx responses from get legacy scheme details. |
Code: - Fixed scalastyle complaints - Removed calls to list of schemes API - Added logging for when call to getLegacySchemeDetails fails - General refactoring - Added test for auth actions
|
Looks good Nathan. Let's confirm with the people who provide us with the API that this works and how to recover from failure. |
Code: