Fixed some stuff

Reviewed-on: sh-edraft.de/kd_discord_bot#258
Reviewed-by: edraft-dev <dev.sven.heidemann@sh-edraft.de>
#Closes #256

kdb-bot/cpl-workspace.json

@@ -14,6 +14,7 @@
       "level": "src/modules/level/level.json",
       "permission": "src/modules/permission/permission.json",
       "technician": "src/modules/technician/technician.json",
+      "checks": "tools/checks/checks.json",
       "get-version": "tools/get_version/get-version.json",
       "post-build": "tools/post_build/post-build.json",
       "set-version": "tools/set_version/set-version.json"

kdb-bot/dockerfile

@@ -15,4 +15,7 @@ RUN apk add nano
 RUN pip install -r requirements.txt --extra-index-url https://pip.sh-edraft.de
 RUN pip install flask[async]
 
+# RUN pip install dnspython==2.2.1 # https://stackoverflow.com/questions/75137717/eventlet-dns-python-attribute-error-module-dns-rdtypes-has-no-attribute-any
+# ^ probably fixed py package updates
+
 CMD [ "bash", "/app/bot/bot"]

kdb-bot/src/bot/translation/de.json

@@ -86,10 +86,10 @@
     "no_permission_message": "Nein!\nIch höre nicht auf dich ¯\\_(ツ)_/¯",
     "not_implemented_yet": "Ey Alter, das kann ich noch nicht...",
     "presence": {
-      "booting": "{} Ich fahre gerade hoch...",
-      "restart": "{} Muss neue Kekse holen...",
-      "running": "{} Ich esse Kekse :D",
-      "shutdown": "{} Ich werde bestimmt wieder kommen..."
+      "booting": "Ich fahre gerade hoch...",
+      "restart": "Muss neue Kekse holen...",
+      "running": "Ich esse Kekse :D",
+      "shutdown": "Ich werde bestimmt wieder kommen..."
     }
   },
   "modules": {

kdb-bot/src/bot_api/controller/auth_controller.py

@@ -129,7 +129,6 @@ class AuthController:
         return "", 200
 
     @Route.post(f"{BasePath}/refresh")
-    @Route.authorize
     async def refresh(self) -> Response:
         dto: TokenDTO = JSONProcessor.process(TokenDTO, request.get_json(force=True, silent=True))
         result = await self._auth_service.refresh_async(dto)

kdb-bot/src/bot_core/configuration/feature_flags_enum.py

@@ -10,11 +10,12 @@ class FeatureFlagsEnum(Enum):
     boot_log_module = "BootLogModule"
     core_module = "CoreModule"
     core_extension_module = "CoreExtensionModule"
-    data_module = ("DataModule",)
-    database_module = ("DatabaseModule",)
+    data_module = "DataModule"
+    database_module = "DatabaseModule"
     level_module = "LevelModule"
     moderator_module = "ModeratorModule"
     permission_module = "PermissionModule"
     # features
     api_only = "ApiOnly"
     presence = "Presence"
+    version_in_presence = "VersionInPresence"

kdb-bot/src/bot_core/configuration/feature_flags_settings.py

@@ -1,5 +1,4 @@
 import traceback
-from typing import Optional, Callable
 
 from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC
 from cpl_core.console import Console
@@ -27,6 +26,7 @@ class FeatureFlagsSettings(ConfigurationModelABC):
             # features
             FeatureFlagsEnum.api_only.value: False,  # 13.10.2022 #70
             FeatureFlagsEnum.presence.value: True,  # 03.10.2022 #56
+            FeatureFlagsEnum.version_in_presence.value: False,  # 21.03.2023 #253
         }
 
     def get_flag(self, key: FeatureFlagsEnum) -> bool:

kdb-bot/src/bot_core/service/client_utils_service.py

@@ -111,7 +111,11 @@ class ClientUtilsService(ClientUtilsABC):
 
         import bot
 
