Review

Author: skyforce77

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

@@ -71,18 +71,16 @@ public Response post(
         final AuthleteApi api = AuthleteApiFactory.getDefaultApi();
         final User user = ProcessingUtil.getUser(session, parameters);
 
-        if(user == null)
+        if (user == null)
         {
             throw ExceptionUtil.badRequestException("Bad authentication.");
         }
 
         final CredentialOfferCreateRequest createRequest = model.toRequest(user);
         final CredentialOfferCreateResponse response = api.credentialOfferCreate(createRequest);
 
-        switch(response.getAction())
+        switch (response.getAction())
         {
-            default:
-                throw ExceptionUtil.badRequestException("An exception occured: " + response.getResultMessage());
             case CREATED:
                 model.setInfo(response.getInfo());
                 model.setUser(user);
@@ -93,6 +91,9 @@ public Response post(
 
                 // Create a response that has the viewable as its content.
                 return Response.ok(viewable, MediaType.TEXT_HTML_TYPE.withCharset("UTF-8")).build();
+
+            default:
+                throw ExceptionUtil.badRequestException("An exception occured: " + response.getResultMessage());
         }
     }
 }

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

@@ -22,6 +22,7 @@
 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;
@@ -47,6 +48,8 @@ public class CredentialOfferPageModel extends AuthorizationPageModel
     private static final String DEFAULT_ENDPOINT = "openid-credential-offer://";
     private static final String CREDENTIAL_OFFER_QR_PATTERN = "%s?credential_offer=%s";
     private static final String CREDENTIAL_OFFER_URI_QR_PATTERN = "%s?credential_offer_uri=%s";
+    private static final int QR_CODE_WIDTH = 300;
+    public static final int QR_CODE_HEIGHT = 300;
 
 
     private static final String DEFAULT_CREDENTIALS = "[\n" +
@@ -98,36 +101,42 @@ public CredentialOfferPageModel setValues(final Map<String, String> values)
         this.preAuthorizedCodeGrantIncluded = ProcessingUtil.fromFormCheckbox(values, "preAuthorizedCodeGrantIncluded");
         this.userPinRequired = ProcessingUtil.fromFormCheckbox(values, "userPinRequired");
         this.credentialOfferEndpoint = values.getOrDefault("credentialOfferEndpoint", this.credentialOfferEndpoint);
+        this.userPinLength = extractInt(values, "userPinLength", this.userPinLength);
+        this.duration = extractInt(values, "duration", this.duration);
+        return this;
+    }
 
-        final String userPinLengthStr = values.getOrDefault("userPinLength", Integer.toString(this.userPinLength));
-        final String durationStr = values.getOrDefault("duration", Integer.toString(this.duration));
 
-        try
-        {
-            userPinLength = Integer.parseInt(userPinLengthStr);
-        }
-        catch (NumberFormatException e)
-        {
-            throw ExceptionUtil.badRequestException("User pin length should be a number.");
-        }
+    private Integer extractInt(final Map<String, String> values,
+                               final String key, final Integer def)
+    {
+        final String value = values.getOrDefault(key, Integer.toString(def));
 
         try
         {
-            duration = Integer.parseInt(durationStr);
+            final Integer intVal = Integer.parseInt(value);
+
+            if (intVal < 0)
+            {
+                throw ExceptionUtil.badRequestException(
+                        String.format("%s should be positive.", key));
+            }
+
+            return intVal;
         }
         catch (NumberFormatException e)
         {
-            throw ExceptionUtil.badRequestException("Duration should be a number.");
+            throw ExceptionUtil.badRequestException(
+                    String.format("%s should be a number.", key));
         }
-
-        return this;
     }
 
 
     private String asQrCode(final String text) throws IOException, WriterException
     {
         final QRCodeWriter qrCodeWriter = new QRCodeWriter();
-        final BitMatrix bitMatrix = qrCodeWriter.encode(text, BarcodeFormat.QR_CODE, 300, 300);
+        final BitMatrix bitMatrix = qrCodeWriter.encode(text, BarcodeFormat.QR_CODE,
+                                                        QR_CODE_WIDTH, QR_CODE_HEIGHT);
 
         final BufferedImage qrCode = MatrixToImageWriter.toBufferedImage(bitMatrix);