Build local copy of Digital Analytics Program

.eslintignore

@@ -4,3 +4,4 @@ public
 vendor
 coverage
 doc
+app/javascript/packages/analytics/digital-analytics-program*.js

app/controllers/users/sessions_controller.rb

@@ -245,7 +245,6 @@ def override_csp_for_google_analytics
       policy = current_content_security_policy
       policy.script_src(
         *policy.script_src,
-        'dap.digitalgov.gov',
         'www.google-analytics.com',
         'www.googletagmanager.com',
       )

app/helpers/script_helper.rb

@@ -2,8 +2,8 @@
 
 # rubocop:disable Rails/HelperInstanceVariable
 module ScriptHelper
-  def javascript_packs_tag_once(*names, **attributes)
-    @scripts = @scripts.to_h.merge(names.index_with(attributes))
+  def javascript_packs_tag_once(*names, url_params: nil, **attributes)
+    @scripts = @scripts.to_h.merge(names.index_with([url_params, attributes]))
     nil
   end
 
@@ -14,10 +14,10 @@ def render_javascript_pack_once_tags(...)
       javascript_packs_tag_once(...)
       return if @scripts.blank?
       concat javascript_assets_tag
-      @scripts.each do |name, attributes|
+      @scripts.each do |name, (url_params, attributes)|
         asset_sources.get_sources(name).each do |source|
           concat javascript_include_tag(
-            source,
+            UriService.add_params(source, url_params),
             **attributes,
             crossorigin: local_crossorigin_sources? ? true : nil,
             integrity: asset_sources.get_integrity(source),

app/javascript/packages/analytics/.gitignore

@@ -0,0 +1 @@
+digital-analytics-program*.js

app/javascript/packages/analytics/Makefile

@@ -0,0 +1,12 @@
+DAP_SHA ?= 7c14bb3
+
+digital-analytics-program.js: digital-analytics-program-$(DAP_SHA).js digital-analytics-program.patch
+	patch -p1 $^ --output $@
+
+digital-analytics-program-$(DAP_SHA).js:
+	curl https://raw.githubusercontent.com/digital-analytics-program/gov-wide-code/$(DAP_SHA)/Universal-Federated-Analytics.js --silent --output $@
+
+clean:
+	rm digital-analytics-program-$(DAP_SHA).js digital-analytics-program.js
+
+.PHONY: clean

app/javascript/packages/analytics/digital-analytics-program.patch

@@ -0,0 +1,8 @@
+73a74
+> GA4Object.async = true;
+785d785
+< var piiRegex = [];
+900c900
+<         piiRegex.forEach(function (pii) {
+---
+>         window.piiRegex.forEach(function (pii) {

app/javascript/packages/analytics/digital-analytics-program.spec.ts

@@ -0,0 +1,26 @@
+import { Worker } from 'node:worker_threads';
+import { join } from 'node:path';
+import { pathToFileURL } from 'node:url';
+
+describe('digital analytics program', () => {
+  it('parses without syntax error', async () => {
+    // Future: Replace with Promise.withResolvers once supported
+    // See: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise/withResolvers
+    let resolve;
+    const promise = new Promise((_resolve) => {
+      resolve = _resolve;
+    });
+
+    // Reference: https://github.com/nodejs/node/issues/30682
+    const toDataURL = (source: string) =>
+      new URL(`data:text/javascript,${encodeURIComponent(source)}`);
+    const url = pathToFileURL(join(__dirname, './digital-analytics-program.js'));
+    const code = `await import(${JSON.stringify(url)});`;
+    new Worker(toDataURL(code)).on('error', (error) => {
+      expect(error).not.to.be.instanceOf(SyntaxError);
+      resolve();
+    });
+
+    await promise;
+  });
+});

app/javascript/packages/analytics/package.json

@@ -2,7 +2,16 @@
   "name": "@18f/identity-analytics",
   "private": true,
   "version": "1.0.0",
+  "scripts": {
+    "postinstall": "make digital-analytics-program.js"
+  },
+  "exports": {
+    ".": "./index.ts",
+    "./click-observer-element": "./click-observer-element.ts",
+    "./digital-analytics-program": "./digital-analytics-program.js"
+  },
   "sideEffects": [
-    "./click-observer-element.ts"
+    "./click-observer-element.ts",
+    "./digital-analytics-program.js"
   ]
 }

app/javascript/packs/digital-analytics-program.ts

@@ -0,0 +1 @@
+import '@18f/identity-analytics/digital-analytics-program';

app/services/uri_service.rb

@@ -9,12 +9,13 @@ def self.params(original_uri)
 
   # @param [#to_s] original_uri
   # @param [Hash, nil] params_to_add
-  # @return [URI, nil]
+  # @return [String, nil]
   def self.add_params(original_uri, params_to_add)
     return if original_uri.blank?
+    return original_uri.to_s if params_to_add.blank?
 
     URI(original_uri).tap do |uri|
-      query = params(uri).merge(params_to_add || {})
+      query = params(uri).merge(params_to_add)
       uri.query = query.empty? ? nil : query.to_query
     end.to_s
   rescue URI::BadURIError, URI::InvalidURIError

app/views/devise/sessions/new.html.erb

@@ -101,7 +101,8 @@
 <% if IdentityConfig.store.participate_in_dap %>
   <!-- <%= t('notices.dap_participation') %> -->
   <%= javascript_packs_tag_once(
-        'https://dap.digitalgov.gov/Universal-Federated-Analytics-Min.js?agency=GSA&subagency=TTS',
+        'digital-analytics-program',
+        url_params: { agency: 'GSA', subagency: 'TTS' },
         defer: true,
         id: '_fed_an_ua_tag',
         preload_links_header: false,

package.json

@@ -9,6 +9,7 @@
     "app/javascript/packages/*"
   ],
   "scripts": {
+    "postinstall": "yarn workspace @18f/identity-analytics run postinstall",
     "typecheck": "tsc",
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx",
     "lint:css": "stylelint 'app/assets/stylesheets/**/*.scss' 'app/javascript/**/*.scss' 'app/components/*.scss'",

spec/helpers/script_helper_spec.rb

@@ -128,6 +128,38 @@
         end
       end
 
+      context 'with url parameters' do
+        before do
+          javascript_packs_tag_once(
+            'digital-analytics-program',
+            url_params: { agency: 'gsa' },
+            async: true,
+          )
+          allow(Rails.application.config.asset_sources).to receive(:get_sources).
+            with('digital-analytics-program').and_return(['/digital-analytics-program.js'])
+          allow(Rails.application.config.asset_sources).to receive(:get_assets).
+            with('application', 'document-capture', 'digital-analytics-program').
+            and_return([])
+        end
+
+        it 'includes url parameters in script url for the pack' do
+          output = render_javascript_pack_once_tags
+
+          expect(output).to have_css(
+            "script[src^='/digital-analytics-program.js?agency=gsa'][async]:not([url_params])",
+            count: 1,
+            visible: :all,
+          )
+
+          # URL parameters should not be added to other scripts
+          expect(output).to have_css(
+            "script[src^='/application.js']",
+            count: 1,
+            visible: :all,
+          )
+        end
+      end
+
       context 'local development crossorigin sources' do
         let(:webpack_port) { '3035' }
 

spec/requests/csp_spec.rb

@@ -229,7 +229,6 @@
         content_security_policy = parse_content_security_policy
 
         # See: https://github.com/digital-analytics-program/gov-wide-code#content-security-policy
-        expect(content_security_policy['script-src']).to include('dap.digitalgov.gov')
         expect(content_security_policy['script-src']).to include('www.google-analytics.com')
         expect(content_security_policy['script-src']).to include('www.googletagmanager.com')
         expect(content_security_policy['connect-src']).to include('www.google-analytics.com')
@@ -243,7 +242,6 @@
         content_security_policy = parse_content_security_policy
 
         # See: https://github.com/digital-analytics-program/gov-wide-code#content-security-policy
-        expect(content_security_policy['script-src']).not_to include('dap.digitalgov.gov')
         expect(content_security_policy['script-src']).not_to include('www.google-analytics.com')
         expect(content_security_policy['script-src']).not_to include('www.googletagmanager.com')
         expect(content_security_policy['connect-src']).not_to include('www.google-analytics.com')

spec/services/uri_service_spec.rb

@@ -72,5 +72,27 @@
 
       expect(uri).to eq('https://example.com/foo/bar/?query=value#fragment')
     end
+
+    context 'with a uri object' do
+      let(:params_to_add) {}
+      let(:original_uri) { URI('https://example.com/foo/bar/') }
+      subject(:uri) { UriService.add_params(original_uri, params_to_add) }
+
+      context 'without parameters to add' do
+        let(:params_to_add) { nil }
+
+        it 'returns the original uri as a string' do
+          expect(uri).to eq('https://example.com/foo/bar/')
+        end
+      end
+
+      context 'with parameters to add' do
+        let(:params_to_add) { { query: 'value' } }
+
+        it 'returns a string of the original uri with parameters added' do
+          expect(uri).to eq('https://example.com/foo/bar/?query=value')
+        end
+      end
+    end
   end
 end

spec/views/devise/sessions/new.html.erb_spec.rb

@@ -194,7 +194,8 @@
       it 'renders DAP analytics' do
         allow(view).to receive(:javascript_packs_tag_once)
         expect(view).to receive(:javascript_packs_tag_once).with(
-          a_string_matching('https://dap.digitalgov.gov/'),
+          'digital-analytics-program',
+          url_params: { agency: 'GSA', subagency: 'TTS' },
           defer: true,
           preload_links_header: false,
           id: '_fed_an_ua_tag',

tsconfig.json

@@ -26,5 +26,9 @@
     "./*.js",
     "scripts"
   ],
-  "exclude": ["**/fixtures", "spec/**/*.spec.js"]
+  "exclude": [
+    "**/fixtures",
+    "spec/**/*.spec.js",
+    "app/javascript/packages/analytics/digital-analytics-program*.js"
+  ]
 }