From 4f0ccadc2f6e312d994a7cc2497a03fd14c5e560 Mon Sep 17 00:00:00 2001
From: Daniel <dhaavi@users.noreply.github.com>
Date: Mon, 12 Dec 2022 14:09:43 +0100
Subject: [PATCH] Fix account showing switches

---
 modules/portmaster/src/app/pages/spn/spn-page.html       | 2 +-
 .../shared/spn-account-details/spn-account-details.html  | 9 +++++----
 .../portmaster/src/app/shared/spn-login/spn-login.html   | 8 ++++----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/modules/portmaster/src/app/pages/spn/spn-page.html b/modules/portmaster/src/app/pages/spn/spn-page.html
index a7d95215..47d68a11 100644
--- a/modules/portmaster/src/app/pages/spn/spn-page.html
+++ b/modules/portmaster/src/app/pages/spn/spn-page.html
@@ -43,7 +43,7 @@
     </spn-feature-carousel>
 
     <div class="flex flex-col items-center justify-center gap-4">
-      <button (click)="openAccountDetails()" *ngIf="!currentUser || currentUser.state === ''"
+      <button (click)="openAccountDetails()" *ngIf="!currentUser?.current_plan?.feature_ids?.includes('spn')"
         class="w-56 px-5 py-2 font-medium uppercase rounded-full bg-blue bg-opacity-90 hover:bg-blue text-primary">
         Login
       </button>
diff --git a/modules/portmaster/src/app/shared/spn-account-details/spn-account-details.html b/modules/portmaster/src/app/shared/spn-account-details/spn-account-details.html
index dcf119bd..7b5e77c3 100644
--- a/modules/portmaster/src/app/shared/spn-account-details/spn-account-details.html
+++ b/modules/portmaster/src/app/shared/spn-account-details/spn-account-details.html
@@ -9,7 +9,7 @@ <h1 class="mb-4 text-xl">Account Details</h1>
     </div>
   </div>
 
-  <table *ngIf="currentUser.view?.ShowAccountData" class="mb-4">
+  <table *ngIf="!currentUser.view || currentUser.view?.ShowAccountData" class="mb-4">
     <tr>
       <th>Package</th>
       <td>{{ currentUser.current_plan?.name }}</td>
@@ -43,16 +43,17 @@ <h1 class="mb-4 text-xl">Account Details</h1>
   </table>
 
   <div class="flex items-end justify-end w-full space-x-2">
+    <!-- Always show all buttons, no matter what the view says here. -->
     <button *ngIf="dialogRef" (click)="dialogRef.close()" class="">Close</button>
     <div class="flex-grow"></div>
 
-    <a *ngIf="currentUser.view?.ShowAccountButton" href="https://account.safing.io/?source=Portmaster"
+    <a href="https://account.safing.io/?source=Portmaster"
       class="flex flex-row items-center self-stretch justify-center gap-1 px-2 bg-gray-300 rounded hover:bg-gray-200 text-blue whitespace-nowrap">
       Open Account Page
     </a>
 
-    <button *ngIf="currentUser.view?.ShowLogoutButton || currentUser.view?.ShowLoginButton" (click)="logout()" class="bg-info-red">Logout</button>
-    <button *ngIf="currentUser.view?.ShowRefreshButton" (click)="refreshAccount()" style="width: 70px">
+    <button (click)="logout()" class="bg-info-red">Logout</button>
+    <button (click)="refreshAccount()" style="width: 70px">
       <ng-container *ngIf="!refreshing; else: loading">
         Refresh
       </ng-container>
diff --git a/modules/portmaster/src/app/shared/spn-login/spn-login.html b/modules/portmaster/src/app/shared/spn-login/spn-login.html
index 6979facb..f09cc274 100644
--- a/modules/portmaster/src/app/shared/spn-login/spn-login.html
+++ b/modules/portmaster/src/app/shared/spn-login/spn-login.html
@@ -2,7 +2,7 @@
 <div class="w-full px-5">
   <h2 class="w-full text-center">SPN Account Login</h2>
 
-  <a class="inline-block w-full mb-4 text-xs font-medium text-center text-tertiary" href="https://safing.io/spn"
+  <a class="inline-block w-full mb-4 text-xs font-medium text-center text-tertiary" href="https://safing.io/spn?source=Portmaster"
     target="_blank">
     Unlock the <u>powerful VPN alternative</u>
   </a>
@@ -10,20 +10,20 @@ <h2 class="w-full text-center">SPN Account Login</h2>
   <div *ngIf="forcedLogout" class="w-full px-4 py-2 mb-4 text-center rounded bg-info-red">
     You have been logged out by the account server.
     <br />
-    Please check <a class="underline text-primary" href="https://account.safing.io">your account</a>.
+    Please check <a class="underline text-primary" href="https://account.safing.io/?source=Portmaster">your account</a>.
   </div>
 
   <form (ngSubmit)="login()">
     <div class="flex flex-col items-stretch mt-4 space-y-6">
       <div class="flex flex-col justify-items-start">
         <label for="username" class="font-semibold text-primary">Username</label>
-        <input type="text" name="username" placeholder="Your username" autocomplete="off" class="custom-form-input"
+        <input type="text" name="username" autocomplete="off" class="custom-form-input"
           [(ngModel)]="username">
       </div>
 
       <div class="flex flex-col justify-items-start">
         <label for="password" class="font-semibold text-primary">Password</label>
-        <input type="password" name="password" placeholder="Enter your strong password" autocomplete="off"
+        <input type="password" name="password" autocomplete="off"
           class="custom-form-input" [(ngModel)]="password">
       </div>