fix(keys): replace scope key TLD (#505) r=@rfk

mozilla · Nov 24, 2017 · a5e6d8f · a5e6d8f
1 parent 5d772f6
commit a5e6d8f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/config/dev.json b/config/dev.json
@@ -43,7 +43,7 @@
       "termsUri": "",
       "privacyUri": "",
       "trusted": true,
-      "allowedScopes": "https://identity.mozilla.org/apps/notes",
+      "allowedScopes": "https://identity.mozilla.com/apps/notes",
       "publicClient": true
     },
     {
@@ -122,7 +122,7 @@
   "allowHttpRedirects": true,
   "scopes": [
     {
-      "scope": "https://identity.mozilla.org/apps/notes",
+      "scope": "https://identity.mozilla.com/apps/notes",
       "hasScopedKeys": true
     }
   ]

diff --git a/config/test.json b/config/test.json
@@ -64,7 +64,7 @@
       "imageUri": "https://mozorg.cdn.mozilla.net/media/img/firefox/new/header-firefox.png",
       "redirectUri": "https://example.domain/return?foo=bar",
       "trusted": true,
-      "allowedScopes": "https://identity.mozilla.org/apps/sample-scope-can-scope-key https://identity.mozilla.org/apps/sample-scope kv https://identity.mozilla.org/apps/another-can-scope-key",
+      "allowedScopes": "https://identity.mozilla.com/apps/sample-scope-can-scope-key https://identity.mozilla.com/apps/sample-scope kv https://identity.mozilla.com/apps/another-can-scope-key",
       "canGrant": false,
       "publicClient": false
     }
@@ -90,15 +90,15 @@
   "allowHttpRedirects": true,
   "scopes": [
     {
-      "scope": "https://identity.mozilla.org/apps/sample-scope",
+      "scope": "https://identity.mozilla.com/apps/sample-scope",
       "hasScopedKeys": false
     },
     {
-      "scope": "https://identity.mozilla.org/apps/sample-scope-can-scope-key",
+      "scope": "https://identity.mozilla.com/apps/sample-scope-can-scope-key",
       "hasScopedKeys": true
     },
     {
-      "scope": "https://identity.mozilla.org/apps/another-can-scope-key",
+      "scope": "https://identity.mozilla.com/apps/another-can-scope-key",
       "hasScopedKeys": true
     }
   ]

diff --git a/docs/api.md b/docs/api.md
@@ -549,7 +549,7 @@ curl -X POST \
   -d '{
  "client_id": "aaa6b9b3a65a1871",
  "assertion": "eyJhbGciOiJSUzI1NiJ9.eyJwdWJsaWMta2V5Ijp7Imt0eSI6IlJTQSIsIm4iOiJvWmdsNkpwM0Iwcm5BVXppNThrdS1iT0RvR3ZuUGNnWU1UdXQ1WkpyQkJiazBCdWU4VUlRQ0dnYVdrYU5Xb29INkktMUZ6SXU0VFpZYnNqWGJ1c2JRRlQxOGREUkN6VVRubFlXdVZXUzhoSWhKc3lhZHJwSHJOVkI1VndmSlRKZVgwTjFpczBXcU1qdUdOc2VMLXluYnFjOVhueElncFJaai05QnZqY2ZKYXNOUTNZdHR3VHZVaFJOLVFGNWgxQkY1MnA2QmdOTVBvWmQ5MC1EU0xydlpseXp6MEh0Q2tFZnNsc013czVkR0ExTlZ1dEwtcGVDeU50VTFzOEtFaDlzcGxXeF9lQlFybTlYQU1kYXp5ZWR6VUpJU1UyMjZmQzhEUHh5c0ZreXpCbjlDQnFDQUpTNjQzTGFydUVDaS1rMGhKOWFmM2JXTmJnWmpSNVJ2NXF4THciLCJlIjoiQVFBQiJ9LCJwcmluY2lwYWwiOnsiZW1haWwiOiIwNjIxMzM0YzIwNjRjNmYzNmJlOGFkOWE0N2M1NTliY2FwaS5hY2NvdW50cy5maXJlZm94LmNvbSJ9LCJpYXQiOjE1MDY5Njk2OTU0MzksImV4cCI6MTUwNjk2OTY5NjQzOSwiZnhhLXZlcmlmaWVkRW1haWwiOiIzMjM2NzJiZUBtb3ppbGxhLmNvbSIsImlzcyI6ImFwaS5hY2NvdW50cy5maXJlZm94LmNvbSJ9.hFZd5zFheXOFrXKkJvw6Vpv2l7ctlxuBTvuh5f_jLPAjZoJ9ri-vaJjL_WYBFUvS2xHzfx3-ldxLddyTKwCDAJeB_NkOFL_WJSrMet9C7_Z1hH9HmydeXIT82xJmhrwzW-WOO4ibQvRbocEFiNujynKsg1gS8v0iiYjIX-0cXCrlkxkbVx_8EXJFKDDOGzK9v7Zq6D7gkhP-CHEaNYaTHMn65tLQtBS6snGdaXlxoGHMWmDL6STbnJzWa7sa4QwHf-AgT1rUkQQAUHNa_XLZ0FEzqiCPctMadlihiUZL2V6vxIDBS4mHUF4qj0FvIMJflivDnJVkRNijDuP-h-Lh_A~eyJhbGciOiJSUzI1NiJ9.eyJhdWQiOiJvYXV0aC5meGEiLCJleHAiOjE1MDY5Njk2OTY0MzksImlzcyI6ImFwaS5hY2NvdW50cy5maXJlZm94LmNvbSJ9.M5xyk3RffucgaavjbUm7Eqnt47hzeGbGa2VR3jnVEIlRHfz5S25Qf3ngejwee7XECvIywbaKWeijXFOwS-EkB-7qP1gl4oNJjPmbnCk7S1lgckLWvdMIU-HLGKjrN6Mw76__LzvAbsusSeGmsvTCIVuOJ49Xs3tC1fLyB_re0QNpCcS6AUnJ1KOxIMEM3Om7ysNO5F_AqcD3PwlEti5lbwSk8iP5TWL12C2Nkb_6Hxze_mA1NZNAHOips9bF2J7oy1hqGoMYj1XYZrsyjpPWEuZQATAPlKSjbh1hq-UtDeT7DlwEmIbIUd3JA8qh1MkHKGgavd4fIMap0IPmr9rs4A",
