Merge branch 'main' into lmendoza/9422-email-domains-interstitial-oauth

CHANGELOG.md

@@ -1,3 +1,13 @@
+## v2.107.3 - 2024-11-04
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.107.2...v2.107.3)
+
+## v2.107.2 - 2024-11-04
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.107.1...v2.107.2)
+
+- [#2386](https://github.com/ORCID/orcid-angular/pull/2386): Lmendoza/9422 email domains interstitial oauth
+
 ## v2.107.1 - 2024-10-30
 
 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.107.0...v2.107.1)

guides/example-tx-config.yml

@@ -199,4 +199,4 @@ filters:
     source_language: en
     source_file: src/locale/properties/interstitials/interstitials.en.properties
     # path expression to translation files, must contain <lang> placeholder
-    translation_files_expression: src/locale/properties/interstitials/interstitials.<lang>.properties
+    translation_files_expression: src/locale/properties/interstitials/interstitials.<lang>.properties

src/app/authorize/authorize.module.ts

@@ -37,7 +37,7 @@ import { InterstitialsModule } from '../cdk/interstitials/interstitials.module'
     TrustedIndividualsDropdownModule,
     InfoDropDownModule,
     MatProgressBarModule,
-    InterstitialsModule
+    InterstitialsModule,
   ],
 })
 export class AuthorizeModule {}

src/app/cdk/info-panel/info-panel/info-panel.component.spec.ts

@@ -1,21 +1,21 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing'
 
-import { InfoPanelComponent } from './info-panel.component';
+import { InfoPanelComponent } from './info-panel.component'
 
 describe('InfoPanelComponent', () => {
-  let component: InfoPanelComponent;
-  let fixture: ComponentFixture<InfoPanelComponent>;
+  let component: InfoPanelComponent
+  let fixture: ComponentFixture<InfoPanelComponent>
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      declarations: [InfoPanelComponent]
-    });
-    fixture = TestBed.createComponent(InfoPanelComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+      declarations: [InfoPanelComponent],
+    })
+    fixture = TestBed.createComponent(InfoPanelComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
 
   it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
+    expect(component).toBeTruthy()
+  })
+})

src/app/cdk/info-panel/info-panel/info-panel.component.ts

@@ -1,10 +1,11 @@
-import { Component } from '@angular/core';
+import { Component } from '@angular/core'
 
 @Component({
   selector: 'app-info-panel',
   templateUrl: './info-panel.component.html',
-  styleUrls: ['./info-panel.component.scss', './info-panel.component.scss-theme.scss']
+  styleUrls: [
+    './info-panel.component.scss',
+    './info-panel.component.scss-theme.scss',
+  ],
 })
-export class InfoPanelComponent {
-
-}
+export class InfoPanelComponent {}

src/app/cdk/interstitials/share-emails-domains/share-emails-domains.component.scss

@@ -1,12 +1,10 @@
 @import '../../../../assets/scss/orcid.spacing.scss';
 
-
 h2 {
   margin-top: 16px;
   margin-bottom: 16px;
-
 }
-.published-email-container{
+.published-email-container {
   display: flex;
   align-items: center;
 }
@@ -65,7 +63,6 @@ mat-divider {
   margin-bottom: 16px;
 }
 
-
 mat-divider.last {
   margin-top: 32px;
   margin-bottom: 32px;

src/app/cdk/interstitials/share-emails-domains/share-emails-domains.component.scss-theme.scss

@@ -12,13 +12,11 @@
     background-color: mat.get-color-from-palette($primary, 700);
   }
 
-  ::ng-deep{
+  ::ng-deep {
     .mat-divider.green-divider {
       border: solid 1px mat.get-color-from-palette($foreground, brand-primary);
     }
   }
 }
 
-
-
 @include theme($orcid-app-theme);

src/app/cdk/interstitials/share-emails-domains/share-emails-domains.component.ts

@@ -60,9 +60,8 @@ export class ShareEmailsDomainsComponent {
 
   accept(answear: boolean) {
     this.domainToMakePublic = this.form.value.items
-    .filter((item) => item.selected)
-    .map((item) => item.email)
-
+      .filter((item) => item.selected)
+      .map((item) => item.email)
 
     if (answear && this.domainToMakePublic.length > 0) {
       this.userEmailsJson.emailDomains.forEach((domain) => {

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]*)?)/

yarn.lock

@@ -5950,7 +5950,7 @@ blocking-proxy@^1.0.0:
   dependencies:
     minimist "^1.2.0"
 
-[email protected]:
+[email protected], body-parser@^1.19.0:
   version "1.20.3"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.3.tgz#1953431221c6fb5cd63c4b36d53fab0928e548c6"
   integrity sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==
@@ -5968,24 +5968,6 @@ [email protected]:
     type-is "~1.6.18"
     unpipe "1.0.0"
 
-body-parser@^1.19.0:
-  version "1.20.2"
-  resolved "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz"
-  integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==
-  dependencies:
-    bytes "3.1.2"
-    content-type "~1.0.5"
-    debug "2.6.9"
-    depd "2.0.0"
-    destroy "1.2.0"
-    http-errors "2.0.0"
-    iconv-lite "0.4.24"
-    on-finished "2.4.1"
-    qs "6.11.0"
-    raw-body "2.5.2"
-    type-is "~1.6.18"
-    unpipe "1.0.0"
-
 bonjour-service@^1.0.11:
   version "1.1.1"
   resolved "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.1.tgz"
@@ -13683,13 +13665,6 @@ qjobs@^1.2.0:
   resolved "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz"
   integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==
 
-[email protected]:
-  version "6.11.0"
-  resolved "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz"
-  integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==
-  dependencies:
-    side-channel "^1.0.4"
-
 [email protected]:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906"