From 35cb0e9dcd10f7f76f6640676450b83ec0e695d4 Mon Sep 17 00:00:00 2001
From: Thomas <4159106+dtslvr@users.noreply.github.com>
Date: Sat, 17 Dec 2022 11:25:30 +0100
Subject: [PATCH] Refactoring

---
 apps/api/src/app/user/user.controller.ts      | 18 +--------
 .../admin-overview/admin-overview.html        | 40 +++++++++----------
 .../app/components/header/header.component.ts | 10 ++---
 .../pages/landing/landing-page.component.ts   |  6 +--
 .../pages/register/register-page.component.ts |  9 +++--
 5 files changed, 32 insertions(+), 51 deletions(-)

diff --git a/apps/api/src/app/user/user.controller.ts b/apps/api/src/app/user/user.controller.ts
index ce0714d61..4c8b0d748 100644
--- a/apps/api/src/app/user/user.controller.ts
+++ b/apps/api/src/app/user/user.controller.ts
@@ -1,9 +1,6 @@
 import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
 import { PropertyService } from '@ghostfolio/api/services/property/property.service';
-import {
-  PROPERTY_IS_READ_ONLY_MODE,
-  PROPERTY_IS_USER_SIGNUP_ENABLED
-} from '@ghostfolio/common/config';
+import { PROPERTY_IS_USER_SIGNUP_ENABLED } from '@ghostfolio/common/config';
 import { User, UserSettings } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import type { RequestWithUser } from '@ghostfolio/common/types';
