use injector in navigation callback

Author: chriskapp

projects/fusio-sdk/src/lib/component/account-container/account-container.component.ts

@@ -1,4 +1,4 @@
-import {Component, OnInit} from '@angular/core';
+import {Component, EnvironmentInjector, OnInit} from '@angular/core';
 import {ActivatedRoute, Router} from "@angular/router";
 import {Item, NavigationService} from "../../service/navigation.service";
 
@@ -12,10 +12,10 @@ export class AccountContainerComponent implements OnInit {
   active?: string;
   items: Array<Item> = [];
 
-  constructor(private router: Router, private route: ActivatedRoute, private navigation: NavigationService) { }
+  constructor(private router: Router, private route: ActivatedRoute, private navigation: NavigationService, private injector: EnvironmentInjector) { }
 
   async ngOnInit(): Promise<void> {
-    this.items = await this.navigation.getAccountNavigation(this);
+    this.items = await this.navigation.getAccountNavigation(this.injector);
     this.active = this.items[0].title;
 
     this.route.url.subscribe(() => {

projects/fusio-sdk/src/lib/component/bootstrap/bootstrap.component.ts

@@ -1,4 +1,4 @@
-import {Component, OnInit} from '@angular/core';
+import {Component, EnvironmentInjector, OnInit} from '@angular/core';
 import {User} from "fusio-sdk/dist/src/generated/backend/User";
 import {UserService} from "../../service/user.service";
 import {Item, NavigationService} from "../../service/navigation.service";
@@ -13,12 +13,12 @@ export class BootstrapComponent implements OnInit {
   userMenu: Array<Item> = [];
   anonymousMenu: Array<Item> = [];
 
-  constructor(private userMeta: UserService, private navigation: NavigationService) { }
+  constructor(private userMeta: UserService, private navigation: NavigationService, private injector: EnvironmentInjector) { }
 
   async ngOnInit(): Promise<void> {
     this.user = this.userMeta.get();
-    this.userMenu = await this.navigation.getUserNavigation(this);
-    this.anonymousMenu = await this.navigation.getAnonymousNavigation(this);
+    this.userMenu = await this.navigation.getUserNavigation(this.injector);
+    this.anonymousMenu = await this.navigation.getAnonymousNavigation(this.injector);
   }
 
 }

projects/fusio-sdk/src/lib/component/navigation/navigation.component.ts

@@ -1,4 +1,4 @@
-import {Component, OnInit} from '@angular/core';
+import {Component, EnvironmentInjector, OnInit} from '@angular/core';
 import {GroupItem, NavigationService} from "../../service/navigation.service";
 import {ConfigService} from "../../service/config.service";
 
@@ -13,13 +13,13 @@ export class NavigationComponent implements OnInit {
   version?: string;
   items: Array<GroupItem> = [];
 
-  constructor(private navigation: NavigationService, private config: ConfigService) {
+  constructor(private navigation: NavigationService, private config: ConfigService, private injector: EnvironmentInjector) {
   }
 
   async ngOnInit(): Promise<void> {
     this.title = this.config.getTitle() || 'Fusio';
     this.version = this.config.getVersion();
-    this.items = await this.navigation.getMainNavigation(this);
+    this.items = await this.navigation.getMainNavigation(this.injector);
   }
 
   changeNavHeading(item: GroupItem): void {

projects/fusio-sdk/src/lib/service/navigation.service.ts

@@ -1,4 +1,4 @@
-import {Injectable, OnInit} from '@angular/core';
+import {EnvironmentInjector, Injectable, runInInjectionContext} from '@angular/core';
 import {ConfigService} from "./config.service";
 import {BackendService} from "./backend.service";
 
@@ -10,26 +10,26 @@ export class NavigationService {
   constructor(private backend: BackendService, private config: ConfigService) {
   }
 
-  async getMainNavigation(context: OnInit): Promise<Array<GroupItem>> {
-    return this.checkPermissions(this.config.getNavigation(), context);
+  async getMainNavigation(injector: EnvironmentInjector): Promise<Array<GroupItem>> {
+    return this.checkPermissions(this.config.getNavigation(), injector);
   }
 
-  async getUserNavigation(context: OnInit): Promise<Array<Item>> {
-    return this.checkPermissionItems(this.config.getUserNavigation(), context);
+  async getUserNavigation(injector: EnvironmentInjector): Promise<Array<Item>> {
+    return this.checkPermissionItems(this.config.getUserNavigation(), injector);
   }
 
-  async getAnonymousNavigation(context: OnInit): Promise<Array<Item>> {
-    return this.checkPermissionItems(this.config.getAnonymousNavigation(), context);
+  async getAnonymousNavigation(injector: EnvironmentInjector): Promise<Array<Item>> {
+    return this.checkPermissionItems(this.config.getAnonymousNavigation(), injector);
   }
 
-  async getAccountNavigation(context: OnInit): Promise<Array<Item>> {
-    return this.checkPermissionItems(this.config.getAccountNavigation(), context);
+  async getAccountNavigation(injector: EnvironmentInjector): Promise<Array<Item>> {
+    return this.checkPermissionItems(this.config.getAccountNavigation(), injector);
   }
 
-  private async checkPermissions(navigation: Array<GroupItem>, context: OnInit): Promise<Array<GroupItem>> {
+  private async checkPermissions(navigation: Array<GroupItem>, injector: EnvironmentInjector): Promise<Array<GroupItem>> {
     let result = [];
     for (let i = 0; i < navigation.length; i++) {
-      const children = await this.checkPermissionItems(navigation[i].children, context);
+      const children = await this.checkPermissionItems(navigation[i].children, injector);
       if (children.length > 0) {
         let menu = navigation[i];
         menu.children = children;
@@ -40,9 +40,9 @@ export class NavigationService {
     return result;
   }
 
-  private async checkPermissionItems(items: Items, context: OnInit): Promise<Array<Item>> {
+  private async checkPermissionItems(items: Items, injector: EnvironmentInjector): Promise<Array<Item>> {
     if (items instanceof Function) {
-      items = await items.apply(context);
+      items = await runInInjectionContext(injector, items);
     }
 
     if (!Array.isArray(items)) {