refactor(auth): remove unused POST /v1/key-data route

packages/fxa-auth-server/docs/swagger/oauth-server-api.ts

@@ -67,7 +67,6 @@ const OAUTH_SERVER_API_DESCRIPTION = {
       - [POST /v1/destroy](#tag/OAuth-Server-API-Overview/operation/postDestroy)
       - [POST /v1/introspect](#tag/OAuth-Server-API-Overview/operation/postIntrospect)
       - [GET /v1/jwks](#tag/OAuth-Server-API-Overview/operation/getJwks)
-      - [POST /v1/key-data](#tag/OAuth-Server-API-Overview/operation/postKeydata)
       - [POST /v1/token](#tag/OAuth-Server-API-Overview/operation/postToken)
       - [POST /v1/verify](#tag/OAuth-Server-API-Overview/operation/postVerify)
   `,
@@ -413,41 +412,6 @@ const JWKS_GET = {
   },
 };
 
-const KEY_DATA_POST = {
-  ...TAGS_OAUTH_SERVER,
-  description: '/v1/key-data',
-  notes: ['This endpoint returns the required scoped key metadata.'],
-  plugins: {
-    'hapi-swagger': {
-      responses: {
-        200: {
-          description: swaggerText`
-            A valid response will return JSON the scoped key information for every scope that has scoped keys.
-            <br />
-            **Example:**
-            \`\`\` js
-                {
-                  "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
-                  }
-                }
-            \`\`\`
-          `,
-        },
-      },
-      'x-codeSamples': [
-        {
-          lang: 'JavaScript',
-          source:
-            'curl -X POST \\\n "https://oauth.accounts.firefox.com/v1/key-data" \\\n  -H \'cache-control: no-cache\' \\\n  -H \'content-type: application/json\' \\\n  -d \'{\n   "client_id": "5901bd09376fadaa",\n   "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",\n   "scope": "https://identity.mozilla.com/apps/sample-scope-can-scope-key"\n}\'',
-        },
-      ],
-    },
-  },
-};
-
 const TOKEN_POST = {
   ...TAGS_OAUTH_SERVER,
   description: '/v1/token',
@@ -551,7 +515,6 @@ const API_DOCS = {
   CLIENT_CLIENTID_GET,
   INTROSPECT_POST,
   JWKS_GET,
-  KEY_DATA_POST,
   TOKEN_POST,
   VERIFY_POST,
 };

packages/fxa-auth-server/lib/routes/oauth/key_data.js

@@ -10,11 +10,7 @@ const validators = require('../../oauth/validators');
 const verifyAssertion = require('../../oauth/assertion');
 const { validateRequestedGrant } = require('../../oauth/grant');
 const { makeAssertionJWT } = require('../../oauth/util');
-const DESCRIPTION =
-  require('../../../docs/swagger/shared/descriptions').default;
 const OAUTH_DOCS = require('../../../docs/swagger/oauth-api').default;
-const OAUTH_SERVER_DOCS =
-  require('../../../docs/swagger/oauth-server-api').default;
 const { getClientServiceTags } = require('../../metrics/client-tags');
 
 /**
@@ -97,33 +93,6 @@ module.exports = ({ log, oauthDB, statsd }) => {
   }
 
   return [
-    {
-      method: 'POST',
-      path: '/key-data',
-      config: {
-        ...OAUTH_SERVER_DOCS.KEY_DATA_POST,
-        cors: { origin: 'ignore' },
-        validate: {
-          payload: Joi.object({
-            client_id: validators.clientId.description(DESCRIPTION.clientId),
-            assertion: validators.assertion
-              .required()
-              .description(DESCRIPTION.assertion),
-            scope: validators.scope.required().description(DESCRIPTION.scope),
-          }),
-        },
-        response: {
-          schema: Joi.object().pattern(/^/, [
-            Joi.object({
-              identifier: Joi.string().required(),
-              keyRotationSecret: Joi.string().required(),
-              keyRotationTimestamp: Joi.number().required(),
-            }),
-          ]),
-        },
-        handler: keyDataHandler,
-      },
-    },
     {
       method: 'POST',
       path: '/account/scoped-key-data',

packages/fxa-auth-server/test/lib/server.ts

@@ -10,6 +10,8 @@ const version = config.get('apiVersion');
 config.set('log.level', 'critical');
 config.set('cloudTasks.oidc.aud', 'cloud-tasks');
 config.set('cloudTasks.oidc.serviceAccountEmail', 'testo@iam.gcp.g.co');
+// Session-token routes sign assertions that the in-process oauth server must verify.
+config.set('oauth.secretKey', config.get('oauthServer.authServerSecrets')[0]);
 const testConfig = config.getProperties();
 const createServer = require('../../bin/key_server');
 const { CapabilityService } = require('../../lib/payments/capability');