Consent jwt_expires_at

Author: simonredfern

obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerDefinitionsJSON.scala

@@ -4604,6 +4604,7 @@ object SwaggerDefinitionsJSON {
     jwt_payload = """{"createdByUserId":"user-id","sub":"subject","iss":"issuer","aud":"audience","jti":"jwt-id","iat":1611749820,"nbf":1611749820,"exp":1611753420,"request_headers":[],"name":null,"email":null,"entitlements":[],"views":[],"access":null}""",
     api_standard = "Berlin Group",
     api_version = "v1.3",
+    jwt_expires_at = dateTimeExample.value,
   )
 
   lazy val consentsInfoJsonV510 = ConsentsInfoJsonV510(

obp-api/src/main/scala/code/api/util/migration/Migration.scala

@@ -113,6 +113,7 @@ object Migration extends MdcLoggable {
       addMetricView(startedBeforeSchemifier)
       addConsentView(startedBeforeSchemifier)
       updateConsentViewAddJwtPayload(startedBeforeSchemifier)
+      updateConsentViewAddJwtExpiresAt(startedBeforeSchemifier)
       updateAccountAccessWithViewsViewUnionAll(startedBeforeSchemifier)
     }
 
@@ -613,6 +614,18 @@ object Migration extends MdcLoggable {
       }
     }
 
+    private def updateConsentViewAddJwtExpiresAt(startedBeforeSchemifier: Boolean): Boolean = {
+      if(startedBeforeSchemifier == true) {
+        logger.warn(s"Migration.database.updateConsentViewAddJwtExpiresAt(true) cannot be run before Schemifier.")
+        true
+      } else {
+        val name = nameOf(updateConsentViewAddJwtExpiresAt(startedBeforeSchemifier))
+        runOnce(name) {
+          MigrationOfConsentView.addConsentView(name)
+        }
+      }
+    }
+
     private def addAccountAccessWithViewsView(startedBeforeSchemifier: Boolean): Boolean = {
       if(startedBeforeSchemifier == true) {
         logger.warn(s"Migration.database.addAccountAccessWithViewsView(true) cannot be run before Schemifier.")

obp-api/src/main/scala/code/api/util/migration/MigrationOfConsentView.scala

@@ -37,7 +37,8 @@ object MigrationOfConsentView {
                     |    mnote                              AS note,
                     |    mfrequencyperday                   AS frequency_per_day,
                     |    musessofartodaycounter             AS uses_so_far_today_counter,
-                    |    mjsonwebtokenpayload               AS jwt_payload
+                    |    mjsonwebtokenpayload               AS jwt_payload,
+                    |    jwt_expires_at                     AS jwt_expires_at
                     |FROM mappedconsent;
                     |""".stripMargin
               case _ =>
@@ -60,7 +61,8 @@ object MigrationOfConsentView {
                     |    mnote                              AS note,
                     |    mfrequencyperday                   AS frequency_per_day,
                     |    musessofartodaycounter             AS uses_so_far_today_counter,
-                    |    mjsonwebtokenpayload               AS jwt_payload
+                    |    mjsonwebtokenpayload               AS jwt_payload,
+                    |    jwt_expires_at                     AS jwt_expires_at
                     |FROM mappedconsent;
                     |""".stripMargin
             }

obp-api/src/main/scala/code/api/v5_1_0/APIMethods510.scala

@@ -1962,7 +1962,8 @@ trait APIMethods510 {
         jwt = row.jwt.orNull,
         jwt_payload = row.jwtPayload.orNull,
         api_standard = row.apiStandard.orNull,
-        api_version = row.apiVersion.orNull
+        api_version = row.apiVersion.orNull,
+        jwt_expires_at = row.jwtExpiresAt.map(d => new java.text.SimpleDateFormat(DateWithSeconds).format(d)).orNull
       )
     }
 

obp-api/src/main/scala/code/api/v5_1_0/JSONFactory5.1.0.scala

@@ -175,6 +175,7 @@ case class ConsentInfoJsonV510(consent_reference_id: String,
                                jwt_payload: String,
                                api_standard: String,
                                api_version: String,
+                               jwt_expires_at: String,
                               )
 case class ConsentsInfoJsonV510(consents: List[ConsentInfoJsonV510])
 
@@ -1020,7 +1021,8 @@ object JSONFactory510 extends CustomJsonFormats with MdcLoggable {
           jwt = c.jsonWebToken,
           jwt_payload = null,
           api_standard = c.apiStandard,
-          api_version = c.apiVersion
+          api_version = c.apiVersion,
+          jwt_expires_at = null
         )
       }
     )

obp-api/src/main/scala/code/consent/DoobieConsentQueries.scala

@@ -39,7 +39,8 @@ object DoobieConsentQueries {
     note: Option[String],
     frequencyPerDay: Option[Int],
     usesSoFarTodayCounter: Option[Int],
-    jwtPayload: Option[String]
+    jwtPayload: Option[String],
+    jwtExpiresAt: Option[Timestamp]
   )
 
   /**
@@ -74,7 +75,7 @@ object DoobieConsentQueries {
       fr"""SELECT consent_reference_id, consent_id, created_by_user_id, consumer_id,
            status, jwt, consent_request_id, api_standard, api_version,
            last_action_date, last_usage_date, created_date,
-           note, frequency_per_day, uses_so_far_today_counter, jwt_payload
+           note, frequency_per_day, uses_so_far_today_counter, jwt_payload, jwt_expires_at
            FROM v_consent
            WHERE created_by_user_id = $userId
            ORDER BY created_date DESC, api_standard DESC"""
@@ -113,7 +114,7 @@ object DoobieConsentQueries {
     fr"""SELECT consent_reference_id, consent_id, created_by_user_id, consumer_id,
          status, jwt, consent_request_id, api_standard, api_version,
          last_action_date, last_usage_date, created_date,
-         note, frequency_per_day, uses_so_far_today_counter, jwt_payload
+         note, frequency_per_day, uses_so_far_today_counter, jwt_payload, jwt_expires_at
          FROM v_consent"""
 
   private def buildStatusCondition(status: Option[String]): Fragment = status match {
@@ -236,7 +237,7 @@ object DoobieConsentQueries {
       fr"""SELECT DISTINCT v.consent_reference_id, v.consent_id, v.created_by_user_id, v.consumer_id,
            v.status, v.jwt, v.consent_request_id, v.api_standard, v.api_version,
            v.last_action_date, v.last_usage_date, v.created_date,
-           v.note, v.frequency_per_day, v.uses_so_far_today_counter, v.jwt_payload
+           v.note, v.frequency_per_day, v.uses_so_far_today_counter, v.jwt_payload, v.jwt_expires_at
            FROM v_consent v
            JOIN consent_items cb ON cb.consent_reference_id = v.consent_reference_id
            WHERE v.created_by_user_id = $userId