@infrab4a/connect-angular 3.4.0-beta.10 → 3.4.0-beta.3

package/angular-connect.module.d.ts

@@ -11,7 +11,7 @@ export declare class AngularConnectModule {
         firebase: FirebaseOptions;
         elasticSearch: AxiosElasticSearchConfig;
         hasura: HasuraGraphQLOptions;
-        backendUrl: string;
+        apiUrl: string;
     }, nameOrConfig?: string | FirebaseAppConfig): ModuleWithProviders<AngularFireModule>;
     static ɵfac: i0.ɵɵFactoryDeclaration<AngularConnectModule, never>;
     static ɵmod: i0.ɵɵNgModuleDeclaration<AngularConnectModule, never, [typeof i1.AngularFireModule, typeof i2.AngularFirestoreModule, typeof i3.AngularHasuraGraphQLModule], never>;

package/bundles/infrab4a-connect-angular.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('rxjs'), require('rxjs/operators'), require('@angular/fire/auth'), require('@infrab4a/connect'), require('js-cookie'), require('ts-custom-error'), require('@angular/fire/firestore'), require('@angular/common/http'), require('@angular/fire')) :
-    typeof define === 'function' && define.amd ? define('@infrab4a/connect-angular', ['exports', '@angular/core', 'rxjs', 'rxjs/operators', '@angular/fire/auth', '@infrab4a/connect', 'js-cookie', 'ts-custom-error', '@angular/fire/firestore', '@angular/common/http', '@angular/fire'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.infrab4a = global.infrab4a || {}, global.infrab4a["connect-angular"] = {}), global.ng.core, global.rxjs, global.rxjs.operators, global.ng.fire.auth, global["@infrab4a/connect"], global["js-cookie"], global["ts-custom-error"], global.ng.fire.firestore, global.ng.common.http, global.ng.fire));
-})(this, (function (exports, i0, rxjs, operators, i1, i1$1, cookie, tsCustomError, i1$2, i1$3, fire) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('rxjs'), require('rxjs/operators'), require('@angular/fire/auth'), require('@infrab4a/connect'), require('js-cookie'), require('ts-custom-error'), require('@angular/fire/firestore'), require('@infrab4a/connect/src'), require('@angular/common/http'), require('@angular/fire')) :
+    typeof define === 'function' && define.amd ? define('@infrab4a/connect-angular', ['exports', '@angular/core', 'rxjs', 'rxjs/operators', '@angular/fire/auth', '@infrab4a/connect', 'js-cookie', 'ts-custom-error', '@angular/fire/firestore', '@infrab4a/connect/src', '@angular/common/http', '@angular/fire'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.infrab4a = global.infrab4a || {}, global.infrab4a["connect-angular"] = {}), global.ng.core, global.rxjs, global.rxjs.operators, global.ng.fire.auth, global["@infrab4a/connect"], global["js-cookie"], global["ts-custom-error"], global.ng.fire.firestore, global.src, global.ng.common.http, global.ng.fire));
+})(this, (function (exports, i0, rxjs, operators, i1, i1$1, cookie, tsCustomError, i1$2, src, i1$3, fire) { 'use strict';
 
     function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -31,7 +31,7 @@
     var i1__namespace$2 = /*#__PURE__*/_interopNamespace(i1$2);
     var i1__namespace$3 = /*#__PURE__*/_interopNamespace(i1$3);
 
-    /*! *****************************************************************************
+    /******************************************************************************
     Copyright (c) Microsoft Corporation.
 
     Permission to use, copy, modify, and/or distribute this software for any
@@ -98,6 +98,64 @@
     function __param(paramIndex, decorator) {
         return function (target, key) { decorator(target, key, paramIndex); };
     }
+    function __esDecorate(ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+        function accept(f) { if (f !== void 0 && typeof f !== "function")
+            throw new TypeError("Function expected"); return f; }
+        var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+        var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+        var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+        var _, done = false;
+        for (var i = decorators.length - 1; i >= 0; i--) {
+            var context = {};
+            for (var p in contextIn)
+                context[p] = p === "access" ? {} : contextIn[p];
+            for (var p in contextIn.access)
+                context.access[p] = contextIn.access[p];
+            context.addInitializer = function (f) { if (done)
+                throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
+            var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
+            if (kind === "accessor") {
+                if (result === void 0)
+                    continue;
+                if (result === null || typeof result !== "object")
+                    throw new TypeError("Object expected");
+                if (_ = accept(result.get))
+                    descriptor.get = _;
+                if (_ = accept(result.set))
+                    descriptor.set = _;
+                if (_ = accept(result.init))
+                    initializers.push(_);
+            }
+            else if (_ = accept(result)) {
+                if (kind === "field")
+                    initializers.push(_);
+                else
+                    descriptor[key] = _;
+            }
+        }
+        if (target)
+            Object.defineProperty(target, contextIn.name, descriptor);
+        done = true;
+    }
+    ;
+    function __runInitializers(thisArg, initializers, value) {
+        var useValue = arguments.length > 2;
+        for (var i = 0; i < initializers.length; i++) {
+            value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+        }
+        return useValue ? value : void 0;
+    }
+    ;
+    function __propKey(x) {
+        return typeof x === "symbol" ? x : "".concat(x);
+    }
+    ;
+    function __setFunctionName(f, name, prefix) {
+        if (typeof name === "symbol")
+            name = name.description ? "[".concat(name.description, "]") : "";
+        return Object.defineProperty(f, "name", { configurable: true, value: prefix ? "".concat(prefix, " ", name) : name });
+    }
+    ;
     function __metadata(metadataKey, metadataValue) {
         if (typeof Reflect === "object" && typeof Reflect.metadata === "function")
             return Reflect.metadata(metadataKey, metadataValue);
@@ -129,7 +187,7 @@
         function step(op) {
             if (f)
                 throw new TypeError("Generator is already executing.");
-            while (_)
+            while (g && (g = 0, op[0] && (_ = 0)), _)
                 try {
                     if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done)
                         return t;
@@ -193,7 +251,11 @@
     var __createBinding = Object.create ? (function (o, m, k, k2) {
         if (k2 === undefined)
             k2 = k;
-        Object.defineProperty(o, k2, { enumerable: true, get: function () { return m[k]; } });
+        var desc = Object.getOwnPropertyDescriptor(m, k);
+        if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+            desc = { enumerable: true, get: function () { return m[k]; } };
+        }
+        Object.defineProperty(o, k2, desc);
     }) : (function (o, m, k, k2) {
         if (k2 === undefined)
             k2 = k;
@@ -293,7 +355,7 @@
     function __asyncDelegator(o) {
         var i, p;
         return i = {}, verb("next"), verb("throw", function (e) { throw e; }), verb("return"), i[Symbol.iterator] = function () { return this; }, i;
-        function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: n === "return" } : f ? f(v) : v; } : f; }
+        function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: false } : f ? f(v) : v; } : f; }
     }
     function __asyncValues(o) {
         if (!Symbol.asyncIterator)
@@ -347,6 +409,11 @@
         if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver))
             throw new TypeError("Cannot write private member to an object whose class did not declare it");
         return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+    }
+    function __classPrivateFieldIn(state, receiver) {
+        if (receiver === null || (typeof receiver !== "object" && typeof receiver !== "function"))
+            throw new TypeError("Cannot use 'in' operator on non-object");
+        return typeof state === "function" ? receiver === state : state.has(receiver);
     }
 
     var AuthService = /** @class */ (function () {
@@ -390,7 +457,7 @@
                         }] }];
         } });
 
