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

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

@@ -1,8 +1,8 @@
-import { __decorate, __values, __assign } from 'tslib';
+import { __decorate, __assign, __values } 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';
@@ -58,7 +58,7 @@ var QueryParameters = /** @class */ (function () {
         this.sortByStreetNumber = enable;
     };
     QueryParameters.prototype.sortByBox = function (enable) {
-        this.sortbyBoxNumber = enable;
+        this.sortByBoxNumber = enable;
     };
     return QueryParameters;
 }());
@@ -67,13 +67,26 @@ var HttpService = /** @class */ (function () {
     function HttpService(httpClient) {
         this.httpClient = httpClient;
         this.openConnections = 0;
+        this.apiKey = 'no-value';
     }
+    HttpService.prototype.setApiKey = function (apiKey) {
+        this.apiKey = apiKey;
+    };
+    HttpService.prototype.getHttpHeaders = function () {
+        var 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;
+    };
     HttpService.prototype.get = function (url, options) {
         return this.request('GET', url, options);
     };
     HttpService.prototype.request = function (method, url, options) {
         var _this = this;
         options = !!options ? options : {};
+        options = __assign(__assign({}, options), { headers: this.getHttpHeaders() });
+        console.log('options:', JSON.stringify(options));
         this.openConnections++;
         return this.httpClient.request(method, url, options).pipe(map(function (response) { return _this.handleResponse(response); }), catchError(function (error) { return _this.handleError(error); }));
     };
@@ -204,6 +217,7 @@ var AddressService = /** @class */ (function () {
         this.httpService = httpService;
         this.domain = 'http://10.194.73.9:8080';
         this.localityURL = this.domain + '/AddressAutoComplete/autocomplete/locality?IncludeGeographicalSanction=true';
+        this.log = true;
     }
     AddressService.prototype.getLocality = function (baseUrl, params) {
         var _this = this;
@@ -1203,11 +1217,29 @@ var LocalityComponent = /** @class */ (function () {
             var 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);
+                    }
                 }
             }
         }
@@ -4025,6 +4057,8 @@ var 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;
@@ -4041,32 +4075,34 @@ var PrefillData // extends PrefilledParameters
 }());
 
 var LibAddressAutocompleteByComponentComponent = /** @class */ (function () {
-    function LibAddressAutocompleteByComponentComponent() {
+    function LibAddressAutocompleteByComponentComponent(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;
@@ -4077,6 +4113,8 @@ var LibAddressAutocompleteByComponentComponent = /** @class */ (function () {
         this.validationMessageEventEmitter = new EventEmitter();
         this.clearInputEventEmitter = new EventEmitter();
         this.processingPrefillData = false;
+        // Pass the API key as a property of the library !
+        this.apiKey = 'cyRkKOD73O1DOdgcDLLnsaOiDh6OyOkt3BBT5JU1';
     }
     Object.defineProperty(LibAddressAutocompleteByComponentComponent.prototype, "inputLang", {
         // @ts-ignore
@@ -4103,6 +4141,7 @@ var LibAddressAutocompleteByComponentComponent = /** @class */ (function () {
         configurable: true
     });
     LibAddressAutocompleteByComponentComponent.prototype.ngOnInit = function () {
+        this.httpService.setApiKey(this.apiKey);
         if (this.addressParams) {
             this.prefillData = this.addressParams;
         }
@@ -4119,6 +4158,9 @@ var LibAddressAutocompleteByComponentComponent = /** @class */ (function () {
             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;
@@ -4979,6 +5021,9 @@ var LibAddressAutocompleteByComponentComponent = /** @class */ (function () {
         }
         this.quitPrefillMode();
     };
+    LibAddressAutocompleteByComponentComponent.ctorParameters = function () { return [
+        { type: HttpService }
+    ]; };
     __decorate([
         ViewChild(LocalityComponent, { static: false })
     ], LibAddressAutocompleteByComponentComponent.prototype, "autocompleteLocality", void 0);
@@ -5075,6 +5120,9 @@ var LibAddressAutocompleteByComponentComponent = /** @class */ (function () {
     __decorate([
         Output()
     ], LibAddressAutocompleteByComponentComponent.prototype, "clearInputEventEmitter", void 0);
+    __decorate([
+        Input()
+    ], LibAddressAutocompleteByComponentComponent.prototype, "apiKey", void 0);
     LibAddressAutocompleteByComponentComponent = __decorate([
         Component({
             selector: 'bp-lib-address-autocomplete-by-component',