Merge branch 'main' into transifex

CHANGELOG.md

@@ -1,3 +1,31 @@
+## v2.107.4 - 2024-11-04
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.107.3...v2.107.4)
+
+- [#2387](https://github.com/ORCID/orcid-angular/pull/2387): Lmendoza/9422 email domains interstitial oauth
+
+## 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)
+
+## v2.107.0 - 2024-10-30
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.106.12...v2.107.0)
+
+## v2.106.12 - 2024-10-28
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.106.11...v2.106.12)
+
 ## v2.106.11 - 2024-10-21
 
 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.106.10...v2.106.11)

guides/example-tx-config.yml

@@ -192,3 +192,11 @@ filters:
     source_file: src/locale/properties/account/account.en.properties
     # path expression to translation files, must contain <lang> placeholder
     translation_files_expression: src/locale/properties/account/account.<lang>.properties
+
+  - filter_type: file
+    # all supported i18n types: https://docs.transifex.com/formats
+    file_format: UNICODEPROPERTIES
+    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

src/app/authorize/authorize.module.ts

@@ -15,6 +15,8 @@ import { AuthorizeRoutingModule } from './authorize-routing.module'
 import { OauthErrorComponent } from './components/oauth-error/oauth-error.component'
 import { AuthorizeComponent } from './pages/authorize/authorize.component'
 import { FormAuthorizeComponent } from './components/form-authorize/form-authorize.component'
+import { ShareEmailsDomainsComponent } from '../cdk/interstitials/share-emails-domains/share-emails-domains.component'
+import { InterstitialsModule } from '../cdk/interstitials/interstitials.module'
 
 @NgModule({
   declarations: [
@@ -35,6 +37,7 @@ import { FormAuthorizeComponent } from './components/form-authorize/form-authori
     TrustedIndividualsDropdownModule,
     InfoDropDownModule,
     MatProgressBarModule,
+    InterstitialsModule,
   ],
 })
 export class AuthorizeModule {}

src/app/authorize/components/form-authorize/form-authorize.component.ts

