Update WebPushTest and SubscriptionPublicKey to use VAPID keys (#65)

Author: rfc2822

src/main/kotlin/at/bitfire/dav4jvm/property/push/ServerPublicKey.kt renamed to src/main/kotlin/at/bitfire/dav4jvm/property/push/SubscriptionPublicKey.kt

@@ -6,19 +6,19 @@ import at.bitfire.dav4jvm.XmlReader
 import org.xmlpull.v1.XmlPullParser
 
 /**
- * Represents a [NS_WEBDAV_PUSH]`:server-public-key` property.
+ * Represents a [NS_WEBDAV_PUSH]`:subscription-public-key` property.
  *
  * Experimental! See https://github.com/bitfireAT/webdav-push/
  */
-data class ServerPublicKey(
+data class SubscriptionPublicKey(
     val type: String? = null,
     val key: String? = null
 ): Property {
 
     companion object {
 
         @JvmField
-        val NAME = Property.Name(NS_WEBDAV_PUSH, "server-public-key")
+        val NAME = Property.Name(NS_WEBDAV_PUSH, "subscription-public-key")
 
     }
 
@@ -27,8 +27,8 @@ data class ServerPublicKey(
 
         override fun getName() = NAME
 
-        override fun create(parser: XmlPullParser): ServerPublicKey {
-            return ServerPublicKey(
+        override fun create(parser: XmlPullParser): SubscriptionPublicKey {
+            return SubscriptionPublicKey(
                 type = parser.getAttributeValue(null, "type"),
                 key = XmlReader(parser).readText()
             )

src/main/kotlin/at/bitfire/dav4jvm/property/push/ClientPublicKey.kt renamed to src/main/kotlin/at/bitfire/dav4jvm/property/push/VapidPublicKey.kt

@@ -6,19 +6,19 @@ import at.bitfire.dav4jvm.XmlReader
 import org.xmlpull.v1.XmlPullParser
 
 /**
- * Represents a [NS_WEBDAV_PUSH]`:client-public-key` property.
+ * Represents a [NS_WEBDAV_PUSH]`:vapid-public-key` property.
  *
  * Experimental! See https://github.com/bitfireAT/webdav-push/
  */
-data class ClientPublicKey(
+data class VapidPublicKey(
     val type: String? = null,
     val key: String? = null
 ): Property {
 
     companion object {
 
         @JvmField
-        val NAME = Property.Name(NS_WEBDAV_PUSH, "client-public-key")
+        val NAME = Property.Name(NS_WEBDAV_PUSH, "vapid-public-key")
 
     }
 
@@ -27,8 +27,8 @@ data class ClientPublicKey(
 
         override fun getName() = NAME
 
-        override fun create(parser: XmlPullParser): ClientPublicKey {
-            return ClientPublicKey(
+        override fun create(parser: XmlPullParser): VapidPublicKey {
+            return VapidPublicKey(
                 type = parser.getAttributeValue(null, "type"),
                 key = XmlReader(parser).readText()
             )

src/main/kotlin/at/bitfire/dav4jvm/property/push/WebPush.kt

@@ -10,35 +10,34 @@ import org.xmlpull.v1.XmlPullParser
  * Experimental! See https://github.com/bitfireAT/webdav-push/
  */
 data class WebPush(
-    val serverPublicKey: ServerPublicKey? = null
-): PushTransport {
+    val vapidPublicKey: VapidPublicKey? = null
+) : PushTransport {
 
     companion object {
         @JvmField
         val NAME = Property.Name(NS_WEBDAV_PUSH, "web-push")
     }
 
 
-    object Factory: PropertyFactory {
+    object Factory : PropertyFactory {
 
         override fun getName(): Property.Name = NAME
 
         override fun create(parser: XmlPullParser): WebPush {
-            var serverPublicKey: ServerPublicKey? = null
+            var vapidPublicKey: VapidPublicKey? = null
             val depth = parser.depth
             var eventType = parser.eventType
             while (!(eventType == XmlPullParser.END_TAG && parser.depth == depth)) {
                 if (eventType == XmlPullParser.START_TAG && parser.namespace == NS_WEBDAV_PUSH) {
                     when (parser.name) {
-                        ServerPublicKey.NAME.name
-                             -> serverPublicKey = ServerPublicKey.Factory.create(parser)
+                        VapidPublicKey.NAME.name -> vapidPublicKey = VapidPublicKey.Factory.create(parser)
                     }
                 }
                 eventType = parser.next()
             }
-            return WebPush(serverPublicKey)
+            return WebPush(vapidPublicKey)
         }
 
     }
 
-}
+}

src/main/kotlin/at/bitfire/dav4jvm/property/push/WebPushSubscription.kt

@@ -18,7 +18,7 @@ import org.xmlpull.v1.XmlPullParser
  */
 data class WebPushSubscription(
     val pushResource: PushResource? = null,
-    val clientPublicKey: ClientPublicKey? = null,
+    val subscriptionPublicKey: SubscriptionPublicKey? = null,
     val authSecret: AuthSecret? = null
 ): Property {
 
@@ -43,7 +43,7 @@ data class WebPushSubscription(
                 if (eventType == XmlPullParser.START_TAG && parser.depth == depth + 1) {
                     when (parser.propertyName()) {
                         PushResource.NAME -> subscription = subscription.copy(pushResource = PushResource.Factory.create(parser))
-                        ClientPublicKey.NAME -> subscription = subscription.copy(clientPublicKey = ClientPublicKey.Factory.create(parser))
+                        SubscriptionPublicKey.NAME -> subscription = subscription.copy(subscriptionPublicKey = SubscriptionPublicKey.Factory.create(parser))
                         AuthSecret.NAME -> subscription = subscription.copy(authSecret = AuthSecret.Factory.create(parser))
                     }
                 }

src/test/kotlin/at/bitfire/dav4jvm/property/push/WebPushTest.kt

@@ -16,7 +16,7 @@ class WebPushTest: PropertyTest() {
             "  <subscription>" +
             "    <web-push-subscription>\n" +
             "      <push-resource>https://up.example.net/yohd4yai5Phiz1wi</push-resource>\n" +
-            "      <client-public-key type=\"p256dh\">BCVxsr7N_eNgVRqvHtD0zTZsEc6-VV-JvLexhqUzORcxaOzi6-AYWXvTBHm4bjyPjs7Vd8pZGH6SRpkNtoIAiw4</client-public-key>\n" +
+            "      <subscription-public-key type=\"p256dh\">BCVxsr7N_eNgVRqvHtD0zTZsEc6-VV-JvLexhqUzORcxaOzi6-AYWXvTBHm4bjyPjs7Vd8pZGH6SRpkNtoIAiw4</subscription-public-key>\n" +
             "      <auth-secret>BTBZMqHH6r4Tts7J_aSIgg</auth-secret>" +
             "    </web-push-subscription>\n" +
             "  </subscription>" +
@@ -28,7 +28,7 @@ class WebPushTest: PropertyTest() {
         assertEquals("https://up.example.net/yohd4yai5Phiz1wi", subscription?.pushResource?.uri?.toString())
         assertEquals("BTBZMqHH6r4Tts7J_aSIgg", subscription?.authSecret?.secret)
 
-        val publicKey = subscription?.clientPublicKey
+        val publicKey = subscription?.subscriptionPublicKey
         assertEquals("p256dh", publicKey?.type)
         assertEquals("BCVxsr7N_eNgVRqvHtD0zTZsEc6-VV-JvLexhqUzORcxaOzi6-AYWXvTBHm4bjyPjs7Vd8pZGH6SRpkNtoIAiw4", publicKey?.key)
     }
@@ -39,7 +39,7 @@ class WebPushTest: PropertyTest() {
                 "<transports xmlns=\"$NS_WEBDAV_PUSH\">" +
                 "  <something><else/></something>" +
                 "  <web-push>" +
-                "    <server-public-key type=\"p256dh\">BCVxsr7N_eNgVRqvHtD0zTZsEc6-VV-JvLexhqUzORcxaOzi6-AYWXvTBHm4bjyPjs7Vd8pZGH6SRpkNtoIAiw4</server-public-key>" +
+                "    <vapid-public-key type=\"p256dh\">BCVxsr7N_eNgVRqvHtD0zTZsEc6-VV-JvLexhqUzORcxaOzi6-AYWXvTBHm4bjyPjs7Vd8pZGH6SRpkNtoIAiw4</vapid-public-key>" +
                 "  </web-push>" +
                 "</transports>" +
                 "<topic xmlns=\"$NS_WEBDAV_PUSH\">SomeTopic</topic>")
@@ -48,7 +48,7 @@ class WebPushTest: PropertyTest() {
         assertEquals(setOf(
             // something else is ignored because it's not a recognized transport
             WebPush(
-                ServerPublicKey(
+                VapidPublicKey(
                     type = "p256dh",
                     key = "BCVxsr7N_eNgVRqvHtD0zTZsEc6-VV-JvLexhqUzORcxaOzi6-AYWXvTBHm4bjyPjs7Vd8pZGH6SRpkNtoIAiw4"
                 )