@@ -72,19 +69,6 @@ export class UserController {
 
   @Post()
   public async signupUser(): Promise<UserItem> {
-    if (this.configurationService.get('ENABLE_FEATURE_READ_ONLY_MODE')) {
-      const isReadOnlyMode = (await this.propertyService.getByKey(
-        PROPERTY_IS_READ_ONLY_MODE
-      )) as boolean;
-
-      if (isReadOnlyMode) {
-        throw new HttpException(
-          getReasonPhrase(StatusCodes.FORBIDDEN),
-          StatusCodes.FORBIDDEN
-        );
-      }
-    }
-
     const isUserSignupEnabled =
       ((await this.propertyService.getByKey(
         PROPERTY_IS_USER_SIGNUP_ENABLED
diff --git a/apps/client/src/app/components/admin-overview/admin-overview.html b/apps/client/src/app/components/admin-overview/admin-overview.html
index bcaa58253..44d851a8c 100644
--- a/apps/client/src/app/components/admin-overview/admin-overview.html
+++ b/apps/client/src/app/components/admin-overview/admin-overview.html
@@ -82,6 +82,26 @@
               </table>
             </div>
           </div>
+          <div class="d-flex my-3">
+            <div class="w-50" i18n>User Signup</div>
+            <div class="w-50">
+              <mat-slide-toggle
+                color="primary"
+                [checked]="info.globalPermissions.includes(permissions.createUserAccount)"
+                (change)="onEnableUserSignupModeChange($event)"
+              ></mat-slide-toggle>
+            </div>
+          </div>
+          <div *ngIf="hasPermissionToToggleReadOnlyMode" class="d-flex my-3">
+            <div class="w-50" i18n>Read-only Mode</div>
+            <div class="w-50">
+              <mat-slide-toggle
+                color="primary"
+                [checked]="info?.isReadOnlyMode"
+                (change)="onReadOnlyModeChange($event)"
+              ></mat-slide-toggle>
+            </div>
+          </div>
           <div *ngIf="hasPermissionForSystemMessage" class="d-flex my-3">
             <div class="w-50" i18n>System Message</div>
             <div class="w-50">
@@ -109,26 +129,6 @@
               </button>
             </div>
           </div>
-          <div class="d-flex my-3">
-            <div class="w-50" i18n>Enable User Signup</div>
-            <div class="w-50">
-              <mat-slide-toggle
-                color="primary"
-                [checked]="info.globalPermissions.includes(permissions.createUserAccount)"
-                (change)="onEnableUserSignupModeChange($event)"
-              ></mat-slide-toggle>
-            </div>
-          </div>
-          <div *ngIf="hasPermissionToToggleReadOnlyMode" class="d-flex my-3">
-            <div class="w-50" i18n>Read-only Mode</div>
-            <div class="w-50">
-              <mat-slide-toggle
-                color="primary"
-                [checked]="info?.isReadOnlyMode"
-                (change)="onReadOnlyModeChange($event)"
-              ></mat-slide-toggle>
-            </div>
-          </div>
           <div
             *ngIf="hasPermissionForSubscription"
             class="d-flex my-3 subscription"
diff --git a/apps/client/src/app/components/header/header.component.ts b/apps/client/src/app/components/header/header.component.ts
index c656ca866..03ec46dd8 100644
--- a/apps/client/src/app/components/header/header.component.ts
+++ b/apps/client/src/app/components/header/header.component.ts
@@ -81,12 +81,10 @@ export class HeaderComponent implements OnChanges {
       permissions.enableFearAndGreedIndex
     );
 
-    this.hasPermissionToCreateUser =
-      !this.info?.isReadOnlyMode &&
-      hasPermission(
-        this.info?.globalPermissions,
-        permissions.createUserAccount
-      );
+    this.hasPermissionToCreateUser = hasPermission(
+      this.info?.globalPermissions,
+      permissions.createUserAccount
+    );
   }
 
   public impersonateAccount(aId: string) {
diff --git a/apps/client/src/app/pages/landing/landing-page.component.ts b/apps/client/src/app/pages/landing/landing-page.component.ts
index 3fcc591aa..53ead0d31 100644
--- a/apps/client/src/app/pages/landing/landing-page.component.ts
+++ b/apps/client/src/app/pages/landing/landing-page.component.ts
@@ -48,7 +48,7 @@ export class LandingPageComponent implements OnDestroy, OnInit {
     private dataService: DataService,
     private deviceService: DeviceDetectorService
   ) {
-    const { globalPermissions, isReadOnlyMode, statistics } =
+    const { globalPermissions, statistics } =
       this.dataService.fetchInfo();
 
     this.hasPermissionForStatistics = hasPermission(
@@ -56,9 +56,7 @@ export class LandingPageComponent implements OnDestroy, OnInit {
       permissions.enableStatistics
     );
 
-    this.hasPermissionToCreateUser =
-      !isReadOnlyMode &&
-      hasPermission(globalPermissions, permissions.createUserAccount);
+    this.hasPermissionToCreateUser = hasPermission(globalPermissions, permissions.createUserAccount);
 
     this.statistics = statistics;
   }
diff --git a/apps/client/src/app/pages/register/register-page.component.ts b/apps/client/src/app/pages/register/register-page.component.ts
index 6a0d231bd..5cd9c6855 100644
--- a/apps/client/src/app/pages/register/register-page.component.ts
+++ b/apps/client/src/app/pages/register/register-page.component.ts
@@ -45,7 +45,7 @@ export class RegisterPageComponent implements OnDestroy, OnInit {
   }
 
   public ngOnInit() {
-    const { demoAuthToken, globalPermissions, isReadOnlyMode } =
+    const { demoAuthToken, globalPermissions } =
       this.dataService.fetchInfo();
 
     this.demoAuthToken = demoAuthToken;
@@ -54,9 +54,10 @@ export class RegisterPageComponent implements OnDestroy, OnInit {
       globalPermissions,
       permissions.enableSocialLogin
     );
-    this.hasPermissionToCreateUser =
-      !isReadOnlyMode &&
-      hasPermission(globalPermissions, permissions.createUserAccount);
+    this.hasPermissionToCreateUser = hasPermission(
+      globalPermissions,
+      permissions.createUserAccount
+    );
   }
 
   public async createAccount() {