@@ -1,4 +1,12 @@
-import { Component, Inject, Input, OnDestroy, OnInit } from '@angular/core'
+import {
+  Component,
+  EventEmitter,
+  Inject,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core'
 import { Router } from '@angular/router'
 import { forkJoin, Observable, Subject } from 'rxjs'
 import { catchError, map, take, takeUntil } from 'rxjs/operators'
@@ -31,6 +39,8 @@ import { Title } from '@angular/platform-browser'
   preserveWhitespaces: true,
 })
 export class FormAuthorizeComponent implements OnInit, OnDestroy {
+  @Output() redirectUrl = new EventEmitter<string>()
+  @Output() organizationName = new EventEmitter<string>()
   environment = environment
   $destroy: Subject<boolean> = new Subject<boolean>()
   orcidUrl: string
@@ -57,7 +67,9 @@ export class FormAuthorizeComponent implements OnInit, OnDestroy {
     private _errorHandler: ErrorHandlerService,
     private _trustedIndividuals: TrustedIndividualsService,
     private _titleService: Title
-  ) {
+  ) {}
+
+  ngOnInit(): void {
     this._platformInfo
       .get()
       .pipe(take(1))
@@ -73,6 +85,7 @@ export class FormAuthorizeComponent implements OnInit, OnDestroy {
         this.loadingUserInfo = false
         this.loadingTrustedIndividuals = false
         this.oauthRequest = userInfo.oauthSession
+        this.organizationName.emit(this.oauthRequest.clientName)
         if (userInfo.loggedIn) {
           this.userName = userInfo.displayName
           this.orcidUrl = userInfo.effectiveOrcidUrl
@@ -92,9 +105,7 @@ export class FormAuthorizeComponent implements OnInit, OnDestroy {
     this._trustedIndividuals.getTrustedIndividuals().subscribe((value) => {
       this.trustedIndividuals = value
     })
-  }
 
-  ngOnInit(): void {
     setTimeout(() => {
       this._titleService.setTitle(
         this.authorizeAccessFor +
@@ -141,8 +152,8 @@ export class FormAuthorizeComponent implements OnInit, OnDestroy {
           )
         )
         .subscribe(
-          () => (this.window as any).outOfRouterNavigation(data.redirectUrl),
-          () => (this.window as any).outOfRouterNavigation(data.redirectUrl)
+          () => this.redirectUrl.next(data.redirectUrl),
+          () => this.redirectUrl.next(data.redirectUrl)
         )
     })
   }

src/app/authorize/pages/authorize/authorize.component.html

@@ -10,10 +10,16 @@
         >
           <app-form-authorize
             *ngIf="showAuthorizationComponent"
+            (redirectUrl)="handleRedirect($event)"
+            (organizationName)="organizationName = $event"
           ></app-form-authorize>
-          <app-oauth-error
-            *ngIf="!showAuthorizationComponent"
-          ></app-oauth-error>
+          <app-share-emails-domains
+            *ngIf="showInterstital"
+            (finish)="finishRedirect()"
+            [userEmailsJson]="originalEmailsBackendCopy"
+            [organizationName]="organizationName"
+          ></app-share-emails-domains>
+          <app-oauth-error *ngIf="showAuthorizationError"></app-oauth-error>
         </mat-card>
       </div>
     </div>

src/app/authorize/pages/authorize/authorize.component.ts

@@ -1,20 +1,45 @@
-import { Component } from '@angular/core'
+import { Component, Inject } from '@angular/core'
+import { cloneDeep } from 'lodash'
+import { first, take, tap } from 'rxjs/operators'
+import { InterstitialsService } from 'src/app/cdk/interstitials/interstitials.service'
 import { PlatformInfo, PlatformInfoService } from 'src/app/cdk/platform-info'
+import { WINDOW } from 'src/app/cdk/window'
 import { UserService } from 'src/app/core'
+import { RecordEmailsService } from 'src/app/core/record-emails/record-emails.service'
+import { TogglzService } from 'src/app/core/togglz/togglz.service'
+import { AssertionVisibilityString, EmailsEndpoint } from 'src/app/types'
 
 @Component({
   templateUrl: './authorize.component.html',
   styleUrls: ['./authorize.component.scss'],
   preserveWhitespaces: true,
 })
 export class AuthorizeComponent {
+  redirectUrl: string
+
   platform: PlatformInfo
   showAuthorizationComponent: boolean
+  showAuthorizationError: boolean
+  showInterstital: boolean
+  originalEmailsBackendCopy: EmailsEndpoint
+  userHasPrivateDomains = false
+  oauthDomainsInterstitialEnabled: boolean
+  organizationName: string
+  domainInterstitialHasBeenViewed: boolean
+  userIsNotImpersonating: boolean
 
-  constructor(_user: UserService, private _platformInfo: PlatformInfoService) {
+  constructor(
+    _user: UserService,
+    private _platformInfo: PlatformInfoService,
+    private _recordEmails: RecordEmailsService,
+    private _togglz: TogglzService,
+    private _interstitials: InterstitialsService,
+    @Inject(WINDOW) private window: Window,
+    private _userInfo: UserService
+  ) {
     _user.getUserSession().subscribe((session) => {
       if (session.oauthSession && session.oauthSession.error) {
-        this.showAuthorizationComponent = false
+        this.showAuthorizationError = true
       } else {
         this.showAuthorizationComponent = true
       }
@@ -23,4 +48,61 @@ export class AuthorizeComponent {
       this.platform = platformInfo
     })
   }
+
+  ngOnInit() {
+    this._userInfo.getUserSession().subscribe((userInfo) => {
+      this.userIsNotImpersonating =
+        userInfo.userInfo.REAL_USER_ORCID ===
+        userInfo.userInfo.EFFECTIVE_USER_ORCID
+    })
+    this._interstitials
+      .getInterstitialsViewed('OAUTH_DOMAIN_INTERSTITIAL')
+      .subscribe((value) => {
+        return (this.domainInterstitialHasBeenViewed = value)
+      })
+
+    this._togglz
+      .getStateOf('OAUTH_DOMAINS_INTERSTITIAL')
+      .pipe(take(1))
+      .subscribe((value) => {
+        this.oauthDomainsInterstitialEnabled = value
+      })
+    this._recordEmails
+      .getEmails()
+      .pipe(
+        tap((value) => {
+          this.originalEmailsBackendCopy = cloneDeep(value)
+          this.userHasPrivateDomains = this.userHasPrivateEmails(value)
+        }),
+        first()
+      )
+      .subscribe()
+  }
+
+  userHasPrivateEmails(value: EmailsEndpoint): boolean {
+    return !!value.emailDomains.find((domain) => domain.visibility !== 'PUBLIC')
+  }
+
+  handleRedirect(url: string) {
+    this.redirectUrl = url
+
+    if (
+      url &&
+      this.userHasPrivateDomains &&
+      this.oauthDomainsInterstitialEnabled &&
+      !this.domainInterstitialHasBeenViewed &&
+      this.userIsNotImpersonating
+    ) {
+      this.showAuthorizationComponent = false
+      this.showInterstital = true
+      this._interstitials
+        .setInterstitialsViewed('OAUTH_DOMAIN_INTERSTITIAL')
+        .subscribe()
+    } else {
+      this.finishRedirect()
+    }
+  }
+  finishRedirect() {
+    ;(this.window as any).outOfRouterNavigation(this.redirectUrl)
+  }
 }

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

@@ -0,0 +1,11 @@
+import { NgModule } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { InfoPanelComponent } from './info-panel/info-panel.component'
+import { MatIcon, MatIconModule } from '@angular/material/icon'
+
+@NgModule({
+  declarations: [InfoPanelComponent],
+  imports: [CommonModule, MatIconModule],
+  exports: [InfoPanelComponent],
+})
+export class InfoPanelModule {}

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

@@ -0,0 +1,10 @@
+<div class="info">
+  <div class="col">
+    <img src="/assets/vectors/check-window.svg" role="presentation" />
+  </div>
+  <div>
+    <p>
+      <ng-content></ng-content>
+    </p>
+  </div>
+</div>

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

@@ -0,0 +1,16 @@
+.info {
+  padding: 16px;
+  margin-top: 16px;
+  margin-bottom: 16px;
+  border: solid 2px;
+  border-radius: 4px;
+  display: flex;
+
+  p {
+    margin: 0;
+  }
+  .col {
+    align-items: start;
+    padding-left: 0;
+  }
+}

src/app/cdk/info-panel/info-panel/info-panel.component.scss-theme.scss

@@ -0,0 +1,23 @@
+@use '@angular/material' as mat;
+@import 'src/assets/scss/material.orcid-theme.scss';
+
+@mixin theme($theme) {
+  $primary: map-get($theme, primary);
+  $accent: map-get($theme, accent);
+  $warn: map-get($theme, accent);
+  $foreground: map-get($theme, foreground);
+  $background: map-get($theme, background);
+
+  .info {
+    border-color: mat.get-color-from-palette(
+      $foreground,
+      'state-info-darkest'
+    ) !important;
+    background-color: mat.get-color-from-palette(
+      $background,
+      'state-info-lightest'
+    ) !important;
+  }
+}
+
+@include theme($orcid-app-theme);

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

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

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

@@ -0,0 +1,11 @@
+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',
+  ],
+})
+export class InfoPanelComponent {}

src/app/cdk/interstitials/interstitials.module.ts

@@ -0,0 +1,32 @@
+import { NgModule } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { ShareEmailsDomainsComponent } from './share-emails-domains/share-emails-domains.component'
+import { MatLegacyCardModule } from '@angular/material/legacy-card'
+import { MatIconModule } from '@angular/material/icon'
+import { MatDividerModule } from '@angular/material/divider'
+import { InfoDropDownModule } from '../info-drop-down/info-drop-down.module'
+import { MatProgressBarModule } from '@angular/material/progress-bar'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { MatCheckboxModule } from '@angular/material/checkbox'
+import { MatLegacyCheckboxModule } from '@angular/material/legacy-checkbox'
+import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'
+import { InfoPanelModule } from '../info-panel/info-panel.module'
+
+@NgModule({
+  declarations: [ShareEmailsDomainsComponent],
+  imports: [
+    CommonModule,
+    MatLegacyCardModule,
+    MatIconModule,
+    MatDividerModule,
+    InfoDropDownModule,
+    MatProgressBarModule,
+    ReactiveFormsModule,
+    FormsModule,
+    MatLegacyCheckboxModule,
+    MatButtonModule,
+    InfoPanelModule,
+  ],
+  exports: [ShareEmailsDomainsComponent],
+})
+export class InterstitialsModule {}