feat(server/common): use client request header as package name field

Signed-off-by: Trumeet <[email protected]>

Author: Trumeet

BUILD.md

@@ -2,6 +2,11 @@
 This guide tells you how to build this project and run it on your own devices.
 It has two parts - Server (Docker) and client (Android).
 
+# Limits
+The relationship between the client and server is one to one, that means the "Official" APKs can only use "Official" server, your builds can't use it. So if you'd like to build the client, you will have to build the server as well.
+
+Update checker will also not works on your builds, it only supports official clients.
+
 # Pre-requirements
 Whatever to build the server or client, you should have a MiPush application which is registered in Mi dev console at first.
 
@@ -72,6 +77,4 @@ You can't use the same package name as the "Official" builds, you should change
 
 Just copy `app/xmpush.properties.template` to `app/xmpush.properties`, and change the values.
 
-Secondly, modify `common/src/main/java/moe/yuuta/common/Constants.java#CLIENT_ID` to the same package name.
-
 Finally, pack it with Android Studio.

common/src/main/java/moe/yuuta/common/Constants.java

@@ -14,7 +14,6 @@ public class Constants {
     public static final String EXTRA_REQUEST_LOCALE = EXTRA_MIPUSHTESTER_PREFIX + "request_locale";
     public static final String EXTRA_REQUEST_TIME = EXTRA_MIPUSHTESTER_PREFIX + "request_time";
     public static final String EXTRA_CLIENT_VERSION = EXTRA_MIPUSHTESTER_PREFIX + "client_version";
-    // The package name of client, for more details, see BUILD.md
     public static final String TESTER_CLIENT_ID = "moe.yuuta.mipushtester";
     public static final String FRAMEWORK_CLIENT_ID = "top.trumeet.mipush";
 }

server/src/main/java/moe/yuuta/server/api/ApiHandlerImpl.java

@@ -79,7 +79,8 @@ public void handlePush(RoutingContext routingContext) {
                 return;
             }
             if ((request.getExtras() != null && request.getExtras().size() > 10) ||
-                    !DataVerifier.verify(request)) {
+                    !DataVerifier.verify(request) ||
+                    routingContext.request().getHeader(Constants.HEADER_PRODUCT) == null) {
                 routingContext.response().setStatusCode(400).end();
                 return;
             }
@@ -89,7 +90,7 @@ public void handlePush(RoutingContext routingContext) {
                     new SimpleDateFormat("HH:mm:ss", Locale.CHINA).format(Calendar.getInstance(TimeZone.getTimeZone("Asia/Shanghai")).getTime()));
             Message message = new Message();
             message.setTicker(ticker);
-            message.setRestrictedPackageName(Constants.TESTER_CLIENT_ID);
+            message.setRestrictedPackageName(routingContext.request().getHeader(Constants.HEADER_PRODUCT));
             // FIXME
             message.setPassThrough(request.isPassThrough() ? Message.PASS_THROUGH_ENABLED :
                     Message.PASS_THROUGH_DISABLED);

server/src/test/java/moe/yuuta/server/api/ApiHandlerImplTest.java

@@ -349,6 +349,7 @@ public void shouldHandleSuccessfulPush(TestContext testContext) {
         final int delayMs = 100;
         final String requestVersion = "Haoye1.0";
         final String requestLocale = "zh_TW";
+        final String packageName = "android.sms";
 
         // TODO: Test multiple situations for variety arguments (e.g. display)
         this.sendPushCallback = (Message message, String[] regIds, Map<String, String> customExtras, Handler<AsyncResult<HttpResponse<SendMessageResponse>>> handler) -> {
@@ -358,7 +359,7 @@ public void shouldHandleSuccessfulPush(TestContext testContext) {
                 // TODO: Fully match the description
                 testContext.assertNotNull(message.getDescription());
                 testContext.assertNotEquals(message.getDescription(), "");
-                testContext.assertEquals(message.getRestrictedPackageName(), Constants.TESTER_CLIENT_ID);
+                testContext.assertEquals(message.getRestrictedPackageName(), packageName);
                 testContext.assertEquals(message.getPassThrough(), Message.PASS_THROUGH_ENABLED);
                 testContext.assertEquals(message.getNotifyForeground(), Message.NOTIFY_FOREGROUND_DISABLE);
                 testContext.assertEquals(message.getConnpt(), Message.CONNPT_WIFI);
@@ -404,6 +405,7 @@ public void shouldHandleSuccessfulPush(TestContext testContext) {
                 .putHeader("Accept-Language", Locale.ENGLISH.toString())
                 .putHeader(Constants.HEADER_LOCALE, requestLocale)
                 .putHeader(Constants.HEADER_VERSION, requestVersion)
+                .putHeader(Constants.HEADER_PRODUCT, packageName)
                 .setChunked(true)
                 .write(ApiUtils.tryObjectToJson(request))
                 .end();