「Request parameters are invalid」が出た時に、どのパラメータが悪いのかを知らせるようにした。

Author: TakayukiHoshi1984

dConnectDevicePlugin/dConnectDevicePluginSDK/dconnect-device-plugin-sdk/src/main/java/org/deviceconnect/android/profile/AuthorizationProfile.java

@@ -181,7 +181,7 @@ private void createClient(final Intent request, final Intent response) {
         String packageName = request.getStringExtra(AuthorizationProfile.PARAM_PACKAGE);
         String serviceId = request.getStringExtra(DConnectProfile.PARAM_SERVICE_ID);
         if (packageName == null) {
-            MessageUtils.setInvalidRequestParameterError(response);
+            MessageUtils.setInvalidRequestParameterError(response, "Request parameters are invalid, PackageName is null.");
         } else {
             // Local OAuthでクライアント作成
             PackageInfoOAuth packageInfo = new PackageInfoOAuth(packageName, serviceId);

dConnectDevicePlugin/dConnectDevicePluginSDK/dconnect-device-plugin-sdk/src/main/java/org/deviceconnect/android/profile/DConnectProfile.java

@@ -11,6 +11,7 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.util.Log;
 
 import org.deviceconnect.android.event.Event;
 import org.deviceconnect.android.message.DevicePluginContext;
@@ -20,6 +21,7 @@
 import org.deviceconnect.android.profile.spec.OpenAPIValidator;
 import org.deviceconnect.android.profile.spec.models.Method;
 import org.deviceconnect.android.profile.spec.models.Swagger;
+import org.deviceconnect.android.profile.spec.models.parameters.Parameter;
 import org.deviceconnect.android.service.DConnectService;
 import org.deviceconnect.message.DConnectMessage;
 import org.deviceconnect.message.intent.message.IntentDConnectMessage;
@@ -245,7 +247,36 @@ private boolean validateRequest(final Intent request) {
         }
         return true;
     }
-
+    /**
+     * 不正なリクエストパラメータを返します.
+     *
+     * @param request リクエスト
+     * @return 不正なリクエストパラメータ
+     */
+    private String getInvalidParameter(final Intent request) {
+        DConnectService service = getService();
+        StringBuilder builder = new StringBuilder();
+        if (service != null) {
+            DConnectServiceSpec spec = service.getServiceSpec();
+            if (spec != null) {
+                Swagger swagger = spec.findProfileSpec(getProfile(request));
+                if (swagger != null) {
+                    Bundle extras = request.getExtras();
+                    if (extras == null) {
+                        return builder.toString();
+                    }
+                    List<Parameter> parameters = OpenAPIValidator.findParameters(swagger, request);
+                    for (Parameter parameter : parameters) {
+                        Object value = extras.get(parameter.getName());
+                        if (!OpenAPIValidator.validate(parameter, value)) {
+                            builder.append(parameter.getName()).append(",");
+                        }
+                    }
+                }
+            }
+        }
+        return builder.toString();
+    }
     /**
      * RESPONSEメソッドハンドラー.
      *
@@ -262,8 +293,10 @@ public boolean onRequest(final Intent request, final Intent response) {
         DConnectApi api = findApi(request);
         if (api != null) {
             if (!validateRequest(request)) {
+                String invalidDetails = getInvalidParameter(request);
+                invalidDetails = invalidDetails.substring(0, invalidDetails.length() - 1);
                 // API 定義ファイルでパラメータエラーとなった
-                MessageUtils.setInvalidRequestParameterError(response);
+                MessageUtils.setInvalidRequestParameterError(response, "Request parameters are invalid: " + invalidDetails);
                 return true;
             }
             return api.onRequest(request, response);

dConnectDevicePlugin/dConnectDevicePluginSDK/dconnect-device-plugin-sdk/src/main/java/org/deviceconnect/android/profile/spec/OpenAPIValidator.java

@@ -86,7 +86,7 @@ public static boolean validate(Swagger swagger, Intent request) {
      * @param request リクエスト
      * @return パラメータの仕様リスト
      */
-    private static List<Parameter> findParameters(Swagger swagger, Intent request) {
+    public static List<Parameter> findParameters(Swagger swagger, Intent request) {
         List<Parameter> parameters = new ArrayList<>();
 
         Operation operation = DConnectServiceSpec.findOperationSpec(swagger, request);

dConnectDevicePlugin/dConnectDevicePluginSDK/repository/org/deviceconnect/dconnect-device-plugin-sdk/2.8.4/dconnect-device-plugin-sdk-2.8.4.aar

@@ -1 +1 @@
-a2412e743ca5812340bd64b8114437a1
+43049bdb12241666dbb769c8ddfa6e47

dConnectDevicePlugin/dConnectDevicePluginSDK/repository/org/deviceconnect/dconnect-device-plugin-sdk/2.8.4/dconnect-device-plugin-sdk-2.8.4.aar.md5

@@ -1 +1 @@
-02c4b295217acf7056755b1fc55a8bb7f2adb197
+98fc6f3802be34c44454d2c9adcf96dcab1458aa

dConnectDevicePlugin/dConnectDevicePluginSDK/repository/org/deviceconnect/dconnect-device-plugin-sdk/2.8.4/dconnect-device-plugin-sdk-2.8.4.aar.sha1

@@ -33,6 +33,6 @@
       <version>2.8.3</version>
       <version>2.8.4</version>
     </versions>
-    <lastUpdated>20200319010010</lastUpdated>
+    <lastUpdated>20200319023902</lastUpdated>
   </versioning>
 </metadata>

dConnectDevicePlugin/dConnectDevicePluginSDK/repository/org/deviceconnect/dconnect-device-plugin-sdk/maven-metadata.xml

@@ -1 +1 @@
-45002959e18e7f2c2b30a7a7d416b6c1
+03db08542af8f2c7725ca9a5672051c4

dConnectDevicePlugin/dConnectDevicePluginSDK/repository/org/deviceconnect/dconnect-device-plugin-sdk/maven-metadata.xml.md5

@@ -1 +1 @@
-d19269be404c42bbefaa09ac115a30759a72ab14
+f38f6beee3471babb02a3356053dc21d21bb51e8