ng-miam 8.8.15 → 8.8.16

package/bundles/ng-miam.umd.js

@@ -3329,6 +3329,8 @@
           this.generatingAuthlessId$ = new rxjs.BehaviorSubject(false);
           this.userCoordinates$ = new rxjs.BehaviorSubject(undefined);
           this.userInfo$ = new rxjs.BehaviorSubject(undefined);
+          /** In-flight authless POST shared by concurrent callers (replaces debounce-only coalescing). */
+          this.authlessInFlight$ = null;
           this.userRoles$ = new rxjs.BehaviorSubject([]);
           this.userProvider$ = new rxjs.BehaviorSubject(undefined);
           this.userSupplier$ = new rxjs.BehaviorSubject(undefined);
@@ -3389,14 +3391,38 @@
           this.userProvider$.next(null);
           this.userSupplier$.next(null);
       };
+      /**
+       * Ensures API calls that need `Authorization: user_id …` have either a logged user id or an authless id
+       * (same rule as MiamInterceptor: Bearer token, else user_id from `_miam/userId` or `_miam/authlessId`).
+       */
+      UserService.prototype.ensureAnonymousUserIdIfMissing = function () {
+          if (localStorage.getItem('_miam/userToken') || localStorage.getItem('_miam/userId')) {
+              return rxjs.of(void 0);
+          }
+          return this.generateAnonymousUserId().pipe(operators.map(function () { return void 0; }));
+      };
       UserService.prototype.generateAnonymousUserId = function () {
           var _this = this;
+          var existing = localStorage.getItem('_miam/authlessId');
+          if (existing) {
+              return rxjs.of(existing);
+          }
+          if (this.authlessInFlight$) {
+              return this.authlessInFlight$;
+          }
           var url = environment$1.miamAPI + "/api/v1/users/authless";
           this.generatingAuthlessId$.next(true);
-          return this.http.post(url, {}).pipe(operators.map(function (result) { return result['authless_id']; }), operators.tap(function (anonymousUserId) {
+          this.authlessInFlight$ = this.http.post(url, {}).pipe(operators.map(function (result) { return result.authless_id; }), operators.tap(function (anonymousUserId) {
               localStorage.setItem('_miam/authlessId', anonymousUserId);
               _this.generatingAuthlessId$.next(false);
-          }));
+          }), operators.catchError(function (err) {
+              _this.generatingAuthlessId$.next(false);
+              _this.authlessInFlight$ = null;
+              return rxjs.throwError(err);
+          }), operators.finalize(function () {
+              _this.authlessInFlight$ = null;
+          }), operators.shareReplay(1));
+          return this.authlessInFlight$;
       };
       UserService.prototype.setPreference = function (pref, state) {
           var _this = this;
@@ -4628,7 +4654,7 @@
   var MIAM_API_HOST$2 = environment$1.miamAPI + "/api/v1/";
   var RecipesService = /** @class */ (function (_super) {
       __extends(RecipesService, _super);
-      function RecipesService(http, providerService, statusService, typeService, suppliersService, posService, ingredientsService, recipeStepsService, sponsorService, packageService, tagsService, recipeLikesService, seoService, preferencesService, storeLocatorService) {
+      function RecipesService(http, providerService, statusService, typeService, suppliersService, posService, ingredientsService, recipeStepsService, sponsorService, packageService, tagsService, recipeLikesService, seoService, preferencesService, storeLocatorService, userService) {
           var _this = _super.call(this) || this;
           _this.http = http;
           _this.providerService = providerService;
@@ -4645,6 +4671,7 @@
           _this.seoService = seoService;
           _this.preferencesService = preferencesService;
           _this.storeLocatorService = storeLocatorService;
+          _this.userService = userService;
           _this.resource = Recipe;
           _this.type = 'recipes';
           _this.displayedRecipe$ = new rxjs.BehaviorSubject(null);
@@ -5011,14 +5038,14 @@
               return;
           }
           var queuedContexts = Array.from(this.pendingContexts.values());
-          rxjs.combineLatest([
-              this.suppliersService.supplier$,
-              this.posService.posWasInitialized().pipe(operators.skipWhile(function (wasInitialized) { return !wasInitialized; }), operators.switchMap(function () { return _this.posService.pos$; }))
+          this.userService.ensureAnonymousUserIdIfMissing().pipe(operators.switchMap(function () { return rxjs.combineLatest([
+              _this.suppliersService.supplier$,
+              _this.posService.posWasInitialized().pipe(operators.skipWhile(function (wasInitialized) { return !wasInitialized; }), operators.switchMap(function () { return _this.posService.pos$; }))
           ]).pipe(operators.skipWhile(function (results) { return !results[0]; }), operators.take(1), operators.switchMap(function (results) {
               var url = _this.buildSuggestionsBatchUrl(results[0], results[1]);
               var body = _this.buildSuggestionsBatchBody(queuedContexts);
               return _this.http.post(url, body);
-          }), operators.catchError(function (error) {
+          })); }), operators.catchError(function (error) {
               _this.handleBatchSuggestionsError(error);
               return rxjs.of(null);
           })).subscribe(function (returnedRecipes) {
@@ -5091,7 +5118,7 @@
       };
       return RecipesService;
   }(i2$2.Service));
-  RecipesService.ɵfac = function RecipesService_Factory(t) { return new (t || RecipesService)(i0__namespace.ɵɵinject(i1__namespace.HttpClient), i0__namespace.ɵɵinject(RecipeProviderService), i0__namespace.ɵɵinject(RecipeStatusService), i0__namespace.ɵɵinject(RecipeTypeService), i0__namespace.ɵɵinject(SuppliersService), i0__namespace.ɵɵinject(PointOfSalesService), i0__namespace.ɵɵinject(IngredientsService), i0__namespace.ɵɵinject(RecipeStepsService), i0__namespace.ɵɵinject(SponsorService), i0__namespace.ɵɵinject(PackageService), i0__namespace.ɵɵinject(TagsService), i0__namespace.ɵɵinject(RecipeLikesService), i0__namespace.ɵɵinject(SeoService), i0__namespace.ɵɵinject(PreferencesService), i0__namespace.ɵɵinject(StoreLocatorService)); };
+  RecipesService.ɵfac = function RecipesService_Factory(t) { return new (t || RecipesService)(i0__namespace.ɵɵinject(i1__namespace.HttpClient), i0__namespace.ɵɵinject(RecipeProviderService), i0__namespace.ɵɵinject(RecipeStatusService), i0__namespace.ɵɵinject(RecipeTypeService), i0__namespace.ɵɵinject(SuppliersService), i0__namespace.ɵɵinject(PointOfSalesService), i0__namespace.ɵɵinject(IngredientsService), i0__namespace.ɵɵinject(RecipeStepsService), i0__namespace.ɵɵinject(SponsorService), i0__namespace.ɵɵinject(PackageService), i0__namespace.ɵɵinject(TagsService), i0__namespace.ɵɵinject(RecipeLikesService), i0__namespace.ɵɵinject(SeoService), i0__namespace.ɵɵinject(PreferencesService), i0__namespace.ɵɵinject(StoreLocatorService), i0__namespace.ɵɵinject(UserService)); };
   RecipesService.ɵprov = i0__namespace.ɵɵdefineInjectable({ token: RecipesService, factory: RecipesService.ɵfac, providedIn: 'root' });
   (function () {
       (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(RecipesService, [{
@@ -5099,7 +5126,7 @@
               args: [{
                       providedIn: 'root'
                   }]
-          }], function () { return [{ type: i1__namespace.HttpClient }, { type: RecipeProviderService }, { type: RecipeStatusService }, { type: RecipeTypeService }, { type: SuppliersService }, { type: PointOfSalesService }, { type: IngredientsService }, { type: RecipeStepsService }, { type: SponsorService }, { type: PackageService }, { type: TagsService }, { type: RecipeLikesService }, { type: SeoService }, { type: PreferencesService }, { type: StoreLocatorService }]; }, null);
+          }], function () { return [{ type: i1__namespace.HttpClient }, { type: RecipeProviderService }, { type: RecipeStatusService }, { type: RecipeTypeService }, { type: SuppliersService }, { type: PointOfSalesService }, { type: IngredientsService }, { type: RecipeStepsService }, { type: SponsorService }, { type: PackageService }, { type: TagsService }, { type: RecipeLikesService }, { type: SeoService }, { type: PreferencesService }, { type: StoreLocatorService }, { type: UserService }]; }, null);
   })();
 
   var BASKET_SPARSE_FIELDS = {
@@ -5308,27 +5335,40 @@
       BasketsService.prototype.refreshCurrentBasket = function () {
           var _this = this;
           this.currentAndPreviewFetching.next(true);
-          return this.posService.waitForPos.pipe(operators.take(1), operators.switchMap(function (pos) {
+          return this.usersService.ensureAnonymousUserIdIfMissing().pipe(operators.switchMap(function () { return _this.posService.waitForPos.pipe(operators.take(1), operators.switchMap(function (pos) {
               console.debug('[Miam] refreshing basket');
               var authlessId = localStorage.getItem('_miam/authlessId');
               var userId = localStorage.getItem('_miam/userId');
               if (_this.currentSubscription) {
                   _this.currentSubscription.unsubscribe();
               }
-              var basketObservable = (authlessId && userId)
+              var basketLoad$ = (authlessId && userId)
                   ? _this.transferAuthlessBasket(pos.id, authlessId)
                   : _this.fetchCurrentBasket(pos.id);
               if (authlessId && userId) {
                   localStorage.removeItem('_miam/authlessId');
               }
+              var basketObservable = basketLoad$.pipe(
+              // Affiliated requires a basket to exist server-side; run only after current basket fetch/update completes.
+              operators.tap(function () { return _this.checkIfIsAffiliated(); }));
               _this.currentSubscription = basketObservable.subscribe();
-              _this.checkIfIsAffiliated();
               return _this._basket$;
-          }));
+          })); }));
       };
       BasketsService.prototype.checkIfIsAffiliated = function () {
           var getAffiliatedUrl = environment$1.miamAPI + "/api/v1/baskets/affiliated";
-          this.http.get(getAffiliatedUrl).pipe(operators.take(1)).subscribe(function (response) {
+          this.http
+              .get(getAffiliatedUrl)
+              .pipe(operators.retryWhen(function (errors) { return errors.pipe(operators.mergeMap(function (err, attempt) {
+              var body = err === null || err === void 0 ? void 0 : err.error;
+              var msg = typeof (body === null || body === void 0 ? void 0 : body.error) === 'string' ? body.error : '';
+              var transientBasket = /no basket found/i.test(msg);
+              if (transientBasket && attempt < 4) {
+                  return rxjs.timer(350 + attempt * 150);
+              }
+              return rxjs.throwError(err);
+          })); }), operators.take(1))
+              .subscribe(function (response) {
               var affiliated = response === null || response === void 0 ? void 0 : response.affiliated;
               if (affiliated) {
                   localStorage.setItem('_miam/affiliated', affiliated);
@@ -5338,6 +5378,8 @@
                   localStorage.removeItem('_miam/affiliated');
                   mealzSharedAnalytics.setAffiliate(null);
               }
+          }, function () {
+              /* keep previous affiliate state on failure */
           });
       };
       BasketsService.prototype.transferAuthlessBasket = function (posId, authlessId) {
@@ -6946,13 +6988,11 @@
           document.head.appendChild(storeLocatorScript);
       };
       ContextService.prototype.generateAuthlessIdIfNecessary = function () {
-          var _this = this;
-          return this.userService.generatingAuthlessId$.pipe(operators.debounceTime(800), operators.take(1), operators.switchMap(function (isGenerating) {
-              if (isGenerating || _this.loggedOnSession || !!localStorage.getItem('_miam/authlessId')) {
-                  return rxjs.of(null);
-              }
-              return _this.userService.generateAnonymousUserId();
-          }));
+          if (this.loggedOnSession || !!localStorage.getItem('_miam/authlessId')) {
+              return rxjs.of(void 0);
+          }
+          // Emit the authless id string so callers like user.reset can branch on a truthy value after creation.
+          return this.userService.generateAnonymousUserId();
       };
       return ContextService;
   }());