- "scope": "https://identity.mozilla.org/apps/sample-scope-can-scope-key"
+ "scope": "https://identity.mozilla.com/apps/sample-scope-can-scope-key"
 }'
 ```
 
@@ -561,8 +561,8 @@ A valid response will return JSON the scoped key information for every scope tha
 
 ```json
 {
-  "https://identity.mozilla.org/apps/sample-scope-can-scope-key": {
-    "identifier": "https://identity.mozilla.org/apps/sample-scope-can-scope-key",
+  "https://identity.mozilla.com/apps/sample-scope-can-scope-key": {
+    "identifier": "https://identity.mozilla.com/apps/sample-scope-can-scope-key",
     "keyRotationSecret": "0000000000000000000000000000000000000000000000000000000000000000",
     "keyRotationTimestamp": 1506970363512
   }

diff --git a/test/api.js b/test/api.js
@@ -346,7 +346,7 @@ describe('/v1', function() {
       });
 
       it('should succeed with https:// scopes', function() {
-        const scopes = 'profile:email profile:uid https://identity.mozilla.org/apps/notes https://identity.mozilla.org/apps/lockbox';
+        const scopes = 'profile:email profile:uid https://identity.mozilla.com/apps/notes https://identity.mozilla.com/apps/lockbox';
         const client = clientByName('Mocha');
         mockAssertion().reply(200, VERIFY_GOOD);
 
@@ -2237,7 +2237,7 @@ describe('/v1', function() {
       const SCOPED_CLIENT_ID = 'aaa6b9b3a65a1871';
       const NO_KEY_SCOPES_CLIENT_ID = '38a6b9b3a65a1871';
       const BAD_CLIENT_ID = '0006b9b3a65a1871';
-      const SCOPE_CAN_SCOPE_KEY = 'https://identity.mozilla.org/apps/sample-scope-can-scope-key';
+      const SCOPE_CAN_SCOPE_KEY = 'https://identity.mozilla.com/apps/sample-scope-can-scope-key';
       let genericRequest;
 
       beforeEach(function () {
@@ -2261,15 +2261,15 @@ describe('/v1', function() {
 
             const body = res.result[SCOPE_CAN_SCOPE_KEY];
 
-            assert.equal(body.identifier, 'https://identity.mozilla.org/apps/sample-scope-can-scope-key');
+            assert.equal(body.identifier, 'https://identity.mozilla.com/apps/sample-scope-can-scope-key');
             assert.equal(body.keyRotationSecret, '0000000000000000000000000000000000000000000000000000000000000000');
             assert.equal(body.keyRotationTimestamp, 123456);
           });
       });
 
       it('works with multiple scopes', () => {
         mockAssertion().reply(200, VERIFY_GOOD);
-        const ANOTHER_CAN_SCOPE_KEY = 'https://identity.mozilla.org/apps/another-can-scope-key';
+        const ANOTHER_CAN_SCOPE_KEY = 'https://identity.mozilla.com/apps/another-can-scope-key';
         genericRequest.payload.scope = `${SCOPE_CAN_SCOPE_KEY} ${ANOTHER_CAN_SCOPE_KEY}`;
 
         return Server.api.post(genericRequest)
@@ -2305,7 +2305,7 @@ describe('/v1', function() {
       });
 
       it('fails with a non-scoped-key scope ', () => {
-        genericRequest.payload.scope = 'https://identity.mozilla.org/apps/sample-scope';
+        genericRequest.payload.scope = 'https://identity.mozilla.com/apps/sample-scope';
         mockAssertion().reply(200, VERIFY_GOOD);
         return Server.api.post(genericRequest)
           .then((res) => {