Merge branch 'lmendoza/9619-show-interstitial-for-re-authorise-reques…

…ts' of github.com:ORCID/orcid-angular into lmendoza/9619-show-interstitial-for-re-authorise-requests
ORCID · Feb 11, 2025 · d5c3c9d · d5c3c9d
2 parents 2ea01a8 + 8240b52
commit d5c3c9d
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## v2.111.5 - 2025-02-11
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.111.4...v2.111.5)
+
+- [#2465](https://github.com/ORCID/orcid-angular/pull/2465): Lmendoza/onetrust2
+
 ## v2.111.4 - 2025-02-11
 
 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.111.3...v2.111.4)

diff --git a/src/app/cdk/platform-info/browserlist.regexp.ts b/src/app/cdk/platform-info/browserlist.regexp.ts
@@ -1,2 +1,3 @@
 // tslint:disable-next-line: max-line-length
-export const BROWSERLIST_REGEXP = /((CPU[ +]OS|iPhone[ +]OS|CPU[ +]iPhone|CPU IPhone OS)[ +]+(13[_.]4|13[_.]([5-9]|\d{2,})|13[_.]7|13[_.]([8-9]|\d{2,})|(1[4-9]|[2-9]\d|\d{3,})[_.]\d+|14[_.]0|14[_.]([1-9]|\d{2,})|14[_.]4|14[_.]([5-9]|\d{2,})|14[_.]8|14[_.](9|\d{2,})|(1[5-9]|[2-9]\d|\d{3,})[_.]\d+|15[_.]0|15[_.]([1-9]|\d{2,})|(1[6-9]|[2-9]\d|\d{3,})[_.]\d+|16[_.]0|16[_.]([1-9]|\d{2,})|(1[7-9]|[2-9]\d|\d{3,})[_.]\d+|17[_.]0|17[_.]([1-9]|\d{2,})|(1[8-9]|[2-9]\d|\d{3,})[_.]\d+)(?:[_.]\d+)?)|((?:Chrome).*OPR\/(74|(7[5-9]|[8-9]\d|\d{3,}))\.\d+\.\d+)|(Edge\/(80|(8[1-9]|9\d|\d{3,})|83|(8[4-9]|9\d|\d{3,}))(?:\.\d+)?)|((Chromium|Chrome)\/(80|(8[1-9]|9\d|\d{3,})|83|(8[4-9]|9\d|\d{3,}))\.\d+(?:\.\d+)?)|(Version\/(13\.1|13\.([2-9]|\d{2,})|(1[4-9]|[2-9]\d|\d{3,})\.\d+|14\.0|14\.([1-9]|\d{2,})|(1[5-9]|[2-9]\d|\d{3,})\.\d+|15\.0|15\.([1-9]|\d{2,})|(1[6-9]|[2-9]\d|\d{3,})\.\d+|16\.0|16\.([1-9]|\d{2,})|(1[7-9]|[2-9]\d|\d{3,})\.\d+|17\.0|17\.([1-9]|\d{2,})|(1[8-9]|[2-9]\d|\d{3,})\.\d+)(?:\.\d+)? Safari\/)|(Firefox\/(78|(79|[8-9]\d|\d{3,}))\.\d+\.\d+)|(Firefox\/(78|(79|[8-9]\d|\d{3,}))\.\d+(pre|[ab]\d+[a-z]*)?)/
+export const BROWSERLIST_REGEXP =
+  /((CPU[ +]OS|iPhone[ +]OS|CPU[ +]iPhone|CPU IPhone OS)[ +]+(13[_.]4|13[_.]([5-9]|\d{2,})|13[_.]7|13[_.]([8-9]|\d{2,})|(1[4-9]|[2-9]\d|\d{3,})[_.]\d+|14[_.]0|14[_.]([1-9]|\d{2,})|14[_.]4|14[_.]([5-9]|\d{2,})|14[_.]8|14[_.](9|\d{2,})|(1[5-9]|[2-9]\d|\d{3,})[_.]\d+|15[_.]0|15[_.]([1-9]|\d{2,})|(1[6-9]|[2-9]\d|\d{3,})[_.]\d+|16[_.]0|16[_.]([1-9]|\d{2,})|(1[7-9]|[2-9]\d|\d{3,})[_.]\d+|17[_.]0|17[_.]([1-9]|\d{2,})|(1[8-9]|[2-9]\d|\d{3,})[_.]\d+)(?:[_.]\d+)?)|((?:Chrome).*OPR\/(74|(7[5-9]|[8-9]\d|\d{3,}))\.\d+\.\d+)|(Edge\/(80|(8[1-9]|9\d|\d{3,})|83|(8[4-9]|9\d|\d{3,}))(?:\.\d+)?)|((Chromium|Chrome)\/(80|(8[1-9]|9\d|\d{3,})|83|(8[4-9]|9\d|\d{3,}))\.\d+(?:\.\d+)?)|(Version\/(13\.1|13\.([2-9]|\d{2,})|(1[4-9]|[2-9]\d|\d{3,})\.\d+|14\.0|14\.([1-9]|\d{2,})|(1[5-9]|[2-9]\d|\d{3,})\.\d+|15\.0|15\.([1-9]|\d{2,})|(1[6-9]|[2-9]\d|\d{3,})\.\d+|16\.0|16\.([1-9]|\d{2,})|(1[7-9]|[2-9]\d|\d{3,})\.\d+|17\.0|17\.([1-9]|\d{2,})|(1[8-9]|[2-9]\d|\d{3,})\.\d+)(?:\.\d+)? Safari\/)|(Firefox\/(78|(79|[8-9]\d|\d{3,}))\.\d+\.\d+)|(Firefox\/(78|(79|[8-9]\d|\d{3,}))\.\d+(pre|[ab]\d+[a-z]*)?)/
diff --git a/src/environments/environment.int.ts b/src/environments/environment.int.ts
@@ -19,7 +19,7 @@ export const environment: EnvironmentInterface = {
   VERBOSE_SNACKBAR_ERRORS_REPORTS: true,
   WORDPRESS_S3: 'https://homepage-prod.orcid.org',
   WORDPRESS_S3_FALLBACK: 'https://homepage-fallback.orcid.org',
-  ONE_TRUST: "5a6d60d3-b085-4e48-8afa-d707c7afc419-test",
+  ONE_TRUST: '5a6d60d3-b085-4e48-8afa-d707c7afc419-test',
   LANGUAGE_MENU_OPTIONS: {
     ar: 'العربية',
     cs: 'Čeština',

diff --git a/src/environments/environment.local.4200.ts b/src/environments/environment.local.4200.ts
@@ -20,7 +20,7 @@ export const environment: EnvironmentInterface = {
   VERBOSE_SNACKBAR_ERRORS_REPORTS: true,
   WORDPRESS_S3: 'https://homepage-qa.orcid.org',
   WORDPRESS_S3_FALLBACK: 'https://homepage-fallback.orcid.org',
-  ONE_TRUST: "5a6d60d3-b085-4e48-8afa-d707c7afc419-test",
+  ONE_TRUST: '5a6d60d3-b085-4e48-8afa-d707c7afc419-test',
   NEW_RELIC_APP: '772335827',
   LANGUAGE_MENU_OPTIONS: {
     ar: 'العربية',

diff --git a/src/environments/environment.local.dev.orcid.org.ts b/src/environments/environment.local.dev.orcid.org.ts
@@ -20,7 +20,7 @@ export const environment: EnvironmentInterface = {
   VERBOSE_SNACKBAR_ERRORS_REPORTS: true,
   WORDPRESS_S3: 'https://homepage-qa.orcid.org',
   WORDPRESS_S3_FALLBACK: 'https://homepage-fallback.orcid.org',
-  ONE_TRUST: "5a6d60d3-b085-4e48-8afa-d707c7afc419-test",
+  ONE_TRUST: '5a6d60d3-b085-4e48-8afa-d707c7afc419-test',
   NEW_RELIC_APP: '772335827',
   LANGUAGE_MENU_OPTIONS: {
     ar: 'العربية',

diff --git a/src/environments/environment.production.ts b/src/environments/environment.production.ts
@@ -20,7 +20,7 @@ export const environment: EnvironmentInterface = {
   WORDPRESS_S3: 'https://homepage-prod.orcid.org',
   WORDPRESS_S3_FALLBACK: 'https://homepage-fallback.orcid.org',
   NEW_RELIC_APP: '772335825',
-  ONE_TRUST: "5a6d60d3-b085-4e48-8afa-d707c7afc419",
+  ONE_TRUST: '5a6d60d3-b085-4e48-8afa-d707c7afc419',
   LANGUAGE_MENU_OPTIONS: {
     ar: 'العربية',
     cs: 'Čeština',

diff --git a/src/environments/environment.qa.ts b/src/environments/environment.qa.ts
@@ -20,7 +20,7 @@ export const environment: EnvironmentInterface = {
   VERBOSE_SNACKBAR_ERRORS_REPORTS: true,
   WORDPRESS_S3: 'https://homepage-qa.orcid.org',
   WORDPRESS_S3_FALLBACK: 'https://homepage-fallback.orcid.org',
-  ONE_TRUST: "5a6d60d3-b085-4e48-8afa-d707c7afc419-test",
+  ONE_TRUST: '5a6d60d3-b085-4e48-8afa-d707c7afc419-test',
   NEW_RELIC_APP: '772335827',
   LANGUAGE_MENU_OPTIONS: {
     ar: 'العربية',

diff --git a/src/environments/environment.sandbox.ts b/src/environments/environment.sandbox.ts
@@ -20,7 +20,7 @@ export const environment: EnvironmentInterface = {
   VERBOSE_SNACKBAR_ERRORS_REPORTS: false,
   WORDPRESS_S3: 'https://homepage-prod.orcid.org',
   WORDPRESS_S3_FALLBACK: 'https://homepage-fallback.orcid.org',
-  ONE_TRUST: "5a6d60d3-b085-4e48-8afa-d707c7afc419-test",
+  ONE_TRUST: '5a6d60d3-b085-4e48-8afa-d707c7afc419-test',
   NEW_RELIC_APP: '772335828',
   LANGUAGE_MENU_OPTIONS: {
     ar: 'العربية',