Merge pull request #20405 from mozilla/FXA-13476.v2

feat(strapi): Add mobile promo w/new 'default' content type, add SetPassword RP customizations

Author: LZoog

libs/shared/cms/src/__generated__/gql.ts

@@ -8,6 +8,7 @@ export * from './lib/constants';
 export * from './lib/legal-terms-configuration.manager';
 export * from './lib/product-configuration.manager';
 export * from './lib/relying-party-configuration.manager';
+export * from './lib/default-configuration.manager';
 export * from './lib/queries/cancel-interstitial-offer';
 export * from './lib/queries/capability-service-by-plan-ids';
 export * from './lib/queries/churn-intervention-by-product-id';
@@ -22,6 +23,7 @@ export * from './lib/queries/page-content-by-price-ids';
 export * from './lib/queries/purchase-with-details-offering-content';
 export * from './lib/queries/services-with-capabilities';
 export * from './lib/queries/relying-party';
+export * from './lib/queries/default';
 export * from './lib/queries/validation';
 export * from './lib/strapi.client';
 export * from './lib/strapi.client.config';

libs/shared/cms/src/__generated__/graphql.ts

@@ -0,0 +1,60 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+import { getOperationName } from '@apollo/client/utilities';
+import { Inject, Injectable } from '@nestjs/common';
+import { StatsD } from 'hot-shots';
+
+import { StatsDService } from '@fxa/shared/metrics/statsd';
+import { defaultCmsQuery } from '@fxa/shared/cms';
+import { StrapiClient, StrapiClientEventResponse } from './strapi.client';
+import { LOGGER_PROVIDER } from '@fxa/shared/log';
+import type { Logger } from '@fxa/shared/log';
+
+@Injectable()
+export class DefaultCmsConfigurationManager {
+  constructor(
+    private strapiClient: StrapiClient,
+    @Inject(StatsDService)
+    private statsd: StatsD,
+    @Inject(LOGGER_PROVIDER) private readonly log: Logger
+  ) {
+    if (this.strapiClient.on) {
+      this.strapiClient.on('response', this.onStrapiClientResponse.bind(this));
+    }
+  }
+
+  onStrapiClientResponse(response: StrapiClientEventResponse) {
+    const defaultTags = {
+      method: response.method,
+      error: response.error ? 'true' : 'false',
+      cache: `${response.cache}`,
+      cacheType: `${response.cacheType}`,
+    };
+    const operationName = response.query && getOperationName(response.query);
+    const tags = operationName
+      ? { ...defaultTags, operationName }
+      : defaultTags;
+    if (response.error) {
+      this.log.error('cms.default.requestFailed', {
+        operationName,
+        error: response.error,
+      });
+    }
+    this.statsd.timing(
+      'cms_default_request',
+      response.elapsed,
+      undefined,
+      tags
+    );
+  }
+
+  async fetchDefault() {
+    return await this.strapiClient.query(defaultCmsQuery, {});
+  }
+
+  async invalidateCache() {
+    return await this.strapiClient.invalidateQueryCache(defaultCmsQuery, {});
+  }
+}

libs/shared/cms/src/index.ts

@@ -0,0 +1,6 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+export * from './query';
+export * from './types';

libs/shared/cms/src/lib/default-configuration.manager.ts

@@ -0,0 +1,13 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+import { graphql } from '../../../__generated__/gql';
+
+export const defaultCmsQuery = graphql(`
+  query Default {
+    default {
+      promoQrImageUrl
+    }
+  }
+`);

libs/shared/cms/src/lib/queries/default/index.ts

@@ -0,0 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+export interface DefaultCmsResult {
+  promoQrImageUrl: string | null;
+}

libs/shared/cms/src/lib/queries/default/query.ts

@@ -242,5 +242,11 @@ export const RelyingPartyResultFactory = (
     },
     splitLayout: faker.datatype.boolean(),
   },
+  PostVerifySetPasswordPage: {
+    headline: faker.string.sample(),
+    description: faker.string.sample(),
+    primaryButtonText: faker.string.sample(),
+    pageTitle: faker.string.sample(),
+  },
   ...override,
 });

libs/shared/cms/src/lib/queries/default/types.ts

@@ -173,6 +173,12 @@ export const relyingPartyQuery = graphql(`
         }
         splitLayout
       }
+      PostVerifySetPasswordPage {
+        headline
+        description
+        primaryButtonText
+        pageTitle
+      }
       NewDeviceLoginEmail {
         subject
         headline

libs/shared/cms/src/lib/queries/relying-party/factories.ts

@@ -79,6 +79,7 @@ export interface RelyingPartyResult {
   SigninRecoveryChoicePage?: Page;
   SigninRecoveryCodePage?: Page;
   SigninRecoveryPhonePage?: Page;
+  PostVerifySetPasswordPage?: Page;
   shared: Shared;
   NewDeviceLoginEmail?: Email;
   VerifyLoginCodeEmail?: Email;