AET update: 64-char user_ids and relaxing validation

Fixes #571

Also allows `firefox-accounts` pings without an `ecosystem_client_id` value as
long as `ecosystem_anon_id` is present. Server apps will need to send AET
pings with anon_id but without any relevant client_id to be associated with,
so we want to avoid having to introduce a static server-side client_id just to
conform to the schema.

Telemetry AET pings are still required to have an `ecosystem_client_id` as we
expect the client should always be able to provide that value.

Author: jklukas

schemas/firefox-accounts/account-ecosystem/account-ecosystem.1.schema.json

@@ -1,26 +1,35 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
+  "anyOf": [
+    {
+      "required": [
+        "ecosystem_client_id"
+      ]
+    },
+    {
+      "required": [
+        "ecosystem_user_id"
+      ]
+    }
+  ],
   "properties": {
     "ecosystem_client_id": {
       "type": "string"
     },
     "ecosystem_user_id": {
       "description": "Account Ecosystem Telemetry user identifier; this value is not present in the original payload sent by clients, but is instead inserted by the pipeline after decrypting and removing ecosystem_anon_id",
-      "pattern": "[a-zA-z0-9]{32}",
+      "pattern": "[a-zA-z0-9]{64}",
       "type": "string"
     },
     "previous_ecosystem_user_ids": {
       "description": "Previous Account Ecosystem Telemetry identifiers associated with this user; this value is not present in the original payload sent by clients, but is instead inserted by the pipeline after decrypting and removing previous_ecosystem_anon_ids",
       "items": {
-        "pattern": "[a-zA-z0-9]{32}",
+        "pattern": "[a-zA-z0-9]{64}",
         "type": "string"
       },
       "type": "array"
     }
   },
-  "required": [
-    "ecosystem_client_id"
-  ],
   "title": "account-ecosystem",
   "type": "object"
 }

schemas/telemetry/account-ecosystem/account-ecosystem.4.schema.json

@@ -63,13 +63,13 @@
         },
         "ecosystemUserId": {
           "description": "Account Ecosystem Telemetry user identifier; this value is not present in the original payload sent by clients, but is instead inserted by the pipeline after decrypting and removing ecosystemAnonId",
-          "pattern": "[a-zA-z0-9]{32}",
+          "pattern": "[a-zA-z0-9]{64}",
           "type": "string"
         },
         "previousEcosystemUserIds": {
           "description": "Previous Account Ecosystem Telemetry identifiers associated with this user; this value is not present in the original payload sent by clients, but is instead inserted by the pipeline after decrypting and removing previousEcosystemAnonIds",
           "items": {
-            "pattern": "[a-zA-z0-9]{32}",
+            "pattern": "[a-zA-z0-9]{64}",
             "type": "string"
           },
           "type": "array"

templates/firefox-accounts/account-ecosystem/account-ecosystem.1.schema.json

@@ -18,7 +18,16 @@
       }
     }
   },
-  "required": [
-    "ecosystem_client_id"
+  "anyOf": [
+    {
+      "required": [
+        "ecosystem_client_id"
+      ]
+    },
+    {
+      "required": [
+        "ecosystem_user_id"
+      ]
+    }
   ]
 }

templates/include/account-ecosystem/ecosystem_user_id_type.1.schema.json

@@ -1,2 +1,2 @@
 "type": "string",
-"pattern": "[a-zA-z0-9]{32}"
+"pattern": "[a-zA-z0-9]{64}"

validation/firefox-accounts/account-ecosystem.1.no_ids.fail.json

@@ -0,0 +1,5 @@
+{
+  "previous_ecosystem_user_ids": [
+    "2345678923456789234567892345678923456789234567892345678923456789"
+  ]
+}

validation/firefox-accounts/account-ecosystem.1.sample.pass.json

@@ -1,8 +1,7 @@
 {
   "ecosystem_client_id": "foo",
-  "ecosystem_device_id": "bar",
-  "ecosystem_user_id": "abcdef01abcdef01abcdef01abcdef01",
+  "ecosystem_user_id": "abcdef01abcdef01abcdef01abcdef01abcdef01abcdef01abcdef01abcdef01",
   "previous_ecosystem_user_ids": [
-    "23456789234567892345678923456789"
+    "2345678923456789234567892345678923456789234567892345678923456789"
   ]
 }

validation/firefox-accounts/account-ecosystem.1.user_id_only.pass.json

@@ -0,0 +1,3 @@
+{
+  "ecosystem_user_id": "abcdef01abcdef01abcdef01abcdef01abcdef01abcdef01abcdef01abcdef01"
+}

validation/telemetry/account-ecosystem.4.sample.pass.json

@@ -15,10 +15,9 @@
     "channel": "default"
   },
   "payload": {
-    "ecosystemClientId": "unknown",
-    "ecosystemDeviceId": "unknown",
-    "ecosystemUserId": "abcdefghabcdefghabcdefghabcdefgh",
-    "previousEcosystemUserIds": ["1bcdefghabcdefghabcdefghabcdefgh"],
+    "ecosystemClientId": "5bdc7cec-0b1d-ac42-a369-610223b7869d",
+    "ecosystemUserId": "abcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefgh",
+    "previousEcosystemUserIds": ["18cdefghabcdefghabcdefghabcdefgh1bcdefghabcdefghabcdefghabcdefg3"],
     "scalars": {
       "parent": {
         "browser.engagement.total_uri_count": 3