Fix bugs (#2360)

* fix reset tor, delete http redirect, show message for tor http, update release notes * potentially fix doubel req to registries * change language arund LAN and root ca * link locally instead of docs
2026-03-26 02:11:53 +00:00 · 2023-07-18 12:38:52 -06:00
parent 3cd9e17e3f
commit 11c21b5259
13 changed files with 41 additions and 49 deletions
--- a/frontend/projects/setup-wizard/src/app/pages/embassy/embassy.page.ts
+++ b/frontend/projects/setup-wizard/src/app/pages/embassy/embassy.page.ts
@@ -155,7 +155,6 @@ export class EmbassyPage {
      await this.navCtrl.navigateForward(`/loading`)
    } catch (e: any) {
      this.errorToastService.present(e)
-      console.error(e)
    } finally {
      loader.dismiss()
    }
--- a/frontend/projects/ui/src/app/app.component.ts
+++ b/frontend/projects/ui/src/app/app.component.ts
@@ -39,14 +39,6 @@ export class AppComponent implements OnDestroy {
  ) {}

  async ngOnInit() {
-    if (location.hostname !== 'localhost' && location.protocol === 'http:') {
-      // see if site is available securely
-      const res = await fetch(window.location.href.replace(/^http:/, 'https:'))
-      if (res && res.status === 200) {
-        // redirect
-        window.location.protocol = 'https:'
-      }
-    }
    this.patch
      .watch$('ui', 'name')
      .subscribe(name => this.titleService.setTitle(name || 'StartOS'))
--- a/frontend/projects/ui/src/app/app/preloader/preloader.component.ts
+++ b/frontend/projects/ui/src/app/app/preloader/preloader.component.ts
@@ -40,13 +40,13 @@ const ICONS = [
  'file-tray-stacked-outline',
  'finger-print-outline',
  'flash-outline',
+  'flask-outline',
  'flash-off-outline',
  'folder-open-outline',
  'globe-outline',
  'grid-outline',
  'help-circle-outline',
  'hammer-outline',
-  'home-outline',
  'information-circle-outline',
  'key-outline',
  'list-outline',
@@ -74,6 +74,7 @@ const ICONS = [
  'remove-circle-outline',
  'remove-outline',
  'repeat-outline',
+  'ribbon-outline',
  'rocket-outline',
  'save-outline',
  'settings-outline',
--- a/frontend/projects/ui/src/app/components/widget-list/widget-list.component.ts
+++ b/frontend/projects/ui/src/app/components/widget-list/widget-list.component.ts
@@ -46,11 +46,11 @@ export class WidgetListComponent {
      qp: { back: 'true' },
    },
    {
-      title: 'Secure LAN',
-      icon: 'home-outline',
+      title: 'Root CA',
+      icon: 'ribbon-outline',
      color: 'var(--alt-orange)',
-      description: `Download and trust your server's certificate`,
-      link: '/system/lan',
+      description: `Download and trust your server's root certificate authority`,
+      link: '/system/root-ca',
    },
    {
      title: 'Create Backup',
--- a/frontend/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
+++ b/frontend/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
@@ -26,12 +26,12 @@
  </p>
  <h6>Highlights</h6>
  <ul class="spaced-list">
-    <li>Enhanced performance for page load times</li>
-    <li>Improved progress reporting for data transfer to new data drives</li>
-    <li>Enabled use of IP address for local network backups</li>
-    <li>Added change password flow to the UI</li>
-    <li>Disabled LUKS for new Raspberry Pi setups</li>
-    <li>Fixed miscellaneous bugs</li>
+    <li>Https over Tor for faster UI loading times</li>
+    <li>Change password through UI</li>
+    <li>Use IP address for Network Folder backups</li>
+    <li>
+      Multiple bug fixes, performance enhancements, and other small features
+    </li>
  </ul>

  <h2>Previous Releases</h2>
--- a/frontend/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.html
+++ b/frontend/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.html
@@ -52,21 +52,17 @@
          <ion-row class="ion-align-items-center">
            <ion-col class="ion-text-center">
              <h2>
-                <ion-text color="warning">
-                  You are using an unencrypted http connection
-                </ion-text>
+                <ion-text color="warning">Http detected</ion-text>
              </h2>
              <p class="ion-padding-bottom">
-                Click the button below to switch to https. Your browser may warn
-                you that the page is insecure. You can safely bypass this
-                warning. It will go away after you
+                Your connection is insecure.
                <a
-                  [routerLink]="['/system', 'lan']"
+                  [routerLink]="['/system', 'root-ca']"
                  style="color: var(--ion-color-dark)"
                >
-                  download and trust your server's certificate
+                  Download and trust your server's Root CA
                </a>
-                .
+                , then switch to https.
              </p>
              <ion-button (click)="launchHttps()">
                Open https
--- a/frontend/projects/ui/src/app/pages/server-routes/experimental-features/experimental-features.page.ts
+++ b/frontend/projects/ui/src/app/pages/server-routes/experimental-features/experimental-features.page.ts
@@ -43,9 +43,6 @@ export class ExperimentalFeaturesPage {
          label: 'Wipe state',
          type: 'checkbox',
          value: 'wipe',
-          handler: val => {
-            console.error(val)
-          },
        },
      ],
      buttons: [
@@ -56,8 +53,7 @@ export class ExperimentalFeaturesPage {
        {
          text: 'Reset',
          handler: (value: string[]) => {
-            console.error(value)
-            this.resetTor(value.some(v => 'wipe'))
+            this.resetTor(value.some(v => v === 'wipe'))
          },
          cssClass: 'enter-click',
        },
--- a/frontend/projects/ui/src/app/pages/server-routes/lan/lan.page.html
+++ b/frontend/projects/ui/src/app/pages/server-routes/lan/lan.page.html
@@ -1,6 +1,6 @@
 <ion-header>
  <ion-toolbar>
-    <ion-title>Secure LAN</ion-title>
+    <ion-title>Trust Root CA</ion-title>
    <ion-buttons slot="start">
      <ion-back-button defaultHref="system"></ion-back-button>
    </ion-buttons>
@@ -13,7 +13,7 @@
    <ion-item class="ion-padding-bottom">
      <ion-label>
        <h2>
-          For a secure local connection,
+          For a secure local connection and faster Tor experience,
          <a
            href="https://docs.start9.com/latest/user-manual/connecting/connecting-lan"
            target="_blank"
@@ -29,7 +29,7 @@
    <ion-item button (click)="installCert()" [disabled]="!(crtName$ | async)">
      <ion-icon slot="start" name="download-outline" size="large"></ion-icon>
      <ion-label>
-        <h1>Download Certificate</h1>
+        <h1>Download Root CA</h1>
      </ion-label>
    </ion-item>
  </ion-item-group>
--- a/frontend/projects/ui/src/app/pages/server-routes/server-routing.module.ts
+++ b/frontend/projects/ui/src/app/pages/server-routes/server-routing.module.ts
@@ -17,7 +17,7 @@ const routes: Routes = [
      ),
  },
  {
-    path: 'lan',
+    path: 'root-ca',
    loadChildren: () => import('./lan/lan.module').then(m => m.LANPageModule),
  },
  {
--- a/frontend/projects/ui/src/app/pages/server-routes/server-show/server-show.page.html
+++ b/frontend/projects/ui/src/app/pages/server-routes/server-show/server-show.page.html
@@ -15,15 +15,20 @@

  <!-- loaded -->
  <ion-item-group *ngIf="server$ | async as server; else loading">
-    <ion-item *ngIf="!secure" color="warning">
+    <ion-item *ngIf="!secure || isTorHttp" color="warning">
      <ion-icon slot="start" name="warning-outline"></ion-icon>
      <ion-label>
-        <h2 style="font-weight: bold">You are using unencrypted http</h2>
+        <h2 style="font-weight: bold">Http detected</h2>
        <p style="font-weight: 600">
-          Click the button on the right to switch to https. Your browser may
-          warn you that the page is insecure. You can safely bypass this
-          warning. It will go away after you download and trust your server's
-          certificate
+          {{ isTorHttp ? 'Tor is faster over https.' : 'Your connection is
+          insecure.' }}
+          <a
+            [routerLink]="['/system', 'root-ca']"
+            style="color: var(--ion-color-light)"
+          >
+            Download and trust your server's Root CA
+          </a>
+          , then switch to https.
        </p>
      </ion-label>
      <ion-button slot="end" color="light" (click)="launchHttps()">
--- a/frontend/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
+++ b/frontend/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
@@ -42,6 +42,8 @@ export class ServerShowPage {
  readonly showDiskRepair$ = this.ClientStorageService.showDiskRepair$

  readonly secure = this.config.isSecure()
+  readonly isTorHttp =
+    this.config.isTor() && this.document.location.protocol === 'http:'

  constructor(
    private readonly alertCtrl: AlertController,
@@ -499,11 +501,11 @@ export class ServerShowPage {
        disabled$: of(false),
      },
      {
-        title: 'LAN',
-        description: `Download and trust your server's certificate for a secure local connection`,
-        icon: 'home-outline',
+        title: 'Root CA',
+        description: `Download and trust your server's root certificate authority`,
+        icon: 'ribbon-outline',
        action: () =>
-          this.navCtrl.navigateForward(['lan'], { relativeTo: this.route }),
+          this.navCtrl.navigateForward(['root-ca'], { relativeTo: this.route }),
        detail: true,
        disabled$: of(false),
      },
--- a/frontend/projects/ui/src/app/services/marketplace.service.ts
+++ b/frontend/projects/ui/src/app/services/marketplace.service.ts
@@ -280,6 +280,7 @@ export class MarketplaceService implements AbstractMarketplaceService {
    > = {},
  ): Observable<MarketplacePkg[]> {
    return this.patch.watch$('server-info', 'eos-version-compat').pipe(
+      take(1),
      switchMap(versionCompat => {
        const qp: RR.GetMarketplacePackagesReq = {
          ...params,
--- a/frontend/projects/ui/src/environments/environment.ts
+++ b/frontend/projects/ui/src/environments/environment.ts
@@ -4,7 +4,7 @@

 export const environment = {
  production: false,
-  useServiceWorker: true,
+  useServiceWorker: false,
 }

 /*