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

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

@@ -273,7 +273,7 @@
             this.sortByStreetNumber = enable;
         };
         QueryParameters.prototype.sortByBox = function (enable) {
-            this.sortbyBoxNumber = enable;
+            this.sortByBoxNumber = enable;
         };
         return QueryParameters;
     }());
@@ -282,13 +282,26 @@
         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 http.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(operators.map(function (response) { return _this.handleResponse(response); }), operators.catchError(function (error) { return _this.handleError(error); }));
         };
@@ -419,6 +432,7 @@
             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;
@@ -1418,11 +1432,29 @@
                 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);
+                        }
                     }
                 }
             }
@@ -4240,6 +4272,8 @@
             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;
@@ -4256,32 +4290,34 @@
     }());
 
     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;
@@ -4292,6 +4328,8 @@
             this.validationMessageEventEmitter = new core.EventEmitter();
             this.clearInputEventEmitter = new core.EventEmitter();
             this.processingPrefillData = false;
+            // Pass the API key as a property of the library !
+            this.apiKey = 'cyRkKOD73O1DOdgcDLLnsaOiDh6OyOkt3BBT5JU1';
         }
         Object.defineProperty(LibAddressAutocompleteByComponentComponent.prototype, "inputLang", {
             // @ts-ignore
@@ -4318,6 +4356,7 @@
             configurable: true
         });
         LibAddressAutocompleteByComponentComponent.prototype.ngOnInit = function () {
+            this.httpService.setApiKey(this.apiKey);
             if (this.addressParams) {
                 this.prefillData = this.addressParams;
             }
@@ -4334,6 +4373,9 @@
                 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;
@@ -5194,6 +5236,9 @@
             }
             this.quitPrefillMode();
         };
+        LibAddressAutocompleteByComponentComponent.ctorParameters = function () { return [
+            { type: HttpService }
+        ]; };
         __decorate([
             core.ViewChild(LocalityComponent, { static: false })
         ], LibAddressAutocompleteByComponentComponent.prototype, "autocompleteLocality", void 0);
@@ -5290,6 +5335,9 @@
         __decorate([
             core.Output()
         ], LibAddressAutocompleteByComponentComponent.prototype, "clearInputEventEmitter", void 0);
+        __decorate([
+            core.Input()
+        ], LibAddressAutocompleteByComponentComponent.prototype, "apiKey", void 0);
         LibAddressAutocompleteByComponentComponent = __decorate([
             core.Component({
                 selector: 'bp-lib-address-autocomplete-by-component',