-        name = self._t.transform(t_key).format(bot.__version__)
+        if self._feature_flags.get_flag(FeatureFlagsEnum.version_in_presence):
+            name = f"{bot.__version__} {self._t.transform(t_key)}"
+        else:
+            name = self._t.transform(t_key)
+
         await self._bot.change_presence(activity=discord.Game(name=name))
         self._logger.info(__name__, f"Set presence {name}")
 

kdb-bot/src/bot_graphql/abc/query_abc.py

@@ -82,7 +82,7 @@ class QueryABC(ObjectType):
                     break
 
         elif type(element) == AutoRoleRule:
-            element: AutoRole = element.game_server
+            element: AutoRole = element
             for u in user.users:
                 u: User = u
                 guild = bot.get_guild(u.server.discord_id)
@@ -124,28 +124,36 @@ class QueryABC(ObjectType):
         elif type(element) == User:
             for u in user.users:
                 u: User = u
-                if u.id == element.id:
+                guild = bot.get_guild(u.server.discord_id)
+                member = guild.get_member(u.discord_id)
+                if u.id == element.id or permissions.is_member_moderator(member):
                     access = True
                     break
 
         elif type(element) == UserJoinedServer:
             for u in user.users:
                 u: User = u
-                if u.id == element.user.id:
+                guild = bot.get_guild(u.server.discord_id)
+                member = guild.get_member(u.discord_id)
+                if u.id == element.id or permissions.is_member_moderator(member):
                     access = True
                     break
 
         elif type(element) == UserJoinedVoiceChannel:
             for u in user.users:
                 u: User = u
-                if u.id == element.user.id:
+                guild = bot.get_guild(u.server.discord_id)
+                member = guild.get_member(u.discord_id)
+                if u.id == element.id or permissions.is_member_moderator(member):
                     access = True
                     break
 
         elif type(element) == UserJoinedGameServer:
             for u in user.users:
                 u: User = u
-                if u.id == element.user.id:
+                guild = bot.get_guild(u.server.discord_id)
+                member = guild.get_member(u.discord_id)
+                if u.id == element.id or permissions.is_member_moderator(member):
                     access = True
                     break
 

kdb-bot/src/modules/base/helper/base_reaction_handler.py

@@ -1,12 +1,12 @@
 from datetime import datetime
 
 from cpl_core.database.context import DatabaseContextABC
-from cpl_core.logging import LoggerABC
 from cpl_discord.service import DiscordBotServiceABC
 from discord import RawReactionActionEvent
 
 from bot_core.abc.client_utils_abc import ClientUtilsABC
 from bot_core.helper.log_message_helper import LogMessageHelper
+from bot_core.logging.message_logger import MessageLogger
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
 from bot_data.abc.user_repository_abc import UserRepositoryABC
 from modules.base.abc.base_helper_abc import BaseHelperABC
@@ -16,7 +16,7 @@ from modules.base.configuration.base_server_settings import BaseServerSettings
 class BaseReactionHandler:
     def __init__(
         self,
-        logger: LoggerABC,
+        logger: MessageLogger,
         bot: DiscordBotServiceABC,
         servers: ServerRepositoryABC,
         users: UserRepositoryABC,

kdb-bot/src/modules/database/database_on_ready_event.py

@@ -274,6 +274,7 @@ class DatabaseOnReadyEvent(OnReadyABC):
         self._logger.debug(__name__, f"Start checking UserJoinedVoiceChannel table")
         for guild in self._bot.guilds:
             guild: discord.Guild = guild
+            settings: BaseServerSettings = self._config.get_configuration(f"BaseServerSettings_{guild.id}")
 
             server = self._servers.find_server_by_discord_id(guild.id)
             if server is None:
@@ -299,7 +300,6 @@ class DatabaseOnReadyEvent(OnReadyABC):
                             f"Active UserJoinedVoiceChannel found in database: {guild.id}:{member.id}@{join.joined_on}",
                         )
                         join.leaved_on = datetime.now()
