Add credential offer display

Author: skyforce77

src/main/java/com/authlete/jaxrs/server/api/CredentialOfferPageModel.java

@@ -22,19 +22,23 @@
 import java.net.URLEncoder;
 import java.util.Base64;
 import java.util.Map;
-import java.util.function.Consumer;
 import javax.imageio.ImageIO;
 import com.authlete.common.dto.CredentialOfferCreateRequest;
 import com.authlete.common.dto.CredentialOfferInfo;
 import com.authlete.common.types.User;
 import com.authlete.jaxrs.AuthorizationPageModel;
 import com.authlete.jaxrs.server.util.ExceptionUtil;
 import com.authlete.jaxrs.server.util.ProcessingUtil;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.WriterException;
 import com.google.zxing.client.j2se.MatrixToImageWriter;
 import com.google.zxing.common.BitMatrix;
 import com.google.zxing.qrcode.QRCodeWriter;
+import com.nimbusds.jose.shaded.gson.Gson;
+import com.nimbusds.jose.shaded.gson.GsonBuilder;
+import com.nimbusds.jose.shaded.gson.JsonParseException;
 
 
 /**
@@ -73,6 +77,7 @@ public class CredentialOfferPageModel extends AuthorizationPageModel
     private CredentialOfferInfo info;
     private String credentialOfferLink;
     private String credentialOfferQrCode;
+    private String credentialOfferContent;
     private String credentialOfferUriLink;
     private String credentialOfferUriQrCode;
 
@@ -143,6 +148,14 @@ private String asQrCode(final String text) throws IOException, WriterException
     }
 
 
+    private String prettifyJson(final String json)
+    {
+        final Gson gson = new GsonBuilder().setPrettyPrinting().create();
+        final JsonElement je = JsonParser.parseString(json);
+        return gson.toJson(je);
+    }
+
+
     public CredentialOfferCreateRequest toRequest(final User user)
     {
         return new CredentialOfferCreateRequest()
@@ -280,6 +293,15 @@ public void setInfo(CredentialOfferInfo info)
         {
             throw ExceptionUtil.internalServerErrorException("Can't generate QR code.");
         }
+
+        this.credentialOfferContent = info.getCredentialOffer();
+
+        try
+        {
+            this.credentialOfferContent = prettifyJson(this.credentialOfferContent);
+        }
+        catch (JsonParseException ignored)
+        {}
     }
 
 
@@ -307,6 +329,18 @@ public void setCredentialOfferQrCode(String credentialOfferQrCode)
     }
 
 
+    public String getCredentialOfferContent()
+    {
+        return credentialOfferContent;
+    }
+
+
+    public void setCredentialOfferContent(String credentialOfferContent)
+    {
+        this.credentialOfferContent = credentialOfferContent;
+    }
+
+
     public String getCredentialOfferUriLink()
     {
         return credentialOfferUriLink;

src/main/webapp/WEB-INF/template/credential-offer.jsp

@@ -155,14 +155,18 @@
             <c:if test="${model.credentialOfferQrCode != null}">
             <h5>Credential offer</h5>
             <a href="${model.credentialOfferLink}">
-              <img src="data:image/png;base64,${model.credentialOfferQrCode}"/>
+              <img src="data:image/png;base64,${model.credentialOfferQrCode}">
             </a>
             <br/>
+            <div class="indent">
+              <pre><code>${model.credentialOfferContent}</code></pre>
+            </div>
+            <br/>
             </c:if>
 
             <c:if test="${model.credentialOfferUriQrCode != null}">
             <h5>Credential offer URI</h5>
-            <a href="${model.credentialOfferLink}">
+            <a href="${model.credentialOfferUriLink}">
               <img src="data:image/png;base64,${model.credentialOfferUriQrCode}"/>
             </a>
             <br/>

src/main/webapp/css/authorization.css

@@ -193,3 +193,18 @@ input {
 #deny-button:active {
   background-color: red;
 }
+
+pre {
+  background: #f4f4f4;
+  border: 1px solid #ddd;
+  border-left: 3px solid #33b0f3;
+  color: #666;
+  page-break-inside: avoid;
+  font-family: monospace;
+  margin-bottom: 1.6em;
+  max-width: 60%;
+  overflow: auto;
+  padding: 1em 1.5em;
+  display: block;
+  word-wrap: break-word;
+}