-    var BACKEND_URL = 'BACKEND_URL';
+    var API_URL = 'API_URL';
 
     var DEFAULT_SHOP = 'DEFAULT_SHOP';
 
@@ -1223,62 +1290,58 @@
         } });
 
     var ShippingService = /** @class */ (function () {
-        function ShippingService(http, apiUrl, homeService) {
+        function ShippingService(http, homeService, apiUrl) {
             this.http = http;
-            this.apiUrl = apiUrl;
             this.homeService = homeService;
+            this.apiUrl = apiUrl;
         }
-        ShippingService.prototype.getShippingMethods = function (shop, zip, weightGrams, totalPrice, personId, subscriptionPlan) {
+        ShippingService.prototype.getMensShippingMethods = function (zip, weightGrams, totalPrice, personId, shop, subscriptionPlan) {
             var _this = this;
-            return rxjs.combineLatest([
+            rxjs.combineLatest([
                 this.homeService.getHomeData(),
                 this.http.get(this.apiUrl + "open/checkshippingcompany?personId=" + personId + "&postalCode=" + zip + "&weightGrams=" + weightGrams)
-            ])
-                .pipe(operators.map(function (_a) {
-                var _b = __read(_a, 2), datas = _b[0], shippingMethodsResponse = _b[1];
-                var shippingMethods = shippingMethodsResponse.result;
-                if (!shippingMethods.length)
-                    return [];
-                shippingMethods = shippingMethods.map(function (s) {
-                    if (s.ShippingCompanyName == 'Same Day EG')
-                        s.ShippingCompanyName = 'Same Day';
-                    else
-                        return s;
+            ]).pipe(operators.map(function (datas, shippings) { return console.log('combineLatest', datas, shippings); }));
+            return this.http.get(this.apiUrl + "open/checkshippingcompany?personId=" + personId + "&postalCode=" + zip + "&weightGrams=" + weightGrams)
+                .pipe(operators.map(function (data) { return data.result; }), operators.map(function (shippingMethods) { return __awaiter(_this, void 0, void 0, function () {
+                var shippingMethodsResponse, datas;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            shippingMethodsResponse = shippingMethods;
+                            console.log('shippingMethods', shippingMethods);
+                            if (!shippingMethods.length)
+                                return [2 /*return*/, []];
+                            return [4 /*yield*/, this.homeService.getHomeData().toPromise().then(function (data) { return data.sameDayNotAvaliable; })];
+                        case 1:
+                            datas = _a.sent();
+                            if (this.isHolidays(datas)) {
+                                shippingMethodsResponse = shippingMethods.filter(function (method) { return method.ShippingCompanyName !== 'Same Day'; });
+                            }
+                            if (totalPrice >= 200 || this.isFreeShippingBySubscription(shop, subscriptionPlan)) {
+                                return [2 /*return*/, shippingMethodsResponse.map(function (s) {
+                                        if (s.serviceName !== 'Same Day')
+                                            return Object.assign(Object.assign({}, s), { totalPrice: 0 });
+                                        else
+                                            return s;
+                                    })];
+                            }
+                            if (this.isFreeShippingBySubscription(shop, subscriptionPlan)) {
+                                return [2 /*return*/, shippingMethodsResponse.map(function (s) {
+                                        if (s.serviceName !== 'Same Day')
+                                            return Object.assign(Object.assign({}, s), { totalPrice: s.totalPrice / 2 });
+                                        else
+                                            return s;
+                                    })];
+                            }
+                            return [2 /*return*/, shippingMethodsResponse];
+                    }
                 });
-                var datasSameDayNotAvaliable = datas.sameDayNotAvaliable;
-                if (_this.isHolidays(datasSameDayNotAvaliable)) {
-                    shippingMethods = shippingMethods.filter(function (method) { return method.ShippingCompanyName !== 'Same Day'; });
-                }
-                if (totalPrice >= 200) {
-                    shippingMethods = shippingMethods.map(function (s) {
-                        if (s.serviceName !== 'Same Day')
-                            return Object.assign(Object.assign({}, s), { totalPrice: 0 });
-                        else
-                            return s;
-                    });
-                }
-                if (shop == i1$1.Shops.GLAMSHOP)
-                    return shippingMethods;
-                if (_this.isFreeShippingBySubscription(shop, subscriptionPlan)) {
-                    shippingMethods = shippingMethods.map(function (s) {
-                        if (s.serviceName == 'Same Day')
-                            return Object.assign(Object.assign({}, s), { totalPrice: s.totalPrice / 2 });
-                        else
-                            return Object.assign(Object.assign({}, s), { totalPrice: 0 });
-                    });
-                }
-                if (_this.isHalfShippingBySubscription(shop, subscriptionPlan)) {
-                    shippingMethods = shippingMethods.map(function (s) {
-                        return Object.assign(Object.assign({}, s), { totalPrice: s.totalPrice / 2 });
-                    });
-                }
-                return shippingMethods;
-            }));
+            }); }));
         };
         ShippingService.prototype.isFreeShippingBySubscription = function (shop, subscriptionPlan) {
             if (!subscriptionPlan)
                 return false;
-            if (shop == i1$1.Shops.MENSMARKET && subscriptionPlan == 'SELECT') {
+            if (shop == src.Shops.MENSMARKET && subscriptionPlan == 'SELECT') {
                 return true;
             }
             return false;
@@ -1286,10 +1349,7 @@
         ShippingService.prototype.isHalfShippingBySubscription = function (shop, subscriptionPlan) {
             if (!subscriptionPlan)
                 return false;
-            if (shop == i1$1.Shops.MENSMARKET && subscriptionPlan == 'PRIME') {
-                return true;
-            }
-            if (shop == i1$1.Shops.GLAMSHOP && subscriptionPlan) {
+            if (shop == src.Shops.MENSMARKET && subscriptionPlan == 'PRIME') {
                 return true;
             }
             return false;
@@ -1308,15 +1368,15 @@
         };
         return ShippingService;
     }());
-    ShippingService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0__namespace, type: ShippingService, deps: [{ token: i1__namespace$3.HttpClient }, { token: BACKEND_URL }, { token: HomeShopService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    ShippingService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0__namespace, type: ShippingService, deps: [{ token: i1__namespace$3.HttpClient }, { token: HomeShopService }, { token: API_URL }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
     ShippingService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0__namespace, type: ShippingService });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0__namespace, type: ShippingService, decorators: [{
                 type: i0.Injectable
             }], ctorParameters: function () {
-            return [{ type: i1__namespace$3.HttpClient }, { type: undefined, decorators: [{
+            return [{ type: i1__namespace$3.HttpClient }, { type: HomeShopService }, { type: undefined, decorators: [{
                             type: i0.Inject,
-                            args: [BACKEND_URL]
-                        }] }, { type: HomeShopService }];
+                            args: [API_URL]
+                        }] }];
         } });
 
     var AngularFirebaseAuthModule = /** @class */ (function () {
@@ -1910,7 +1970,7 @@
         AngularConnectModule.initializeApp = function (defaultShop, options, nameOrConfig) {
             return {
                 ngModule: AngularConnectModule,
-                providers: __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((i1$1.isNil(defaultShop) ? [] : [{ provide: DEFAULT_SHOP, useValue: defaultShop }]))), __read((i1$1.isNil(options === null || options === void 0 ? void 0 : options.firebase) ? [] : [{ provide: fire.FIREBASE_OPTIONS, useValue: options === null || options === void 0 ? void 0 : options.firebase }]))), __read((i1$1.isNil(options === null || options === void 0 ? void 0 : options.firebase) ? [] : [{ provide: fire.FIREBASE_APP_NAME, useValue: nameOrConfig }]))), __read((i1$1.isNil(options === null || options === void 0 ? void 0 : options.elasticSearch) ? [] : [{ provide: ES_CONFIG, useValue: options.elasticSearch }]))), __read((i1$1.isNil(options === null || options === void 0 ? void 0 : options.hasura) ? [] : [{ provide: HASURA_OPTIONS, useValue: options.hasura }]))), __read((i1$1.isNil(options === null || options === void 0 ? void 0 : options.backendUrl) ? [] : [{ provide: BACKEND_URL, useValue: options.backendUrl }]))),
+                providers: __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((i1$1.isNil(defaultShop) ? [] : [{ provide: DEFAULT_SHOP, useValue: defaultShop }]))), __read((i1$1.isNil(options === null || options === void 0 ? void 0 : options.firebase) ? [] : [{ provide: fire.FIREBASE_OPTIONS, useValue: options === null || options === void 0 ? void 0 : options.firebase }]))), __read((i1$1.isNil(options === null || options === void 0 ? void 0 : options.firebase) ? [] : [{ provide: fire.FIREBASE_APP_NAME, useValue: nameOrConfig }]))), __read((i1$1.isNil(options === null || options === void 0 ? void 0 : options.elasticSearch) ? [] : [{ provide: ES_CONFIG, useValue: options.elasticSearch }]))), __read((i1$1.isNil(options === null || options === void 0 ? void 0 : options.hasura) ? [] : [{ provide: HASURA_OPTIONS, useValue: options.hasura }]))), __read((i1$1.isNil(options === null || options === void 0 ? void 0 : options.apiUrl) ? [] : [{ provide: API_URL, useValue: options.apiUrl }]))),
             };
         };
         return AngularConnectModule;