update

intersystems-dach · Jan 22, 2024 · 9d2b595 · 9d2b595
1 parent 69870d8
commit 9d2b595
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 3 deletions.
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
@@ -38,7 +38,7 @@ const routes: Routes = [
   { path: 'help', component: GetHelpComponent },
   { path: 'info', component: WhatsNewComponent },
   { path: 'impressum', component: ImpressumComponent },
-  { path: 'connect/:host/:port', component: ConnectViaUrlComponent },
+  { path: 'connect/:protocol/:host/:port', component: ConnectViaUrlComponent },
 ];
 
 @NgModule({

diff --git a/src/app/connect-via-url/connect-via-url.component.ts b/src/app/connect-via-url/connect-via-url.component.ts
@@ -16,11 +16,18 @@ export class ConnectViaUrlComponent {
   ) {}
 
   ngOnInit(): void {
+    let protocol = this.route.snapshot.paramMap.get('protocol');
+    if (protocol == null) {
+      this.router.navigate(['/']);
+      return;
+    }
+
     let host = this.route.snapshot.paramMap.get('host');
     if (host == null) {
       this.router.navigate(['/']);
       return;
     }
+
     let portS = this.route.snapshot.paramMap.get('port');
     if (portS == null || isNaN(Number(portS))) {
       this.router.navigate(['/']);
@@ -29,8 +36,13 @@ export class ConnectViaUrlComponent {
     let port = Number(portS);
     this.localStorageService.setServerHost(host);
     this.localStorageService.setServerPort(port);
+    this.localStorageService.setServerProtocol(protocol);
     IrisinterfaceService.host = host;
     IrisinterfaceService.port = port;
+    IrisinterfaceService.protocol = protocol;
+    setTimeout(() => {
+      window.location.reload();
+    }, 1000);
     this.router.navigate(['/']);
   }
 }
diff --git a/src/app/settings/settings-pages/server-settings/server-settings.component.ts b/src/app/settings/settings-pages/server-settings/server-settings.component.ts
@@ -29,6 +29,9 @@ export class ServerSettingsComponent {
     this.localStorageService.setServerHost(this.host);
     this.localStorageService.setServerPort(this.port);
     this.localStorageService.setServerProtocol(this.protocol);
+    setTimeout(() => {
+      window.location.reload();
+    }, 1000);
     this.router.navigate(['/']);
   }
 

diff --git a/src/app/user-input/log-in/log-in.component.ts b/src/app/user-input/log-in/log-in.component.ts
@@ -33,11 +33,11 @@ export class LogInComponent {
     let password = localStorageService.getPassword();
     if (password != null) {
       this.enteredPassword = password;
-      this.submit();
+      this.submit(true);
     }
   }
 
-  submit() {
+  submit(onInit = false) {
     this.apiService
       .checkUser(this.entereduserName, this.enteredPassword)
       .subscribe({
@@ -55,6 +55,11 @@ export class LogInComponent {
           }
         },
         error: (err: Error) => {
+          if (onInit) {
+            this.localStorageService.removePassword();
+            this.close();
+            return;
+          }
           this.wrongMessage = err.message;
           this.isWrong = true;
           this.enteredPassword = '';