@coolon/angular-ui-powerups 3.7.0-alpha.2 → 3.7.0-alpha.4

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [3.7.0-alpha.4](https://bitbucket.org/coolon/angular-ui-powerups/compare/v3.7.0-alpha.3...v3.7.0-alpha.4) (2020-12-16)
+
+
+### Bug Fixes
+
+* routing to not check authorisation for guest places ([f4a7024](https://bitbucket.org/coolon/angular-ui-powerups/commit/f4a70246ecc40a0103dfe1ff8893536bb6efa963))
+
+## [3.7.0-alpha.3](https://bitbucket.org/coolon/angular-ui-powerups/compare/v3.7.0-alpha.2...v3.7.0-alpha.3) (2020-12-16)
+
+
+### Bug Fixes
+
+* restricted place auth handlers to places/visits to check validity ([5c8d7c9](https://bitbucket.org/coolon/angular-ui-powerups/commit/5c8d7c92f7b85a6d2e971ae13387eef41870d149))
+
 ## [3.7.0-alpha.2](https://bitbucket.org/coolon/angular-ui-powerups/compare/v3.7.0-alpha.1...v3.7.0-alpha.2) (2020-12-16)
 
 

package/bundles/coolon-angular-ui-powerups.umd.js

@@ -7136,10 +7136,11 @@
 
     var PlaceOutletComponent = /** @class */ (function (_super) {
         __extends(PlaceOutletComponent, _super);
-        function PlaceOutletComponent(router, placeRouter, placeConfig, parentOutlet) {
+        function PlaceOutletComponent(router, placeRouter, placeAuthService, placeConfig, parentOutlet) {
             var _this = _super.call(this) || this;
             _this.router = router;
             _this.placeRouter = placeRouter;
+            _this.placeAuthService = placeAuthService;
             _this.placeConfig = placeConfig;
             _this.placeChanged = new i0.EventEmitter();
             _this.outletActivated = new pectin.MutableValueModel(false);
@@ -7184,6 +7185,13 @@
             chain(_this._activePlaceModel)
                 .postponeWhile(_this.navigationInProgress)
                 .subscribe(function (place) { return _this.placeChanged.emit(place); });
+            when(placeAuthService.authoriserModel).changes(function (isAuthorised) {
+                var activePlace = _this._activePlaceModel.value;
+                if (activePlace && !isAuthorised(activePlace.placeDefinition)) {
+                    var visitOrPlace = placeAuthService.handleNotAuthorised(_this._activatedRouteModel.value.snapshot, _this.router.routerState.snapshot);
+                    _this.placeRouter.navigate(visitOrPlace instanceof Visit ? visitOrPlace : new Visit(exports.PlaceComponent.getDefinition(visitOrPlace)));
+                }
+            });
             return _this;
         }
         // @Trace()
@@ -7325,6 +7333,7 @@
     PlaceOutletComponent.ctorParameters = function () { return [
         { type: i1$1.Router },
         { type: PlaceRouter },
+        { type: undefined, decorators: [{ type: i0.Inject, args: [PLACE_AUTH_SERVICE,] }] },
         { type: undefined, decorators: [{ type: i0.Optional }, { type: i0.Inject, args: [AUP_PLACE_CONFIG,] }] },
         { type: PlaceOutletComponent, decorators: [{ type: i0.SkipSelf }, { type: i0.Optional }] }
     ]; };
@@ -7954,65 +7963,72 @@
             this.interactionService = interactionService;
             this.injector = injector;
         }
+        // @Trace()
         PlaceGuard.prototype.canActivate = function (activatedRoute, state) {
             return __awaiter(this, void 0, void 0, function () {
-                var placeDefinition_1, needsAuth, proceed, _a, result;
+                var placeDefinition_1, redirectLocation, nextPlaceDef, redirectLocation, nextPlaceDef, result;
                 var _this = this;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
                         case 0:
                             if (!exports.PlaceComponent.isPlaceComponentConstructor(activatedRoute.component)) return [3 /*break*/, 4];
                             placeDefinition_1 = exports.PlaceComponent.getDefinition(activatedRoute.component);
-                            needsAuth = placeDefinition_1.authenticate;
-                            _a = !needsAuth;
-                            if (_a) return [3 /*break*/, 2];
+                            if (!placeDefinition_1.authenticate) return [3 /*break*/, 2];
                             return [4 /*yield*/, this.placeAuthService.isAuthenticated()];
                         case 1:
-                            _a = (_b.sent());
-                            _b.label = 2;
-                        case 2:
-                            proceed = _a;
-                            if (!proceed) {
-                                return [2 /*return*/, this.handleGuardResult(this.placeAuthService.handleNotAuthenticated(activatedRoute, state))];
+                            if (!(_a.sent())) {
+                                redirectLocation = this.placeAuthService.handleNotAuthenticated(activatedRoute, state);
+                                nextPlaceDef = this.getPlaceDefinition(redirectLocation);
+                                if (nextPlaceDef.authenticate) {
+                                    pectin.lang.illegalState("handleNotAuthenticated hook returned place " + nextPlaceDef.component.name + " that requires authentication.");
+                                }
+                                return [2 /*return*/, this.createUrlTree(redirectLocation)];
                             }
                             if (!this.placeAuthService.isAuthorised(placeDefinition_1)) {
-                                return [2 /*return*/, this.handleGuardResult(this.placeAuthService.handleNotAuthorised(activatedRoute, state))];
+                                redirectLocation = this.placeAuthService.handleNotAuthorised(activatedRoute, state);
+                                nextPlaceDef = this.getPlaceDefinition(redirectLocation);
+                                if (!this.placeAuthService.isAuthorised(nextPlaceDef)) {
+                                    pectin.lang.illegalState("handleNotAuthorised hook returned place " + nextPlaceDef.component.name + " that is not authorised for the current user.");
+                                }
+                                return [2 /*return*/, this.createUrlTree(redirectLocation)];
                             }
-                            return [4 /*yield*/, this.cleanInteractionState(activatedRoute, state, function () { return __awaiter(_this, void 0, void 0, function () {
-                                    var params, parsedParams, navigationSession, initialVisit, sanitiser, sanitisedVisit, urlSnapshot;
-                                    return __generator(this, function (_a) {
-                                        switch (_a.label) {
-                                            case 0:
-                                                params = new ConsolidatedParameterMap(activatedRoute.paramMap, activatedRoute.url);
-                                                parsedParams = placeDefinition_1.parseRouteParams(params);
-                                                navigationSession = this.placeRouter.navigationSession;
-                                                initialVisit = navigationSession.getVisitFor(placeDefinition_1) || new Visit(placeDefinition_1, parsedParams);
-                                                sanitiser = new VisitSanitiser(navigationSession, activatedRoute, this.router, this.placeHistory, this.injector);
-                                                return [4 /*yield*/, sanitiser.sanitise(initialVisit.mergeRouteParameters(parsedParams))];
-                                            case 1:
-                                                sanitisedVisit = _a.sent();
-                                                // Save the visit with any updated parameters.  We need to save it so we remember any non route parameters
-                                                navigationSession.storeVisit(sanitisedVisit);
-                                                if (initialVisit.hasRoutingChangedFrom(sanitisedVisit)) {
-                                                    urlSnapshot = this.urlService.parseUrl(state.url).updateVisitSegments(sanitisedVisit);
-                                                    // console.log('##### Place Guard Redirect', urlSnapshot);
-                                                    return [2 /*return*/, urlSnapshot];
-                                                }
-                                                else {
-                                                    return [2 /*return*/, true];
-                                                }
-                                                return [2 /*return*/];
-                                        }
-                                    });
-                                }); })];
+                            _a.label = 2;
+                        case 2: return [4 /*yield*/, this.cleanInteractionState(activatedRoute, state, function () { return __awaiter(_this, void 0, void 0, function () {
+                                var params, parsedParams, navigationSession, initialVisit, sanitiser, sanitisedVisit, urlSnapshot;
+                                return __generator(this, function (_a) {
+                                    switch (_a.label) {
+                                        case 0:
+                                            params = new ConsolidatedParameterMap(activatedRoute.paramMap, activatedRoute.url);
+                                            parsedParams = placeDefinition_1.parseRouteParams(params);
+                                            navigationSession = this.placeRouter.navigationSession;
+                                            initialVisit = navigationSession.getVisitFor(placeDefinition_1) || new Visit(placeDefinition_1, parsedParams);
+                                            sanitiser = new VisitSanitiser(navigationSession, activatedRoute, this.router, this.placeHistory, this.injector);
+                                            return [4 /*yield*/, sanitiser.sanitise(initialVisit.mergeRouteParameters(parsedParams))];
+                                        case 1:
+                                            sanitisedVisit = _a.sent();
+                                            // Save the visit with any updated parameters.  We need to save it so we remember any non route parameters
+                                            navigationSession.storeVisit(sanitisedVisit);
+                                            if (initialVisit.hasRoutingChangedFrom(sanitisedVisit)) {
+                                                urlSnapshot = this.urlService.parseUrl(state.url).updateVisitSegments(sanitisedVisit);
+                                                // console.log('##### Place Guard Redirect', urlSnapshot);
+                                                return [2 /*return*/, urlSnapshot];
+                                            }
+                                            else {
+                                                return [2 /*return*/, true];
+                                            }
+                                            return [2 /*return*/];
+                                    }
+                                });
+                            }); })];
                         case 3:
-                            result = _b.sent();
+                            result = _a.sent();
                             return [2 /*return*/, result instanceof exports.UrlSnapshot ? result.urlTree : result];
                         case 4: return [2 /*return*/, pectin.lang.illegalState("expected component to be an instance of PlaceComponent, got " + activatedRoute.component)];
                     }
                 });
             });
         };
+        // @Trace()
         PlaceGuard.prototype.canDeactivate = function (component, currentRoute, currentState, nextState) {
             return __awaiter(this, void 0, void 0, function () {
                 var currentUrl, nextUrl, result;
@@ -8029,13 +8045,14 @@
                 });
             });
         };
-        PlaceGuard.prototype.handleGuardResult = function (result) {
-            if (result instanceof exports.UrlSnapshot) {
-                return result.urlTree;
-            }
-            else {
-                return this.urlService.createUrlSnapshot(result).urlTree;
-            }
+        PlaceGuard.prototype.getPlaceDefinition = function (result) {
+            return result instanceof Visit ?
+                result.placeDefinition :
+                exports.PlaceComponent.getDefinition(result);
+        };
+        PlaceGuard.prototype.createUrlTree = function (result) {
+            var visit = result instanceof Visit ? result : new Visit(exports.PlaceComponent.getDefinition(result), {});
+            return this.urlService.createUrlSnapshot(visit).urlTree;
         };
         // protected async ensureAuthenticatedThen(activatedRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot, next: (placeDefinition: PlaceDefinition) => Promise<boolean | UrlTree>): Promise<boolean | UrlTree> {
         //   const authoriseResult = placeDefinition.authenticate ? await this.isAuthorised(activatedRoute, state) : true;
@@ -8058,6 +8075,7 @@
         //   return (authorised instanceof Observable) ? authorised.toPromise() : authorised;
         // }
         // abstract getAuthGuard(injector: Injector): CanActivate;
+        // @Trace()
         PlaceGuard.prototype.cleanInteractionState = function (route, state, next) {
             return __awaiter(this, void 0, void 0, function () {
                 var url;
@@ -8090,30 +8108,6 @@
         { type: exports.InteractionService },
         { type: i0.Injector }
     ]; };
-    __decorate([
-        pectin.Trace(),
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", [i1$1.ActivatedRouteSnapshot, i1$1.RouterStateSnapshot]),
-        __metadata("design:returntype", Promise)
-    ], PlaceGuard.prototype, "canActivate", null);
-    __decorate([
-        pectin.Trace(),
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", [exports.PlaceComponent, i1$1.ActivatedRouteSnapshot, i1$1.RouterStateSnapshot, i1$1.RouterStateSnapshot]),
-        __metadata("design:returntype", Promise)
-    ], PlaceGuard.prototype, "canDeactivate", null);
-    __decorate([
-        pectin.Trace(),
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", [Object]),
-        __metadata("design:returntype", void 0)
-    ], PlaceGuard.prototype, "handleGuardResult", null);
-    __decorate([
-        pectin.Trace(),
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", [i1$1.ActivatedRouteSnapshot, i1$1.RouterStateSnapshot, Function]),
-        __metadata("design:returntype", Promise)
-    ], PlaceGuard.prototype, "cleanInteractionState", null);
 
     (function (Formatter) {
         var StringType = /** @class */ (function () {