-                        settings: BaseServerSettings = self._config.get_configuration(f"BaseServerSettings_{guild.id}")
 
                         if (
                             (join.leaved_on - join.joined_on).total_seconds() / 60 / 60
@@ -315,7 +315,7 @@ class DatabaseOnReadyEvent(OnReadyABC):
                         self._logger.trace(__name__, f"User {member.id} is ignored, because its a bot")
                         continue
 
-                    if member.voice is None:
+                    if member.voice is None or member.voice.channel.id in settings.afk_channel_ids:
                         continue
 
                     user = self._users.find_user_by_discord_id_and_server_id(member.id, server.id)

kdb-bot/tools/checks/__init__.py

@@ -0,0 +1 @@
+# imports

kdb-bot/tools/checks/checks.json

@@ -0,0 +1,44 @@
+{
+  "ProjectSettings": {
+    "Name": "checks",
+    "Version": {
+      "Major": "1",
+      "Minor": "0",
+      "Micro": "0"
+    },
+    "Author": "Sven Heidemann",
+    "AuthorEmail": "sven.heidemann@sh-edraft.de",
+    "Description": "CPL internal tool to set version from branch name",
+    "LongDescription": "CPL internal tool to set version from branch name",
+    "URL": "https://www.sh-edraft.de",
+    "CopyrightDate": "2022",
+    "CopyrightName": "sh-edraft.de",
+    "LicenseName": "MIT",
+    "LicenseDescription": "MIT, see LICENSE for more details.",
+    "Dependencies": [
+      "cpl-core==2022.12.0"
+    ],
+    "DevDependencies": [
+      "cpl-cli==2022.12.0"
+    ],
+    "PythonVersion": ">=3.10.4",
+    "PythonPath": {},
+    "Classifiers": []
+  },
+  "BuildSettings": {
+    "ProjectType": "library",
+    "SourcePath": "",
+    "OutputPath": "../../dist",
+    "Main": "checks.main",
+    "EntryPoint": "checks",
+    "IncludePackageData": false,
+    "Included": [],
+    "Excluded": [
+      "*/__pycache__",
+      "*/logs",
+      "*/tests"
+    ],
+    "PackageData": {},
+    "ProjectReferences": []
+  }
+}

kdb-bot/tools/checks/get_ontime_overlaps.py

@@ -0,0 +1,80 @@
+import json
+from datetime import datetime
+
+from cpl_query.extension import List
+
+
+class UserJoinedVoiceChannel:
+    def __init__(self):
+        self.JoinId = None
+        self.UserId = None
+        self.DiscordChannelId = None
+        self.JoinedOn = None
+        self.LeavedOn = None
+        self.CreatedAt = None
+        self.LastModifiedAt = None
+
+    @property
+    def ontime(self) -> int:
+        return round((self.LeavedOn - self.JoinedOn).total_seconds() / 3600, 2)
+
+    def from_dict(self, data: dict):
+        self.JoinId = data["JoinId"]
+        self.UserId = data["UserId"]
+        self.DiscordChannelId = data["DiscordChannelId"]
+        self.JoinedOn = datetime.strptime(data["JoinedOn"], "%Y-%m-%d %H:%M:%S.%f")
+        self.LeavedOn = datetime.strptime(data["LeavedOn"], "%Y-%m-%d %H:%M:%S.%f")
+        self.CreatedAt = data["CreatedAt"]
+        self.LastModifiedAt = data["LastModifiedAt"]
+
+    def __repr__(self):
+        return f"{self.JoinId}: {self.UserId} {self.JoinedOn} {self.LeavedOn}"
+
+
+def main():
+    data = json.loads(open("UserJoinedVoiceChannel.json", "r").read())
+    ujvcs = List(UserJoinedVoiceChannel)
+    for x in data:
+        ujvc = UserJoinedVoiceChannel()
+        ujvc.from_dict(x)
+        ujvcs.append(ujvc)
+
+    users = ujvcs.order_by(lambda x: x.UserId).select(lambda x: x.UserId).distinct()
+    groups = {}
+    for user in users:
+        groups[user] = List(UserJoinedVoiceChannel)
+        groups[user].extend(ujvcs.where(lambda x: x.UserId == user))
+
+    for group in groups:
+        values: List[UserJoinedVoiceChannel] = groups[group]
+
+        def find_overlaps(x: UserJoinedVoiceChannel) -> bool:
+            for y in values:
+                if x == y:
+                    continue
+
+                from collections import namedtuple
+
+                Range = namedtuple("Range", ["start", "end"])
+                r1 = Range(start=x.JoinedOn, end=x.LeavedOn)
+                r2 = Range(start=y.LeavedOn, end=y.LeavedOn)
+                latest_start = max(r1.start, r2.start)
+                earliest_end = min(r1.end, r2.end)
+                delta = (earliest_end - latest_start).days + 1
+                overlap = max(0, delta)
+                if overlap > 0:
+                    return True
+
+        overlaps = values.where(find_overlaps)
+        if overlaps.count() == 0:
+            continue
+
+        print(overlaps.select(lambda x: x.JoinId))
+        print(f"{group} has {overlaps.count()} of {values.count()}")
+        ontime = overlaps.sum(lambda x: x.ontime)
+        print(f"ontime: {ontime}")
+        print(f"xp: {ontime * 8}")
+
+
+if __name__ == "__main__":
+    main()

kdb-web/src/app/components/header/header.component.ts

@@ -1,18 +1,19 @@
-import { Component, OnInit } from '@angular/core';
-import { Router } from '@angular/router';
-import { LangChangeEvent, TranslateService } from '@ngx-translate/core';
-import { MenuItem, PrimeNGConfig } from 'primeng/api';
-import { catchError } from 'rxjs/operators';
-import { AuthService } from 'src/app/services/auth/auth.service';
-import { SettingsService } from 'src/app/services/settings/settings.service';
-import { SpinnerService } from 'src/app/services/spinner/spinner.service';
-import { ThemeService } from 'src/app/services/theme/theme.service';
+import { Component, OnInit } from "@angular/core";
+import { Router } from "@angular/router";
+import { LangChangeEvent, TranslateService } from "@ngx-translate/core";
+import { MenuItem, PrimeNGConfig } from "primeng/api";
+import { catchError } from "rxjs/operators";
+import { AuthService } from "src/app/services/auth/auth.service";
+import { SettingsService } from "src/app/services/settings/settings.service";
+import { SpinnerService } from "src/app/services/spinner/spinner.service";
+import { ThemeService } from "src/app/services/theme/theme.service";
 import { throwError } from "rxjs";
+import { SidebarService } from "../../services/sidebar/sidebar.service";
 
 @Component({
-  selector: 'app-header',
-  templateUrl: './header.component.html',
-  styleUrls: ['./header.component.scss']
+  selector: "app-header",
+  templateUrl: "./header.component.html",
+  styleUrls: ["./header.component.scss"]
 })
 export class HeaderComponent implements OnInit {
   langList: MenuItem[] = [];
@@ -26,8 +27,10 @@ export class HeaderComponent implements OnInit {
     private spinnerService: SpinnerService,
     private settings: SettingsService,
     private translateService: TranslateService,
-    private config: PrimeNGConfig
-  ) { }
+    private config: PrimeNGConfig,
+    private sidebarService: SidebarService,
+  ) {
+  }
 
   ngOnInit(): void {
     this.initMenuLists();
@@ -38,9 +41,12 @@ export class HeaderComponent implements OnInit {
   }
 
   initUserMenuList(): void {
+    if (!this.authService.isLoggedIn$.value) {
+      return;
+    }
     this.spinnerService.showSpinner();
     const mail = this.authService.getEMailFromDecodedToken(this.authService.getDecodedToken());
-    this.authService.getUserByEMail(mail ?? '')
+    this.authService.getUserByEMail(mail ?? "")
       .pipe(catchError(error => {
         this.spinnerService.hideSpinner();
         this.authService.logout();
@@ -48,7 +54,7 @@ export class HeaderComponent implements OnInit {
       }))
       .subscribe(user => {
         this.spinnerService.hideSpinner();
-
+        this.sidebarService.setMenu(true);
 
         this.userMenuList = [
           {
@@ -59,22 +65,22 @@ export class HeaderComponent implements OnInit {
             separator: true
           },
           {
-            label: this.translateService.instant('header.change_password'), command: () => {
+            label: this.translateService.instant("header.change_password"), command: () => {
               this.changePassword();
             },
-            icon: 'pi pi-key'
+            icon: "pi pi-key"
           },
           {
-            label: this.translateService.instant('header.settings'), command: () => {
+            label: this.translateService.instant("header.settings"), command: () => {
               this.userSettings();
             },
-            icon: 'pi pi-cog'
+            icon: "pi pi-cog"
           },
           {
-            label: this.translateService.instant('header.logout'), command: () => {
+            label: this.translateService.instant("header.logout"), command: () => {
               this.logout();
             },
-            icon: 'pi pi-sign-out'
+            icon: "pi pi-sign-out"
           }
         ];
       });
@@ -83,17 +89,17 @@ export class HeaderComponent implements OnInit {
   initMenuLists(): void {
     this.langList = [
       {
-        label: 'English', command: () => {
-          this.translate('en');
-          this.setLang('en');
-        },
+        label: "English", command: () => {
+          this.translate("en");
+          this.setLang("en");
+        }
       },
       {
-        label: 'Deutsch', command: () => {
-          this.translate('de');
-          this.setLang('de');
-        },
-      },
+        label: "Deutsch", command: () => {
+          this.translate("de");
+          this.setLang("de");
+        }
+      }
     ];
 
     this.initUserMenuList();
@@ -117,11 +123,11 @@ export class HeaderComponent implements OnInit {
   }
 
   changePassword(): void {
-    this.router.navigate(['/change-password']);
+    this.router.navigate(["/change-password"]);
   }
 
   userSettings(): void {
-    this.router.navigate(['/user-settings']);
+    this.router.navigate(["/user-settings"]);
   }
 
   logout(): void {
@@ -130,7 +136,7 @@ export class HeaderComponent implements OnInit {
 
   translate(lang: string) {
     this.translateService.use(lang);
-    this.translateService.get('primeng').subscribe(res => this.config.setTranslation(res));
+    this.translateService.get("primeng").subscribe(res => this.config.setTranslation(res));
   }
 
   loadLang(): void {
@@ -138,28 +144,26 @@ export class HeaderComponent implements OnInit {
     const mail = this.authService.getEMailFromDecodedToken(token);
 
     if (!mail) {
-      this.translate('en');
+      this.translate("en");
       return;
     }
 
     let lang = localStorage.getItem(`${mail}_lang`);
     if (!lang) {
-      lang = 'en';
+      lang = "en";
       this.setLang(lang);
     }
     this.translate(lang);
   }
 
   setLang(lang: string): void {
-    this.authService.isUserLoggedInAsync().then(result => {
-      if (!result) {
+    if (!this.authService.isLoggedIn$.value) {
       return;
     }
 
     const token = this.authService.getDecodedToken();
     const mail = this.authService.getEMailFromDecodedToken(token);
     localStorage.setItem(`${mail}_lang`, lang);
-    });
   }
 
 }

kdb-web/src/app/modules/auth/components/forget-password/forget-password.component.ts

@@ -1,18 +1,18 @@
-import { Component, OnInit } from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { ActivatedRoute, Router } from '@angular/router';
-import { TranslateService } from '@ngx-translate/core';
-import { catchError } from 'rxjs/operators';
-import { ResetPasswordDTO } from 'src/app/models/auth/reset-password.dto';
-import { AuthService } from 'src/app/services/auth/auth.service';
-import { SpinnerService } from 'src/app/services/spinner/spinner.service';
-import { ToastService } from 'src/app/services/toast/toast.service';
+import { Component, OnInit } from "@angular/core";
+import { FormBuilder, FormGroup, Validators } from "@angular/forms";
+import { ActivatedRoute, Router } from "@angular/router";
+import { TranslateService } from "@ngx-translate/core";
+import { catchError } from "rxjs/operators";
+import { ResetPasswordDTO } from "src/app/models/auth/reset-password.dto";
+import { AuthService } from "src/app/services/auth/auth.service";
+import { SpinnerService } from "src/app/services/spinner/spinner.service";
+import { ToastService } from "src/app/services/toast/toast.service";
 import { throwError } from "rxjs";
 
 @Component({
-  selector: 'app-forget-password',
-  templateUrl: './forget-password.component.html',
-  styleUrls: ['./forget-password.component.scss']
+  selector: "app-forget-password",
+  templateUrl: "./forget-password.component.html",
+  styleUrls: ["./forget-password.component.scss"]
 })
 export class ForgetPasswordComponent implements OnInit {
 
@@ -35,19 +35,18 @@ export class ForgetPasswordComponent implements OnInit {
     private route: ActivatedRoute,
     private toastService: ToastService,
     private translate: TranslateService
-  ) { }
+  ) {
+  }
 
   ngOnInit(): void {
     this.spinnerService.showSpinner();
-    this.authService.isUserLoggedInAsync().then(result => {
-      if (result) {
-        this.router.navigate(['/dashboard']);
+    if (!this.authService.isLoggedIn$.value) {
+      this.router.navigate(["/dashboard"]);
     }
 
     this.initForms();
     this.checkResetPasswordId();
     this.spinnerService.hideSpinner();
-    });
   }
 
   initForms(): void {
@@ -62,11 +61,11 @@ export class ForgetPasswordComponent implements OnInit {
   }
 
   login(): void {
-    this.router.navigate(['/auth/login']);
+    this.router.navigate(["/auth/login"]);
   }
 
   register(): void {
-    this.router.navigate(['/auth/register']);
+    this.router.navigate(["/auth/register"]);
   }
 
   forgotPassword(): void {
@@ -84,33 +83,35 @@ export class ForgetPasswordComponent implements OnInit {
       })).subscribe(res => {
       this.spinnerService.hideSpinner();
       this.ready = true;
-        setTimeout(() => { this.router.navigate(['/dashboard']); }, 5000);
+      setTimeout(() => {
+        this.router.navigate(["/dashboard"]);
+      }, 5000);
     });
   }
 
   checkResetPasswordId(): void {
-    const id = this.route.snapshot.params['id'];
+    const id = this.route.snapshot.params["id"];
     if (id) {
       this.resetPasswordId = id;
       this.spinnerService.showSpinner();
       this.authService.getEMailFromforgotPasswordId(id)
         .pipe(catchError(error => {
           this.spinnerService.hideSpinner();
-          this.router.navigate(['/auth/forgot-password']);
+          this.router.navigate(["/auth/forgot-password"]);
           return throwError(() => error);
         })).subscribe(email => {
         this.spinnerService.hideSpinner();
         if (email) {
           this.emailForm.value.email = email;
         } else {
-            this.router.navigate(['/auth/forgot-password']);
+          this.router.navigate(["/auth/forgot-password"]);
         }
       });
     }
   }
 
   resetPassword(): void {
-    const id = this.route.snapshot.params['id'];
+    const id = this.route.snapshot.params["id"];
     if (this.emailForm.value.password !== this.emailForm.value.passwordRepeat) {
       this.repeatErrors.password = true;
       return;
@@ -124,14 +125,14 @@ export class ForgetPasswordComponent implements OnInit {
 
     this.authService.resetPassword(resetPasswordDTO)
       .pipe(catchError(error => {
-        this.router.navigate(['/auth/login']);
+        this.router.navigate(["/auth/login"]);
         this.spinnerService.hideSpinner();
         return throwError(() => error);
       }))
       .subscribe(resp => {
         this.spinnerService.hideSpinner();
-        this.toastService.success(this.translate.instant('auth.forgot_password.message.reset_password'), this.translate.instant('auth.forgot_password.message.reset_password_d'));
-        this.router.navigate(['/auth/login']);
+        this.toastService.success(this.translate.instant("auth.forgot_password.message.reset_password"), this.translate.instant("auth.forgot_password.message.reset_password_d"));
+        this.router.navigate(["/auth/login"]);
       });
   }
 }

kdb-web/src/app/modules/auth/components/login/login.component.ts

@@ -48,8 +48,7 @@ export class LoginComponent implements OnInit {
   ngOnInit(): void {
     this.initLoginForm();
     this.spinnerService.showSpinner();
-    this.authService.isUserLoggedInAsync().then(result => {
-      if (result) {
+    if (this.authService.isLoggedIn$.value) {
       this.router.navigate(["/dashboard"]);
       return;
     }
@@ -57,7 +56,6 @@ export class LoginComponent implements OnInit {
     this.checkDiscordLogin();
     this.resetStateFlags();
     this.spinnerService.hideSpinner();
-    });
   }
 
   checkDiscordLogin() {

kdb-web/src/app/modules/auth/components/registration/registration.component.ts

@@ -49,12 +49,10 @@ export class RegistrationComponent implements OnInit, OnDestroy {
     private settings: SettingsService
   ) {
     this.spinnerService.showSpinner();
-    this.authService.isUserLoggedInAsync().then(res => {
-      if (res) {
+    if (!this.authService.isLoggedIn$.value) {
       this.router.navigate(["/dashboard"]);
     }
     this.spinnerService.hideSpinner();
-    });
   }
 
   ngOnInit(): void {

kdb-web/src/app/modules/view/server/profile/profile.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit } from "@angular/core";
+import { Component, OnDestroy, OnInit } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
 import { Queries } from "../../../../models/graphql/queries.model";
 import { UserListQuery } from "../../../../models/graphql/query.model";
@@ -10,17 +10,21 @@ import { AuthService } from "src/app/services/auth/auth.service";
 import { ToastService } from "src/app/services/toast/toast.service";
 import { TranslateService } from "@ngx-translate/core";
 import { Server } from "../../../../models/data/server.model";
+import { Subject } from "rxjs";
+import { takeUntil } from "rxjs/operators";
 
 @Component({
   selector: "app-profile",
   templateUrl: "./profile.component.html",
   styleUrls: ["./profile.component.scss"]
 })
-export class ProfileComponent implements OnInit {
+export class ProfileComponent implements OnInit, OnDestroy {
 
   user: User = { createdAt: "", modifiedAt: "" };
   private server: Server = {};
 
+  private unsubscriber = new Subject<void>();
+
   constructor(
     private route: ActivatedRoute,
     private router: Router,
@@ -32,10 +36,11 @@ export class ProfileComponent implements OnInit {
   ) {
   }
 
-  ngOnInit() {
+  public ngOnInit(): void {
+    this.route.params.pipe(takeUntil(this.unsubscriber)).subscribe(params => {
       this.data.getServerFromRoute(this.route).then(async (server) => {
-      if (!this.route.snapshot.params["memberId"] || this.route.snapshot.params["memberId"] == "undefined") {
-        this.router.navigate([`/server/${server.id}`]);
+        if (!params["memberId"] || params["memberId"] == "undefined") {
+          await this.router.navigate([`/server/${server.id}`]);
           return;
         }
         this.server = server;
@@ -43,17 +48,17 @@ export class ProfileComponent implements OnInit {
         let authUser = await this.auth.getLoggedInUser();
         this.spinner.showSpinner();
         let user: UserDTO | null = authUser?.users?.find(u => u.server == server.id) ?? null;
-      if (!user || user?.id != this.route.snapshot.params["memberId"] && !user?.isModerator) {
+        if (!user || user?.id != params["memberId"] && !user?.isModerator) {
           this.toast.error(this.translate.instant("view.server.profile.permission_denied"), this.translate.instant("view.server.profile.permission_denied_d"));
           this.spinner.hideSpinner();
-        this.router.navigate(["/server", server.id]);
+          await this.router.navigate(["/server", server.id]);
           return;
         }
 
         this.data.query<UserListQuery>(Queries.usersQuery, {
             serverId: this.server.id,
             filter: {
-            id: this.route.snapshot.params["memberId"]
+              id: params["memberId"]
             }
           },
           (x: { servers: Server[] }) => {
@@ -67,7 +72,11 @@ export class ProfileComponent implements OnInit {
           this.spinner.hideSpinner();
         });
       });
+    });
+  }
 
-
+  public ngOnDestroy(): void {
+    this.unsubscriber.next();
+    this.unsubscriber.complete();
   }
 }

kdb-web/src/app/services/auth/auth.service.ts

@@ -2,7 +2,7 @@ import { HttpClient, HttpHeaders } from "@angular/common/http";
 import { Injectable } from "@angular/core";
 import { Router } from "@angular/router";
 import { JwtHelperService } from "@auth0/angular-jwt";
-import { firstValueFrom, Observable, Subject, Subscription, throwError } from "rxjs";
+import { BehaviorSubject, firstValueFrom, Observable, Subject, Subscription, throwError } from "rxjs";
 import { catchError } from "rxjs/operators";
 import { AdminUpdateUserDTO } from "src/app/models/auth/admin-update-user.dto";
 import { AuthRoles } from "src/app/models/auth/auth-roles.enum";
@@ -23,8 +23,7 @@ import { OAuthDTO } from "../../models/auth/oauth.dto";
 })
 export class AuthService {
 
-  private isLoggedIn!: boolean;
-  isLoggedIn$ = new Subject<boolean>();
+  isLoggedIn$ = new BehaviorSubject<boolean>(false);
 
   constructor(
     private appsettings: SettingsService,
@@ -33,9 +32,6 @@ export class AuthService {
     private jwtHelper: JwtHelperService,
     private spinnerService: SpinnerService
   ) {
-    this.isLoggedIn$.subscribe(value => {
-      this.isLoggedIn = value;
-    });
   }
 
   /* data requests */
@@ -279,17 +275,13 @@ export class AuthService {
       return false;
     }
 
-    if (this.isLoggedIn) {
     this.spinnerService.showSpinner();
-
     const resfreshedToken = await firstValueFrom(await this.refresh(token));
-
     this.spinnerService.hideSpinner();
     if (resfreshedToken) {
       this.saveToken(resfreshedToken);
       return true;
     }
-    }
 
     return false;
   }

kdb-web/src/app/services/theme/theme.service.ts

@@ -4,18 +4,18 @@ import { Themes } from "src/app/models/view/themes.enum";
 import { AuthService } from "../auth/auth.service";
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: "root"
 })
 export class ThemeService {
 
   themeName: string = Themes.Default;
 
-  sidebarWidth = '150px';
+  sidebarWidth = "150px";
   isSidebarOpen = false;
 
   themeName$ = new BehaviorSubject<string>(Themes.Default);
   isSidebarOpen$ = new BehaviorSubject<boolean>(true);
-  sidebarWidth$ = new BehaviorSubject<string>('175px');
+  sidebarWidth$ = new BehaviorSubject<string>("175px");
 
   constructor(
     private authService: AuthService
@@ -25,7 +25,7 @@ export class ThemeService {
     });
     this.isSidebarOpen$.subscribe(isSidebarOpen => {
       this.isSidebarOpen = isSidebarOpen;
-      this.sidebarWidth$.next(isSidebarOpen ? '175px' : '75px');
+      this.sidebarWidth$.next(isSidebarOpen ? "175px" : "75px");
     });
     this.sidebarWidth$.subscribe(sidebarWidth => {
       this.sidebarWidth = sidebarWidth;
@@ -63,8 +63,7 @@ export class ThemeService {
       return;
     }
 
-    this.authService.isUserLoggedInAsync().then(result => {
-      if (!result) {
+    if (!this.authService.isLoggedIn$.value) {
       localStorage.setItem(`default_themeName`, Themes.Default);
       this.themeName$.next(Themes.Default);
     }
@@ -76,7 +75,6 @@ export class ThemeService {
     }
     localStorage.setItem(`default_themeName`, name);
     this.themeName$.next(name);
-    });
   }
 
   loadMenu() {