Merge pull request #2042 from ORCID/HttpHeaderInterceptor

Interceptor

src/app/app.module.ts

@@ -11,6 +11,8 @@ import { LayoutModule } from './layout/layout.module'
 import { BidiModule } from '@angular/cdk/bidi'
 import { PseudoModule } from 'src/locale/i18n.pseudo.component'
 import { TitleService } from './core/title-service/title.service'
+import { HttpContentTypeHeaderInterceptor } from './core/http-content-type-header-interceptor/http-content-type-header-interceptor'
+import { HTTP_INTERCEPTORS } from '@angular/common/http'
 
 @NgModule({
   declarations: [AppComponent],
@@ -25,7 +27,7 @@ import { TitleService } from './core/title-service/title.service'
     // Environmental dependent modules
     environment.SHOW_TEST_WARNING_BANNER ? EnvironmentBannerModule : [],
   ],
-  providers: [TitleService],
+  providers: [TitleService, {provide:HTTP_INTERCEPTORS, useClass:HttpContentTypeHeaderInterceptor, multi:true}],
   bootstrap: [AppComponent],
 })
 export class AppModule {

src/app/core/account-actions-deactivate/account-actions-deactivate.service.ts

@@ -12,7 +12,6 @@ import { ErrorHandlerService } from '../error-handler/error-handler.service'
 export class AccountActionsDeactivateService {
   headers = new HttpHeaders({
     'Access-Control-Allow-Origin': '*',
-    'Content-Type': 'text/plain charset=utf-8',
   })
   options: { headers: any; responseType: 'text' }
 

src/app/core/account-actions-download/account-actions-download.service.ts

@@ -1,4 +1,4 @@
-import { HttpClient, HttpHeaders } from '@angular/common/http'
+import { HttpClient } from '@angular/common/http'
 import { Inject, Injectable } from '@angular/core'
 import { catchError, retry, tap } from 'rxjs/operators'
 import { WINDOW } from 'src/app/cdk/window'
@@ -9,10 +9,7 @@ import { ErrorHandlerService } from '../error-handler/error-handler.service'
   providedIn: 'root',
 })
 export class AccountActionsDownloadService {
-  headers = new HttpHeaders({
-    'Access-Control-Allow-Origin': '*',
-    'Content-Type': 'application/json',
-  })
+
   constructor(
     private _errorHandler: ErrorHandlerService,
     private _http: HttpClient,

src/app/core/account-actions-duplicated/account-actions-duplicated.service.ts

@@ -13,8 +13,7 @@ import { ErrorHandlerService } from '../error-handler/error-handler.service'
 })
 export class AccountActionsDuplicatedService {
   headers = new HttpHeaders({
-    'Access-Control-Allow-Origin': '*',
-    'Content-Type': 'application/json',
+    'Access-Control-Allow-Origin': '*',    
   })
   constructor(
     private _errorHandler: ErrorHandlerService,

src/app/core/account-default-email-frequencies/account-default-email-frequencies.service.ts

@@ -12,8 +12,7 @@ import { ErrorHandlerService } from '../error-handler/error-handler.service'
 })
 export class AccountDefaultEmailFrequenciesService {
   headers = new HttpHeaders({
-    'Access-Control-Allow-Origin': '*',
-    'Content-Type': 'application/json',
+    'Access-Control-Allow-Origin': '*',    
   })
   constructor(
     private _errorHandler: ErrorHandlerService,

src/app/core/account-default-visibility/account-default-visibility.service.ts

@@ -11,8 +11,7 @@ import { ErrorHandlerService } from '../error-handler/error-handler.service'
 })
 export class AccountDefaultVisibilityService {
   headers = new HttpHeaders({
-    'Access-Control-Allow-Origin': '*',
-    'Content-Type': 'application/json',
+    'Access-Control-Allow-Origin': '*',    
   })
 
   constructor(

src/app/core/account-security-alternate-sign-in/account-security-alternate-sign-in.service.ts

@@ -19,8 +19,7 @@ import { ErrorHandlerService } from '../error-handler/error-handler.service'
 })
 export class AccountSecurityAlternateSignInService {
   headers = new HttpHeaders({
-    'Access-Control-Allow-Origin': '*',
-    'Content-Type': 'application/json',
+    'Access-Control-Allow-Origin': '*',    
   })
   constructor(
     private _errorHandler: ErrorHandlerService,

src/app/core/account-security-password/account-security-password.service.ts

@@ -13,7 +13,6 @@ import { ErrorHandlerService } from '../error-handler/error-handler.service'
 export class AccountSecurityPasswordService {
   headers = new HttpHeaders({
     'Access-Control-Allow-Origin': '*',
-    'Content-Type': 'application/json',
   })
 
   constructor(

src/app/core/account-trusted-individuals/account-trusted-individuals.service.ts

@@ -22,7 +22,6 @@ export class AccountTrustedIndividualsService {
 
   headers = new HttpHeaders({
     'Access-Control-Allow-Origin': '*',
-    'Content-Type': 'application/json',
   })
   constructor(
     private _errorHandler: ErrorHandlerService,

src/app/core/account-trusted-organizations/account-trusted-organizations.service.ts

@@ -13,7 +13,6 @@ import { ErrorHandlerService } from '../error-handler/error-handler.service'
 export class AccountTrustedOrganizationsService {
   headers = new HttpHeaders({
     'Access-Control-Allow-Origin': '*',
-    'Content-Type': 'application/json',
   })
   constructor(
     private _errorHandler: ErrorHandlerService,

src/app/core/http-content-type-header-interceptor/http-content-type-header-interceptor.ts

@@ -0,0 +1,34 @@
+import { HttpHandler, HttpInterceptor, HttpRequest } from "@angular/common/http";
+import { Injectable } from "@angular/core";
+
+@Injectable()
+export class HttpContentTypeHeaderInterceptor implements HttpInterceptor {
+
+    private formUrlEcondedUrls = ["/sendReactivation.json", "/social/signin/auth.json", "/shibboleth/signin/auth.json", "/signin/auth.json"];
+
+    construct () {
+
+    }
+
+    intercept(req:HttpRequest<any>, next: HttpHandler) {
+        var method = req.method
+        var urlWithParams = req.urlWithParams
+        // If the request contains a content type, be sure to set the encoding to utf-8        
+        if(['POST', 'PUT'].includes(method)) {
+            var clonedRequest;
+            if(this.formUrlEcondedUrls.includes(urlWithParams)) {
+                clonedRequest = req.clone({
+                    headers: req.headers.set('Content-Type', 'application/x-www-form-urlencoded;charset=utf-8')
+                });
+            } else {
+                clonedRequest = req.clone({
+                    headers: req.headers.set('Content-Type', 'application/json;charset=utf-8')
+                });                
+            }
+
+            return next.handle(clonedRequest);
+        }         
+        // Nothing changed, continue using the same request object
+        return next.handle(req);
+    }
+}

src/app/core/inbox/inbox.service.ts

@@ -45,7 +45,6 @@ export class InboxService {
   ) {
     this.headers = new HttpHeaders({
       'Access-Control-Allow-Origin': '*',
-      'Content-Type': 'application/json',
     })
   }
 

src/app/core/oauth/oauth.service.ts

@@ -47,7 +47,6 @@ export class OauthService {
   ) {
     this.headers = new HttpHeaders({
       'Access-Control-Allow-Origin': '*',
-      'Content-Type': 'application/json',
     })
   }
 

src/app/core/password-recovery/password-recovery.service.ts

@@ -20,7 +20,6 @@ export class PasswordRecoveryService {
   ) {}
   headers = new HttpHeaders({
     'Access-Control-Allow-Origin': '*',
-    'Content-Type': 'application/json',
   })
 
   resetPassword(data) {

src/app/core/record-affiliations/record-affiliations.service.ts

@@ -27,7 +27,6 @@ export class RecordAffiliationService {
   lastEmittedValue: AffiliationUIGroup[]
   headers = new HttpHeaders({
     'Access-Control-Allow-Origin': '*',
-    'Content-Type': 'application/json',
   })
 
   $affiliations: ReplaySubject<AffiliationUIGroup[]>

src/app/core/record-biography/record-biography.service.ts

@@ -15,7 +15,6 @@ export class RecordBiographyService {
   $biography: ReplaySubject<BiographyEndPoint>
   headers = new HttpHeaders({
     'Access-Control-Allow-Origin': '*',
-    'Content-Type': 'application/json',
   })
 
   constructor(

src/app/core/record-countries/record-countries.service.ts

@@ -18,7 +18,6 @@ export class RecordCountriesService {
   $addresses: ReplaySubject<CountriesEndpoint>
   headers = new HttpHeaders({
     'Access-Control-Allow-Origin': '*',
-    'Content-Type': 'application/json',
   })
 
   constructor(

src/app/core/record-emails/record-emails.service.ts

@@ -25,7 +25,6 @@ import { RecordPublicSideBarService } from '../record-public-side-bar/record-pub
 export class RecordEmailsService {
   headers = new HttpHeaders({
     'Access-Control-Allow-Origin': '*',
-    'Content-Type': 'application/json',
   })
   private $emailsSubject
 

src/app/core/record-fundings/record-fundings.service.ts

@@ -16,8 +16,7 @@ import { RecordImportWizard } from '../../types/record-peer-review-import.endpoi
 export class RecordFundingsService {
   lastEmittedValue: FundingGroup[]
   headers = new HttpHeaders({
-    'Access-Control-Allow-Origin': '*',
-    'Content-Type': 'application/json',
+    'Access-Control-Allow-Origin': '*',    
   })
 
   $fundings: ReplaySubject<FundingGroup[]> = new ReplaySubject<FundingGroup[]>()

src/app/core/record-keyword/record-keyword.service.ts

@@ -15,7 +15,6 @@ export class RecordKeywordService {
   $keywords: ReplaySubject<KeywordEndPoint>
   headers = new HttpHeaders({
     'Access-Control-Allow-Origin': '*',
-    'Content-Type': 'application/json',
   })
 
   constructor(

src/app/core/record-names/record-names.service.ts

@@ -15,7 +15,6 @@ export class RecordNamesService {
   $names: ReplaySubject<NamesEndPoint>
   headers = new HttpHeaders({
     'Access-Control-Allow-Origin': '*',
-    'Content-Type': 'application/json',
   })
 
   constructor(

src/app/core/record-other-names/record-other-names.service.ts

@@ -16,7 +16,6 @@ export class RecordOtherNamesService {
   $otherNames: ReplaySubject<OtherNamesEndPoint>
   headers = new HttpHeaders({
     'Access-Control-Allow-Origin': '*',
-    'Content-Type': 'application/json',
   })
 
   constructor(

src/app/core/record-peer-review/record-peer-review.service.ts

@@ -17,7 +17,6 @@ export class RecordPeerReviewService {
   $peer: ReplaySubject<PeerReview[]> = new ReplaySubject<PeerReview[]>()
   headers = new HttpHeaders({
     'Access-Control-Allow-Origin': '*',
-    'Content-Type': 'application/json',
   })
   lastEmittedValue: PeerReview[]
 

src/app/core/record-personal-identifiers/record-person-identifier.service.ts

@@ -18,7 +18,6 @@ export class RecordPersonIdentifierService {
   $privatePersonIdentifier: ReplaySubject<PersonIdentifierEndpoint>
   headers = new HttpHeaders({
     'Access-Control-Allow-Origin': '*',
-    'Content-Type': 'application/json',
   })
 
   constructor(

src/app/core/record-public-side-bar/record-public-side-bar.service.ts

@@ -24,7 +24,6 @@ export class RecordPublicSideBarService {
 
   headers = new HttpHeaders({
     'Access-Control-Allow-Origin': '*',
-    'Content-Type': 'application/json',
   })
 
   getPublicRecordSideBar(

src/app/core/record-research-resource/record-research-resource.service.ts

@@ -22,7 +22,6 @@ export class RecordResearchResourceService {
 
   headers = new HttpHeaders({
     'Access-Control-Allow-Origin': '*',
-    'Content-Type': 'application/json',
   })
 
   constructor(

src/app/core/record-websites/record-websites.service.ts

@@ -15,7 +15,6 @@ export class RecordWebsitesService {
   $websites: ReplaySubject<WebsitesEndPoint>
   headers = new HttpHeaders({
     'Access-Control-Allow-Origin': '*',
-    'Content-Type': 'application/json',
   })
 
   constructor(

src/app/core/record-works/record-works.service.ts

@@ -430,8 +430,7 @@ export class RecordWorksService {
       JSON.stringify(obj),
       {
         headers: {
-          'Access-Control-Allow-Origin': '*',
-          'Content-Type': 'application/json',
+          'Access-Control-Allow-Origin': '*',          
         },
       }
     )
@@ -448,7 +447,6 @@ export class RecordWorksService {
           {
             headers: {
               'Access-Control-Allow-Origin': '*',
-              'Content-Type': 'application/json',
             },
           }
         )

src/app/core/record/record.service.ts

@@ -79,7 +79,6 @@ export class RecordService {
 
   headers = new HttpHeaders({
     'Access-Control-Allow-Origin': '*',
-    'Content-Type': 'application/json',
   })
 
   subscriptionSourceCountDebugger = 0

src/app/core/sign-in/sign-in.service.ts

@@ -1,4 +1,4 @@
-import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'
+import { HttpClient, HttpParams } from '@angular/common/http'
 import { Injectable } from '@angular/core'
 import { catchError, map, retry, switchMap, first } from 'rxjs/operators'
 
@@ -16,19 +16,15 @@ import { Title } from '@angular/platform-browser'
 @Injectable({
   providedIn: 'root',
 })
-export class SignInService {
-  private headers: HttpHeaders
+export class SignInService {  
 
   constructor(
     private _http: HttpClient,
     private _titleService: Title,
     private _errorHandler: ErrorHandlerService,
     private _userService: UserService
   ) {
-    this.headers = new HttpHeaders().set(
-      'Content-Type',
-      'application/x-www-form-urlencoded;charset=utf-8'
-    )
+
   }
   /**
    * @param  SignInLocal sign in information
@@ -61,8 +57,7 @@ export class SignInService {
     }
     body = body.set('oauthRequest', signInLocal.isOauth ? 'true' : 'false')
     return this._http
-      .post<SignIn>(environment.API_WEB + loginUrl, body, {
-        headers: this.headers,
+      .post<SignIn>(environment.API_WEB + loginUrl, body, {        
         withCredentials: true,
       })
       .pipe(
@@ -84,8 +79,7 @@ export class SignInService {
     let body = new HttpParams({ encoder: new CustomEncoder() })
     body = body.set('email', email)
     return this._http
-      .post<Reactivation>(environment.API_WEB + `sendReactivation.json`, body, {
-        headers: this.headers,
+      .post<Reactivation>(environment.API_WEB + `sendReactivation.json`, body, {        
         withCredentials: true,
       })
       .pipe(
@@ -102,8 +96,7 @@ export class SignInService {
   singOut() {
     this._titleService.setTitle('ORCID')
     return this._http
-      .get<SignIn>(environment.API_WEB + 'userStatus.json?logUserOut=true', {
-        headers: this.headers,
+      .get<SignIn>(environment.API_WEB + 'userStatus.json?logUserOut=true', {        
         withCredentials: true,
       })
       .pipe(

src/app/core/trusted-summary/trusted-summary.service.ts

@@ -13,7 +13,6 @@ import { ERROR_REPORT } from 'src/app/errors'
 export class TrustedSummaryService {
   headers = new HttpHeaders({
     'Access-Control-Allow-Origin': '*',
-    'Content-Type': 'application/json',
   })
 
   constructor(

src/app/core/two-factor-authentication/two-factor-authentication.service.ts

@@ -18,7 +18,6 @@ import { ErrorHandlerService } from '../error-handler/error-handler.service'
 export class TwoFactorAuthenticationService {
   headers = new HttpHeaders({
     'Access-Control-Allow-Origin': '*',
-    'Content-Type': 'application/json',
   })
 
   constructor(

src/app/core/user/user.service.ts

@@ -54,7 +54,6 @@ import { UserInfoService } from '../user-info/user-info.service'
 export class UserService {
   headers = new HttpHeaders({
     'Access-Control-Allow-Origin': '*',
-    'Content-Type': 'application/json',
   })
 
   constructor(