@coolon/angular-ui-powerups 3.7.1 → 3.7.3

package/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 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.3](https://bitbucket.org/coolon/angular-ui-powerups/compare/v3.7.2...v3.7.3) (2021-01-28)
+
+
+### Bug Fixes
+
+* added css fix for firefox rendering of aup tables ([fa73ea5](https://bitbucket.org/coolon/angular-ui-powerups/commit/fa73ea5bb3b0b6de48abb5a89dbdf1d8ddb80f19))
+* improved auth service design ([f6af33d](https://bitbucket.org/coolon/angular-ui-powerups/commit/f6af33d036d5fee3039871479d09d673ca3ef0bc))
+
+### [3.7.2](https://bitbucket.org/coolon/angular-ui-powerups/compare/v3.7.1...v3.7.2) (2021-01-22)
+
+
+### Bug Fixes
+
+* fixed null point workaround to always return something ([b53bb4b](https://bitbucket.org/coolon/angular-ui-powerups/commit/b53bb4b322908189d087b27c4fce5f87de077c7d))
+
 ### [3.7.1](https://bitbucket.org/coolon/angular-ui-powerups/compare/v3.7.0...v3.7.1) (2021-01-22)
 
 

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

@@ -1075,7 +1075,7 @@
             _this.faceModelDelegate = new pectin.DelegatingValueModel();
             _this.xPosition = 'after';
             _this.yPosition = 'below';
-            var _b = pectin.Dsl.disposeWith(_this), chain = _b.chain, valueOf = _b.valueOf, before = _b.before, when = _b.when, after = _b.after, observe = _b.observe, switchOn = _b.switchOn;
+            var _c = pectin.Dsl.disposeWith(_this), chain = _c.chain, valueOf = _c.valueOf, before = _c.before, when = _c.when, after = _c.after, observe = _c.observe, switchOn = _c.switchOn;
             // group.faceListModel = chain(this.faceModel).mapToList(face => [face]);
             _this.faceAdapterModel = chain(_this.faceModelDelegate).map(function (f) { return new exports.CommandFace.Adapter(f); });
             _this.children = chain(_this._unorderedChildren).sortBy('componentIndex');
@@ -1087,11 +1087,11 @@
         };
         Object.defineProperty(AbstractPopupMenuComponent.prototype, "faceAdapter", {
             get: function () {
-                var _a;
+                var _a, _b;
                 if (!this.faceAdapterModel) {
                     console.error("Somehow faceAdapterModel is nil -- set a break point here and let me know what's going on");
                 }
-                return (_a = this.faceAdapterModel) === null || _a === void 0 ? void 0 : _a.value;
+                return (_b = (_a = this.faceAdapterModel) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : new exports.CommandFace.Adapter(undefined);
             },
             enumerable: false,
             configurable: true
@@ -2654,6 +2654,14 @@
             }));
             return this;
         };
+        PropertyColumnModel.prototype.liveEditCellRenderer = function (componentType, options) {
+            return this.mutableCellRenderer(componentType, options);
+        };
+        /**
+         * Deprecated.  Use #liveEditCellRenderer instead.
+         * @param componentType
+         * @param options
+         */
         PropertyColumnModel.prototype.mutableCellRenderer = function (componentType, options) {
             var _this = this;
             this.configureCellRenderer(new ComponentCellRendererPortalRef(componentType, function (component, rowData, firstTime) {
@@ -3176,7 +3184,7 @@
         { type: i0.Component, args: [{
                     selector: 'aup-table',
                     template: "<table mat-table [dataSource]=\"tableModel.dataSource.value\" [trackBy]=\"tableModel.trackBy\">\n\n  <ng-container *ngFor=\"let column of columns.value; index as index; first as first; last as last\" matColumnDef=\"{{column.columnId}}\">\n    <th mat-header-cell *matHeaderCellDef>\n      <aup-table-header-cell-renderer [column]=\"column\"\n                                      [attr.column-index]=\"index\"\n                                      [attr.column-id]=\"column.columnId\"\n                                      [class.first-column]=\"first\"\n                                      [class.last-column]=\"last\"\n      ></aup-table-header-cell-renderer>\n    </th>\n    <td mat-cell *matCellDef=\"let row\" (click)=\"onCellClicked(column, row)\" [class.enable-cursor]=\"tableModel.isRowSelectionEnabledFor(column)\">\n      <aup-table-cell-renderer [column]=\"column\"\n                               [row]=\"row\"\n                               [tableModel]=\"tableModel\"\n                               [editSession]=\"tableModel.getEditSessionFor(row)\"\n                               [attr.column-index]=\"index\"\n                               [attr.column-id]=\"column.columnId\"\n                               [class.first-column]=\"first\"\n                               [class.last-column]=\"last\"\n      ></aup-table-cell-renderer>\n    </td>\n  </ng-container>\n\n  <tr mat-header-row *matHeaderRowDef=\"columnIds.value\"></tr>\n  <tr mat-row *matRowDef=\"let row; columns: columnIds.value; let i = index\"\n      [ngClass]=\"tableModel.getRowClasses(row)\" [attr.trackBy]=\"tableModel.trackBy(i, row)\"\n  ></tr>\n\n</table>\n",
-                    styles: [":host{align-items:stretch;display:flex;flex-direction:column}:host table{flex:1}"]
+                    styles: [":host{align-items:stretch;display:flex;flex-direction:column}:host table{flex:1;width:100%}"]
                 },] }
     ];
     TableComponent.ctorParameters = function () { return []; };
@@ -4939,8 +4947,6 @@
                 },] }
     ];
 
-    var PLACE_AUTH_SERVICE = new i0.InjectionToken("PlaceAuthService");
-
     exports.ParameterDefinition = /** @class */ (function () {
         function ParameterDefinition(propertyName, options, urlFormat) {
             this.propertyName = propertyName;
@@ -5312,77 +5318,6 @@
         PlaceComponent.injectDefinition = injectDefinition;
     })(exports.PlaceComponent || (exports.PlaceComponent = {}));
 
-    var Visit = /** @class */ (function () {
-        function Visit(placeDefinition, visitParameters) {
-            if (visitParameters === void 0) { visitParameters = {}; }
-            this.placeDefinition = placeDefinition;
-            this.visitParameters = visitParameters;
-        }
-        // @Trace()
-        Visit.prototype.getRouteId = function () {
-            return this.placeDefinition.getRouteIdFrom(this);
-        };
-        // @Trace()
-        Visit.prototype.hasRouteId = function () {
-            return !_.isNil(this.getRouteId());
-        };
-        /**
-         * Returns the value of the place parameter with the specified name.  The parameter
-         * name is taken from the `as` option, e.g. {as: 'aCustomName'} otherwise it is the
-         * same as the the ValueModel property name.
-         * @param parameterName the field name of the property model or the `as` option if specified.
-         */
-        Visit.prototype.getParameter = function (parameterName) {
-            return this.visitParameters[parameterName];
-        };
-        // @Trace()
-        Visit.prototype.hasParameter = function (parameterName) {
-            return Object.keys(this.visitParameters).includes(parameterName);
-        };
-        Visit.prototype.replace = function (parameter, value) {
-            var _a;
-            return new Visit(this.placeDefinition, Object.assign(Object.assign({}, this.visitParameters), (_a = {}, _a[parameter.name] = value, _a)));
-        };
-        Visit.prototype.mergeRouteParameters = function (routeParams) {
-            var _this = this;
-            // todo: whitelist parameters.
-            var routeParameterKeys = Object.keys(routeParams);
-            var params = {};
-            this.placeDefinition.getVisitParameterDefs().forEach(function (def) {
-                if (def.isRouteId || def.isRouteParameter) {
-                    if (routeParameterKeys.includes(def.name)) {
-                        params[def.name] = routeParams[def.name];
-                    }
-                }
-                else {
-                    // copy non route params as is, but only if they already exist otherwise we'll inject nil values and break the
-                    // defaults and remember sanitisation process.
-                    var value = _this.getParameter(def.name);
-                    if (_this.hasParameter(def.name)) {
-                        params[def.name] = value;
-                    }
-                }
-            });
-            return new Visit(this.placeDefinition, params);
-        };
-        Visit.prototype.hasRoutingChangedFrom = function (other) {
-            var samePlace = other.placeDefinition === this.placeDefinition;
-            var sameRouteParameters = _.isEqual(this.placeDefinition.getFormattedRouteParameters(this, true), this.placeDefinition.getFormattedRouteParameters(other, true));
-            return !samePlace || !sameRouteParameters;
-        };
-        Visit.prototype.hasChangedFrom = function (other) {
-            var sameNonRouteParameters = _.isEqual(this.placeDefinition.getNonRouteParameters(this), this.placeDefinition.getNonRouteParameters(other));
-            return !sameNonRouteParameters || this.hasRoutingChangedFrom(other);
-        };
-        Visit.prototype.toDebugString = function () {
-            var _this = this;
-            return Object.keys(this.visitParameters).map(function (k) { return k + "=" + _this.visitParameters[k]; }).join(",");
-        };
-        return Visit;
-    }());
-
-    var AUP_PLACE_CONFIG = new i0.InjectionToken('AUP_PLACE_CONFIG');
-
     /**
      * This class handles the logic around canDeactivate for a given router state transition.  It's core responsibilities are:
      * 1. Ensure we only ask the component to deactivate once on a given navigation cycle (since visit sanitisation can result in multiple round trips to through the router.)
@@ -6247,6 +6182,33 @@
         return PopStateNavigation;
     }(AbstractPopStateNavigation));
 
+    (function (PlaceAccessGuard) {
+        var NoAuth = /** @class */ (function () {
+            function NoAuth() {
+            }
+            NoAuth.prototype.isAuthenticated = function () {
+                return true;
+            };
+            NoAuth.prototype.isAuthorised = function (placeDefinition) {
+                return true;
+            };
+            return NoAuth;
+        }());
+        __decorate([
+            pectin.Trace(),
+            __metadata("design:type", Function),
+            __metadata("design:paramtypes", []),
+            __metadata("design:returntype", Object)
+        ], NoAuth.prototype, "isAuthenticated", null);
+        __decorate([
+            pectin.Trace(),
+            __metadata("design:type", Function),
+            __metadata("design:paramtypes", [PlaceDefinition]),
+            __metadata("design:returntype", Boolean)
+        ], NoAuth.prototype, "isAuthorised", null);
+        PlaceAccessGuard.NoAuth = NoAuth;
+    })(exports.PlaceAccessGuard || (exports.PlaceAccessGuard = {}));
+
     exports.PlaceHistory = /** @class */ (function () {
         function PlaceHistory() {
             this._archive = new Map();
@@ -6557,6 +6519,11 @@
             _this.navigationSessionModel = new pectin.MutableValueModel();
             _this._activeVisits = new pectin.MutableListModel();
             _this.sessionFinishedJobs = [];
+            /**
+             * An observable model containing the authoriser function.  This allows places to react to changes
+             * in permissions when any underlying auth logic changes, e.g. a role being removed from a user.
+             */
+            _this._accessGuard = new pectin.DelegatingValueModel().withDefault(new exports.PlaceAccessGuard.NoAuth());
             if (window['Cypress']) {
                 window['aup.PlaceRouter'] = _this;
             }
@@ -6616,6 +6583,32 @@
             angularLocation.onUrlChange(function (url) { return _this.onUrlChanged(url); });
             return _this;
         }
+        Object.defineProperty(PlaceRouter.prototype, "accessGuard", {
+            get: function () {
+                return this._accessGuard.readonly;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        PlaceRouter.prototype.configureAuth = function (accessGrant, redirections) {
+            // We need a shitty mutable model until setDelegate is clever enough to work with readonly models.
+            var hackyMutableModel = new pectin.MutableValueModel();
+            var binding = new pectin.Binding(hackyMutableModel, accessGrant, {
+                toRight: function (leftValue) {
+                    return pectin.lang.illegalState('hackyMutableModel is read only');
+                },
+                toLeft: function (rightValue) { return rightValue; }
+            });
+            binding.writeLeft();
+            this._accessGuard.setDelegate(hackyMutableModel);
+            this.redirections = redirections;
+        };
+        PlaceRouter.prototype.getAuthenticationFailureRedirect = function (activatedRoute, state) {
+            return this.redirections.onAuthenticationFailure(activatedRoute, state);
+        };
+        PlaceRouter.prototype.getAuthorisationFailureRedirect = function (activatedRoute, state) {
+            return this.redirections.onAuthorisationFailure(activatedRoute, state);
+        };
         Object.defineProperty(PlaceRouter.prototype, "navigationSession", {
             get: function () {
                 return this.navigationSessionModel.value;
@@ -6854,6 +6847,83 @@
         { type: UrlService },
         { type: exports.PlaceHistory }
     ]; };
+    __decorate([
+        pectin.Trace(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [pectin.ValueModel, Object]),
+        __metadata("design:returntype", void 0)
+    ], PlaceRouter.prototype, "configureAuth", null);
+
+    var Visit = /** @class */ (function () {
+        function Visit(placeDefinition, visitParameters) {
+            if (visitParameters === void 0) { visitParameters = {}; }
+            this.placeDefinition = placeDefinition;
+            this.visitParameters = visitParameters;
+        }
+        // @Trace()
+        Visit.prototype.getRouteId = function () {
+            return this.placeDefinition.getRouteIdFrom(this);
+        };
+        // @Trace()
+        Visit.prototype.hasRouteId = function () {
+            return !_.isNil(this.getRouteId());
+        };
+        /**
+         * Returns the value of the place parameter with the specified name.  The parameter
+         * name is taken from the `as` option, e.g. {as: 'aCustomName'} otherwise it is the
+         * same as the the ValueModel property name.
+         * @param parameterName the field name of the property model or the `as` option if specified.
+         */
+        Visit.prototype.getParameter = function (parameterName) {
+            return this.visitParameters[parameterName];
+        };
+        // @Trace()
+        Visit.prototype.hasParameter = function (parameterName) {
+            return Object.keys(this.visitParameters).includes(parameterName);
+        };
+        Visit.prototype.replace = function (parameter, value) {
+            var _a;
+            return new Visit(this.placeDefinition, Object.assign(Object.assign({}, this.visitParameters), (_a = {}, _a[parameter.name] = value, _a)));
+        };
+        Visit.prototype.mergeRouteParameters = function (routeParams) {
+            var _this = this;
+            // todo: whitelist parameters.
+            var routeParameterKeys = Object.keys(routeParams);
+            var params = {};
+            this.placeDefinition.getVisitParameterDefs().forEach(function (def) {
+                if (def.isRouteId || def.isRouteParameter) {
+                    if (routeParameterKeys.includes(def.name)) {
+                        params[def.name] = routeParams[def.name];
+                    }
+                }
+                else {
+                    // copy non route params as is, but only if they already exist otherwise we'll inject nil values and break the
+                    // defaults and remember sanitisation process.
+                    var value = _this.getParameter(def.name);
+                    if (_this.hasParameter(def.name)) {
+                        params[def.name] = value;
+                    }
+                }
+            });
+            return new Visit(this.placeDefinition, params);
+        };
+        Visit.prototype.hasRoutingChangedFrom = function (other) {
+            var samePlace = other.placeDefinition === this.placeDefinition;
+            var sameRouteParameters = _.isEqual(this.placeDefinition.getFormattedRouteParameters(this, true), this.placeDefinition.getFormattedRouteParameters(other, true));
+            return !samePlace || !sameRouteParameters;
+        };
+        Visit.prototype.hasChangedFrom = function (other) {
+            var sameNonRouteParameters = _.isEqual(this.placeDefinition.getNonRouteParameters(this), this.placeDefinition.getNonRouteParameters(other));
+            return !sameNonRouteParameters || this.hasRoutingChangedFrom(other);
+        };
+        Visit.prototype.toDebugString = function () {
+            var _this = this;
+            return Object.keys(this.visitParameters).map(function (k) { return k + "=" + _this.visitParameters[k]; }).join(",");
+        };
+        return Visit;
+    }());
+
+    var AUP_PLACE_CONFIG = new i0.InjectionToken('AUP_PLACE_CONFIG');
 
     // Freezes the state of the components at the start of the animation.
     var animationStartStyle = animations$1.style({ position: 'absolute', top: '0', left: '0', bottom: '0', right: '0' });
@@ -6901,11 +6971,10 @@
 
     var PlaceOutletComponent = /** @class */ (function (_super) {
         __extends(PlaceOutletComponent, _super);
-        function PlaceOutletComponent(router, placeRouter, placeAuthService, placeConfig, parentOutlet) {
+        function PlaceOutletComponent(router, placeRouter, 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);
@@ -6950,11 +7019,11 @@
             chain(_this._activePlaceModel)
                 .postponeWhile(_this.navigationInProgress)
                 .subscribe(function (place) { return _this.placeChanged.emit(place); });
-            when(placeAuthService.authoriserModel).changes(function (isAuthorised) {
+            when(placeRouter.accessGuard).changes(function (guard) {
                 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)));
+                if (activePlace && !guard.isAuthorised(activePlace.placeDefinition)) {
+                    var visit = placeRouter.getAuthorisationFailureRedirect(_this._activatedRouteModel.value.snapshot, _this.router.routerState.snapshot);
+                    _this.placeRouter.navigate(visit);
                 }
             });
             return _this;
@@ -7004,6 +7073,7 @@
             enumerable: false,
             configurable: true
         });
+        // @Trace()
         PlaceOutletComponent.prototype.onOutletActivated = function (routerOutlet, place) {
             this._activatedRouteModel.value = routerOutlet.activatedRoute;
             this._activePlaceModel.value = place;
@@ -7098,7 +7168,6 @@
     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 }] }
     ]; };
@@ -7126,12 +7195,6 @@
         pectin.StoreInListModel('customPlaceAnimationOrderModel'),
         __metadata("design:type", Array)
     ], PlaceOutletComponent.prototype, "customPlaceAnimationOrder", void 0);
-    __decorate([
-        pectin.Trace(),
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", [i1$1.RouterOutlet, exports.PlaceComponent]),
-        __metadata("design:returntype", void 0)
-    ], PlaceOutletComponent.prototype, "onOutletActivated", null);
     __decorate([
         pectin.Trace(),
         __metadata("design:type", Function),
@@ -7141,13 +7204,17 @@
 
     var AbstractPlaceNavigationComponent = /** @class */ (function (_super) {
         __extends(AbstractPlaceNavigationComponent, _super);
-        function AbstractPlaceNavigationComponent(authService) {
+        function AbstractPlaceNavigationComponent(placeRouter) {
             var _this = _super.call(this) || this;
+            _this.placeRouter = placeRouter;
             _this._activePlaceComponent = new pectin.DelegatingValueModel();
             var _a = pectin.Dsl.disposeWith(_this), chain = _a.chain, valueOf = _a.valueOf, before = _a.before, when = _a.when, after = _a.after, observe = _a.observe, switchOn = _a.switchOn;
             _this.placeDefinitions = chain(_this.placesModel)
                 .map(function (c) { return exports.PlaceComponent.getDefinition(c); })
-                .select(function (d) { return authService.authoriserModel.value(d); }, { dependsOn: authService.authoriserModel });
+                .select(function (d) {
+                var guard = placeRouter.accessGuard.value;
+                return guard.isAuthorised(d);
+            }, { dependsOn: placeRouter.accessGuard });
             _this.commandFactory = pectin.Command.createFactory(function (placeDefinition) {
                 _this.placeOutlet.navigate(new Visit(placeDefinition));
             });
@@ -7181,7 +7248,7 @@
                 },] }
     ];
     AbstractPlaceNavigationComponent.ctorParameters = function () { return [
-        { type: undefined, decorators: [{ type: i0.Inject, args: [PLACE_AUTH_SERVICE,] }] }
+        { type: PlaceRouter }
     ]; };
     AbstractPlaceNavigationComponent.propDecorators = {
         places: [{ type: i0.Input }],
@@ -7258,8 +7325,8 @@
 
     var ListPlaceNavComponent = /** @class */ (function (_super) {
         __extends(ListPlaceNavComponent, _super);
-        function ListPlaceNavComponent(authService) {
-            return _super.call(this, authService) || this;
+        function ListPlaceNavComponent(router) {
+            return _super.call(this, router) || this;
         }
         return ListPlaceNavComponent;
     }(AbstractPlaceNavigationComponent));
@@ -7271,7 +7338,7 @@
                 },] }
     ];
     ListPlaceNavComponent.ctorParameters = function () { return [
-        { type: undefined, decorators: [{ type: i0.Inject, args: [PLACE_AUTH_SERVICE,] }] }
+        { type: PlaceRouter }
     ]; };
 
     /**
@@ -7318,9 +7385,8 @@
      */
     var SidePlaceNavigationComponent = /** @class */ (function (_super) {
         __extends(SidePlaceNavigationComponent, _super);
-        function SidePlaceNavigationComponent(router, authService) {
-            var _this = _super.call(this, authService) || this;
-            _this.router = router;
+        function SidePlaceNavigationComponent(router) {
+            var _this = _super.call(this, router) || this;
             _this.expanded = false;
             return _this;
         }
@@ -7343,8 +7409,7 @@
                 },] }
     ];
     SidePlaceNavigationComponent.ctorParameters = function () { return [
-        { type: i1$1.Router },
-        { type: undefined, decorators: [{ type: i0.Inject, args: [PLACE_AUTH_SERVICE,] }] }
+        { type: PlaceRouter }
     ]; };
     SidePlaceNavigationComponent.propDecorators = {
         expanded: [{ type: i0.HostBinding, args: ['class.expanded',] }],
@@ -7353,8 +7418,8 @@
 
     var TabbedPlaceNavigationComponent = /** @class */ (function (_super) {
         __extends(TabbedPlaceNavigationComponent, _super);
-        function TabbedPlaceNavigationComponent(authService) {
-            return _super.call(this, authService) || this;
+        function TabbedPlaceNavigationComponent(router) {
+            return _super.call(this, router) || this;
         }
         return TabbedPlaceNavigationComponent;
     }(AbstractPlaceNavigationComponent));
@@ -7366,7 +7431,7 @@
                 },] }
     ];
     TabbedPlaceNavigationComponent.ctorParameters = function () { return [
-        { type: undefined, decorators: [{ type: i0.Inject, args: [PLACE_AUTH_SERVICE,] }] }
+        { type: PlaceRouter }
     ]; };
 
     var PlaceModule = /** @class */ (function () {
@@ -7719,12 +7784,11 @@
     }());
 
     var PlaceGuard = /** @class */ (function () {
-        function PlaceGuard(router, urlService, placeRouter, placeHistory, placeAuthService, interactionService, injector) {
+        function PlaceGuard(router, urlService, placeRouter, placeHistory, interactionService, injector) {
             this.router = router;
             this.urlService = urlService;
             this.placeRouter = placeRouter;
             this.placeHistory = placeHistory;
-            this.placeAuthService = placeAuthService;
             this.interactionService = interactionService;
             this.injector = injector;
         }
@@ -7739,20 +7803,20 @@
                             if (!exports.PlaceComponent.isPlaceComponentConstructor(activatedRoute.component)) return [3 /*break*/, 4];
                             placeDefinition_1 = exports.PlaceComponent.getDefinition(activatedRoute.component);
                             if (!placeDefinition_1.authenticate) return [3 /*break*/, 2];
-                            return [4 /*yield*/, this.placeAuthService.isAuthenticated()];
+                            return [4 /*yield*/, this.placeRouter.accessGuard.value.isAuthenticated()];
                         case 1:
                             if (!(_a.sent())) {
-                                redirectLocation = this.placeAuthService.handleNotAuthenticated(activatedRoute, state);
+                                redirectLocation = this.placeRouter.getAuthenticationFailureRedirect(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)) {
-                                redirectLocation = this.placeAuthService.handleNotAuthorised(activatedRoute, state);
+                            if (!(this.placeRouter.accessGuard.value ? this.placeRouter.accessGuard.value.isAuthorised(placeDefinition_1) : true)) {
+                                redirectLocation = this.placeRouter.getAuthorisationFailureRedirect(activatedRoute, state);
                                 nextPlaceDef = this.getPlaceDefinition(redirectLocation);
-                                if (!this.placeAuthService.isAuthorised(nextPlaceDef)) {
+                                if (!(this.placeRouter.accessGuard.value ? this.placeRouter.accessGuard.value.isAuthorised(nextPlaceDef) : true)) {
                                     pectin.lang.illegalState("handleNotAuthorised hook returned place " + nextPlaceDef.component.name + " that is not authorised for the current user.");
                                 }
                                 return [2 /*return*/, this.createUrlTree(redirectLocation)];
@@ -7860,7 +7924,7 @@
         };
         return PlaceGuard;
     }());
-    PlaceGuard.ɵprov = i0.ɵɵdefineInjectable({ factory: function PlaceGuard_Factory() { return new PlaceGuard(i0.ɵɵinject(i1$1.Router), i0.ɵɵinject(UrlService), i0.ɵɵinject(PlaceRouter), i0.ɵɵinject(exports.PlaceHistory), i0.ɵɵinject(PLACE_AUTH_SERVICE), i0.ɵɵinject(exports.InteractionService), i0.ɵɵinject(i0.INJECTOR)); }, token: PlaceGuard, providedIn: "root" });
+    PlaceGuard.ɵprov = i0.ɵɵdefineInjectable({ factory: function PlaceGuard_Factory() { return new PlaceGuard(i0.ɵɵinject(i1$1.Router), i0.ɵɵinject(UrlService), i0.ɵɵinject(PlaceRouter), i0.ɵɵinject(exports.PlaceHistory), i0.ɵɵinject(exports.InteractionService), i0.ɵɵinject(i0.INJECTOR)); }, token: PlaceGuard, providedIn: "root" });
     PlaceGuard.decorators = [
         { type: i0.Injectable, args: [{ providedIn: 'root' },] }
     ];
@@ -7869,7 +7933,6 @@
         { type: UrlService },
         { type: PlaceRouter },
         { type: exports.PlaceHistory },
-        { type: undefined, decorators: [{ type: i0.Inject, args: [PLACE_AUTH_SERVICE,] }] },
         { type: exports.InteractionService },
         { type: i0.Injector }
     ]; };
@@ -8059,7 +8122,6 @@
     exports.NoopAuthGuard = NoopAuthGuard;
     exports.NoopComponent = NoopComponent;
     exports.NumberInputComponent = NumberInputComponent;
-    exports.PLACE_AUTH_SERVICE = PLACE_AUTH_SERVICE;
     exports.POPUP_CONTAINER = POPUP_CONTAINER;
     exports.PORTAL_EDITOR_COMPONENT = PORTAL_EDITOR_COMPONENT;
     exports.PORTAL_RENDERER_COMPONENT = PORTAL_RENDERER_COMPONENT;