@bpost/bp-address-auto-complete-by-component 1.0.25 → 1.0.29

package/fesm2015/bpost-bp-address-auto-complete-by-component.js

@@ -2,7 +2,7 @@ import { __decorate } from 'tslib';
 import { ɵɵdefineInjectable, Injectable, ɵɵinject, EventEmitter, ViewChild, Input, Output, Component, Pipe, ElementRef, Renderer2, Directive, NgModule } from '@angular/core';
 import { map, catchError, tap } from 'rxjs/operators';
 import { throwError, BehaviorSubject } from 'rxjs';
-import { HttpClient, HttpClientModule } from '@angular/common/http';
+import { HttpHeaders, HttpClient, HttpClientModule } from '@angular/common/http';
 import { TranslateService, TranslateModule } from '@ngx-translate/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
@@ -56,7 +56,7 @@ class QueryParameters {
         this.sortByStreetNumber = enable;
     }
     sortByBox(enable) {
-        this.sortbyBoxNumber = enable;
+        this.sortByBoxNumber = enable;
     }
 }
 
@@ -64,12 +64,25 @@ let HttpService = class HttpService {
     constructor(httpClient) {
         this.httpClient = httpClient;
         this.openConnections = 0;
+        this.apiKey = 'no-value';
+    }
+    setApiKey(apiKey) {
+        this.apiKey = apiKey;
+    }
+    getHttpHeaders() {
+        let headers = new HttpHeaders();
+        // Attention !
+        // Need to reassign as the 'set' is returning a clone of the headera object !!!
+        headers = headers.set('x-api-key', /*'bBkvimXYnAaEEKMyGqoWO2XiaZCQyqUi7VReYzPJ'*/ this.apiKey);
+        return headers;
     }
     get(url, options) {
         return this.request('GET', url, options);
     }
     request(method, url, options) {
         options = !!options ? options : {};
+        options = Object.assign(Object.assign({}, options), { headers: this.getHttpHeaders() });
+        console.log('options:', JSON.stringify(options));
         this.openConnections++;
         return this.httpClient.request(method, url, options).pipe(map((response) => this.handleResponse(response)), catchError((error) => this.handleError(error)));
     }
@@ -187,6 +200,7 @@ let AddressService = class AddressService {
         this.httpService = httpService;
         this.domain = 'http://10.194.73.9:8080';
         this.localityURL = this.domain + '/AddressAutoComplete/autocomplete/locality?IncludeGeographicalSanction=true';
+        this.log = true;
     }
     getLocality(baseUrl, params) {
         const url = baseUrl !== '' ? baseUrl : this.localityURL;
@@ -1132,11 +1146,29 @@ let LocalityComponent = class LocalityComponent {
             const suggestionMunicipality = this.transformMunicipalityInLowercaseAndWithoutDiacritics(sugAddress.municipalityName);
             if (suggestionLocality === this.prefillData.prefillMunicipalityName
                 || suggestionMunicipality === this.prefillData.prefillMunicipalityName) {
+                if (this.prefillData.prefillMunicipalityAndLocalityPerfectMatchFound === true) {
+                    if (this.showDebugMessageToConsole) {
+                        console.log('LOCALITY - PREFILL - skipping suggestion:', suggestion);
+                    }
+                    if (this.showDebugMessageToConsole) {
+                        console.log('LOCALITY - PREFILL - keeping suggestion:', this.prefillData.prefillMunicipalityPerfectMatchSuggestion);
+                    }
+                    return;
+                }
                 this.prefillData.prefillMunicipalityPerfectMatchFound = true;
                 this.prefillData.prefillMunicipalityPerfectMatchSuggestion = suggestion;
                 this.searchText = sugAddress.postalCode + ' ' + sugAddress.localityName;
-                if (this.showDebugMessageToConsole) {
-                    console.log('LOCALITY - PREFILL - Perfect match:', suggestion);
+                this.prefillData.prefillMunicipalityAndLocalityPerfectMatchFound = (suggestionLocality === this.prefillData.prefillMunicipalityName
+                    && suggestionMunicipality === this.prefillData.prefillMunicipalityName) ? true : false;
+                if (this.prefillData.prefillMunicipalityAndLocalityPerfectMatchFound === true) {
+                    if (this.showDebugMessageToConsole) {
+                        console.log('LOCALITY - PREFILL - Perfect match - Municipality & location:', suggestion);
+                    }
+                }
+                else {
+                    if (this.showDebugMessageToConsole) {
+                        console.log('LOCALITY - PREFILL - Perfect match:', suggestion);
+                    }
                 }
             }
         }
@@ -3855,6 +3887,8 @@ class PrefillData // extends PrefilledParameters
         this.prefillMunicipalityName = null;
         this.prefillMunicipalityPerfectMatchFound = false;
         this.prefillMunicipalityPerfectMatchSuggestion = null;
+        // This is a working field, do not document
+        this.prefillMunicipalityAndLocalityPerfectMatchFound = false;
         this.prefillStreetName = null;
         this.prefillStreetPerfectMatchFound = false;
         this.prefillStreetPerfectMatchSuggestion = null;
@@ -3870,32 +3904,34 @@ class PrefillData // extends PrefilledParameters
 }
 
 let LibAddressAutocompleteByComponentComponent = class LibAddressAutocompleteByComponentComponent {
-    constructor() {
+    constructor(httpService) {
+        this.httpService = httpService;
         this.selectedLanguage = null;
+        this.baseUrl = "https://api.mailops.bpost.cloud/roa-info/externalMailingAddressProofingRest/autocomplete/";
         this.showDebugMessageToConsole = false;
         this.notInListAllowed = true;
         this.messageOption = 'Y';
         // LOCALITY
-        this.localityUrl = 'https://webservices-pub.bpost.be/ws/ExternalMailingAddressProofingCSREST_v1/address/autocomplete/locality';
+        this.localityUrl = this.baseUrl + 'locality';
         this.maxSuggestionLocality = 5;
         this.visibleSuggestionLocalityCount = 5;
         // localityParams: PrefilledParameters;
         this.localityPrefillData = null;
         // STREET
-        this.streetUrl = 'https://webservices-pub.bpost.be/ws/ExternalMailingAddressProofingCSREST_v1/address/autocomplete/street';
+        this.streetUrl = this.baseUrl + 'street';
         this.maxSuggestionStreet = 5;
         this.visibleSuggestionStreetCount = 5;
         // streetParams: PrefilledParameters;
         this.streetPrefillData = null;
         // STREET NUMBER
         // tslint:disable-next-line:max-line-length
-        this.streetNumberUrl = 'https://webservices-pub.bpost.be/ws/ExternalMailingAddressProofingCSREST_v1/address/autocomplete/streetNumber';
+        this.streetNumberUrl = this.baseUrl + 'streetNumber';
         this.maxSuggestionStreetNb = 5;
         this.visibleSuggestionStreetNbCount = 5;
         // streetNumberParams: PrefilledParameters;
         this.streetNumberPrefillData = null;
         // BOX NUMBER
-        this.boxNumberUrl = 'https://webservices-pub.bpost.be/ws/ExternalMailingAddressProofingCSREST_v1/address/autocomplete/boxNumber';
+        this.boxNumberUrl = this.baseUrl + 'boxNumber';
         this.maxSuggestionBoxNb = 5;
         this.visibleSuggestionBoxNbCount = 5;
         // boxParams: PrefilledParameters;
@@ -3906,6 +3942,8 @@ let LibAddressAutocompleteByComponentComponent = class LibAddressAutocompleteByC
         this.validationMessageEventEmitter = new EventEmitter();
         this.clearInputEventEmitter = new EventEmitter();
         this.processingPrefillData = false;
+        // Pass the API key as a property of the library !
+        this.apiKey = 'cyRkKOD73O1DOdgcDLLnsaOiDh6OyOkt3BBT5JU1';
     }
     // @ts-ignore
     set inputLang(val) {
@@ -3920,6 +3958,7 @@ let LibAddressAutocompleteByComponentComponent = class LibAddressAutocompleteByC
         this.setValidationMessageOptionFromInput(option);
     }
     ngOnInit() {
+        this.httpService.setApiKey(this.apiKey);
         if (this.addressParams) {
             this.prefillData = this.addressParams;
         }
@@ -3936,6 +3975,9 @@ let LibAddressAutocompleteByComponentComponent = class LibAddressAutocompleteByC
             if (this.showDebugMessageToConsole) {
                 this.displayParametersChangesToConsole(changes);
             }
+            if (changes.hasOwnProperty('apiKey') && !changes.apiKey.firstChange) {
+                this.httpService.setApiKey(this.apiKey);
+            }
             if (changes.hasOwnProperty('addressParams') && !changes.addressParams.firstChange) {
                 // if (changes.hasOwnProperty('addressParams')) {
                 this.processingPrefillData = true;
@@ -4795,6 +4837,9 @@ let LibAddressAutocompleteByComponentComponent = class LibAddressAutocompleteByC
         this.quitPrefillMode();
     }
 };
+LibAddressAutocompleteByComponentComponent.ctorParameters = () => [
+    { type: HttpService }
+];
 __decorate([
     ViewChild(LocalityComponent, { static: false })
 ], LibAddressAutocompleteByComponentComponent.prototype, "autocompleteLocality", void 0);
@@ -4891,6 +4936,9 @@ __decorate([
 __decorate([
     Output()
 ], LibAddressAutocompleteByComponentComponent.prototype, "clearInputEventEmitter", void 0);
+__decorate([
+    Input()
+], LibAddressAutocompleteByComponentComponent.prototype, "apiKey", void 0);
 LibAddressAutocompleteByComponentComponent = __decorate([
     Component({
         selector: 'bp-lib-address-autocomplete-by-component',