Rename Google OAuth and Security Token control variables

.env.example

@@ -14,3 +14,12 @@ POSTGRES_PASSWORD=<INSERT_POSTGRES_PASSWORD>
 ACCESS_TOKEN_SALT=<INSERT_RANDOM_STRING>
 DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:5432/${POSTGRES_DB}?connect_timeout=300&sslmode=prefer
 JWT_SECRET_KEY=<INSERT_RANDOM_STRING>
+
+# AUTHENTICATION
+# Enable authentication with Google OAuth (default: false)
+# ENABLE_FEATURE_AUTH_GOOGLE=true
+# GOOGLE_CLIENT_ID=<INSERT_GOOGLE_CLIENT_ID>
+# GOOGLE_SECRET=<INSERT_GOOGLE_SECRET>
+
+# Enable authentication with Security Token (default: true)
+# ENABLE_FEATURE_AUTH_TOKEN=true

apps/api/src/app/info/info.service.ts

@@ -70,8 +70,12 @@ export class InfoService {
       );
     }
 
-    if (this.configurationService.get('ENABLE_FEATURE_SOCIAL_LOGIN')) {
+    if (this.configurationService.get('ENABLE_FEATURE_AUTH_GOOGLE')) {
-      globalPermissions.push(permissions.enableSocialLogin);
+      globalPermissions.push(permissions.enableAuthGoogle);
+    }
+
+    if (this.configurationService.get('ENABLE_FEATURE_AUTH_TOKEN')) {
+      globalPermissions.push(permissions.enableAuthToken);
     }
 
     if (this.configurationService.get('ENABLE_FEATURE_STATISTICS')) {

apps/api/src/services/configuration/configuration.service.ts

@@ -42,7 +42,8 @@ export class ConfigurationService {
       }),
       ENABLE_FEATURE_FEAR_AND_GREED_INDEX: bool({ default: false }),
       ENABLE_FEATURE_READ_ONLY_MODE: bool({ default: false }),
-      ENABLE_FEATURE_SOCIAL_LOGIN: bool({ default: false }),
+      ENABLE_FEATURE_AUTH_GOOGLE: bool({ default: false }),
+      ENABLE_FEATURE_AUTH_TOKEN: bool({ default: true }),
       ENABLE_FEATURE_STATISTICS: bool({ default: false }),
       ENABLE_FEATURE_SUBSCRIPTION: bool({ default: false }),
       ENABLE_FEATURE_SYSTEM_MESSAGE: bool({ default: false }),

apps/api/src/services/interfaces/environment.interface.ts

@@ -18,7 +18,8 @@ export interface Environment extends CleanedEnvAccessors {
   DATA_SOURCES_GHOSTFOLIO_DATA_PROVIDER: string[];
   ENABLE_FEATURE_FEAR_AND_GREED_INDEX: boolean;
   ENABLE_FEATURE_READ_ONLY_MODE: boolean;
-  ENABLE_FEATURE_SOCIAL_LOGIN: boolean;
+  ENABLE_FEATURE_AUTH_GOOGLE: boolean;
+  ENABLE_FEATURE_AUTH_TOKEN: boolean;
   ENABLE_FEATURE_STATISTICS: boolean;
   ENABLE_FEATURE_SUBSCRIPTION: boolean;
   ENABLE_FEATURE_SYSTEM_MESSAGE: boolean;

apps/client/src/app/components/header/header.component.ts

@@ -105,7 +105,8 @@ export class GfHeaderComponent implements OnChanges {
 
   public hasFilters: boolean;
   public hasImpersonationId: boolean;
-  public hasPermissionForSocialLogin: boolean;
+  public hasPermissionForAuthGoogle: boolean;
+  public hasPermissionForAuthToken: boolean;
   public hasPermissionForSubscription: boolean;
   public hasPermissionToAccessAdminControl: boolean;
   public hasPermissionToAccessAssistant: boolean;
@@ -165,9 +166,14 @@ export class GfHeaderComponent implements OnChanges {
   public ngOnChanges() {
     this.hasFilters = this.userService.hasFilters();
 
-    this.hasPermissionForSocialLogin = hasPermission(
+    this.hasPermissionForAuthGoogle = hasPermission(
       this.info?.globalPermissions,
-      permissions.enableSocialLogin
+      permissions.enableAuthGoogle
+    );
+
+    this.hasPermissionForAuthToken = hasPermission(
+      this.info?.globalPermissions,
+      permissions.enableAuthToken
     );
 
     this.hasPermissionForSubscription = hasPermission(
@@ -280,7 +286,8 @@ export class GfHeaderComponent implements OnChanges {
       autoFocus: false,
       data: {
         accessToken: '',
-        hasPermissionToUseSocialLogin: this.hasPermissionForSocialLogin,
+        hasPermissionToUseAuthGoogle: this.hasPermissionForAuthGoogle,
+        hasPermissionToUseAuthToken: this.hasPermissionForAuthToken,
         title: $localize`Sign in`
       },
       width: '30rem'

apps/client/src/app/components/login-with-access-token-dialog/interfaces/interfaces.ts

@@ -1,5 +1,6 @@
 export interface LoginWithAccessTokenDialogParams {
   accessToken: string;
-  hasPermissionToUseSocialLogin: boolean;
+  hasPermissionToUseAuthGoogle: boolean;
+  hasPermissionToUseAuthToken: boolean;
   title: string;
 }

apps/client/src/app/components/login-with-access-token-dialog/login-with-access-token-dialog.html

@@ -3,28 +3,35 @@
 <div class="py-3" mat-dialog-content>
   <div class="align-items-center d-flex flex-column">
     <form class="w-100">
-      <mat-form-field appearance="outline" class="without-hint w-100">
+      @if (data.hasPermissionToUseAuthToken) {
-        <mat-label i18n>Security Token</mat-label>
+        <mat-form-field appearance="outline" class="without-hint w-100">
-        <input
+          <mat-label i18n>Security Token</mat-label>
-          matInput
+          <input
-          [formControl]="accessTokenFormControl"
+            matInput
-          [type]="isAccessTokenHidden ? 'password' : 'text'"
+            [formControl]="accessTokenFormControl"
-          (keydown.enter)="onLoginWithAccessToken(); $event.preventDefault()"
+            [type]="isAccessTokenHidden ? 'password' : 'text'"
-        />
+            (keydown.enter)="onLoginWithAccessToken(); $event.preventDefault()"
-        <button
-          mat-button
-          matSuffix
-          type="button"
-          (click)="isAccessTokenHidden = !isAccessTokenHidden"
-        >
-          <ion-icon
-            [name]="isAccessTokenHidden ? 'eye-outline' : 'eye-off-outline'"
           />
-        </button>
+          <button
-      </mat-form-field>
+            mat-button
+            matSuffix
+            type="button"
+            (click)="isAccessTokenHidden = !isAccessTokenHidden"
+          >
+            <ion-icon
+              [name]="isAccessTokenHidden ? 'eye-outline' : 'eye-off-outline'"
+            />
+          </button>
+        </mat-form-field>
+      }
 
-      @if (data.hasPermissionToUseSocialLogin) {
+      @if (
+        data.hasPermissionToUseAuthGoogle && data.hasPermissionToUseAuthToken
+      ) {
         <div class="my-3 text-center text-muted" i18n>or</div>
+      }
+
+      @if (data.hasPermissionToUseAuthGoogle) {
         <div class="d-flex flex-column">
           <a
             class="px-4 rounded-pill"
@@ -44,20 +51,24 @@
 
 <div mat-dialog-actions>
   <div class="flex-grow-1">
-    <mat-checkbox color="primary" i18n (change)="onChangeStaySignedIn($event)"
+    @if (data.hasPermissionToUseAuthToken) {
-      >Stay signed in</mat-checkbox
+      <mat-checkbox color="primary" i18n (change)="onChangeStaySignedIn($event)"
-    >
+        >Stay signed in</mat-checkbox
+      >
+    }
   </div>
   <div>
-    <button
+    @if (data.hasPermissionToUseAuthToken) {
-      color="primary"
+      <button
-      mat-flat-button
+        color="primary"
-      [disabled]="
+        mat-flat-button
-        !(accessTokenFormControl.dirty && accessTokenFormControl.valid)
+        [disabled]="
-      "
+          !(accessTokenFormControl.dirty && accessTokenFormControl.valid)
-      (click)="onLoginWithAccessToken()"
+        "
-    >
+        (click)="onLoginWithAccessToken()"
-      <ng-container i18n>Sign in</ng-container>
+      >
-    </button>
+        <ng-container i18n>Sign in</ng-container>
+      </button>
+    }
   </div>
 </div>

apps/client/src/app/pages/register/register-page.component.ts

@@ -30,7 +30,8 @@ import { GfUserAccountRegistrationDialogComponent } from './user-account-registr
 })
 export class GfRegisterPageComponent implements OnDestroy, OnInit {
   public deviceType: string;
-  public hasPermissionForSocialLogin: boolean;
+  public hasPermissionForAuthGoogle: boolean;
+  public hasPermissionForAuthToken: boolean;
   public hasPermissionForSubscription: boolean;
   public hasPermissionToCreateUser: boolean;
   public historicalDataItems: LineChartItem[];
@@ -55,9 +56,14 @@ export class GfRegisterPageComponent implements OnDestroy, OnInit {
 
     this.deviceType = this.deviceService.getDeviceInfo().deviceType;
 
-    this.hasPermissionForSocialLogin = hasPermission(
+    this.hasPermissionForAuthGoogle = hasPermission(
       globalPermissions,
-      permissions.enableSocialLogin
+      permissions.enableAuthGoogle
+    );
+
+    this.hasPermissionForAuthToken = hasPermission(
+      globalPermissions,
+      permissions.enableAuthToken
     );
 
     this.hasPermissionForSubscription = hasPermission(

apps/client/src/app/pages/register/register-page.html

@@ -18,16 +18,20 @@
     <div class="button-container row">
       <div class="align-items-center col d-flex justify-content-center">
         <div class="py-5 text-center">
-          <button
+          @if (hasPermissionForAuthToken) {
-            class="d-inline-block"
+            <button
-            color="primary"
+              class="d-inline-block"
-            mat-flat-button
+              color="primary"
-            (click)="openShowAccessTokenDialog()"
+              mat-flat-button
-          >
+              (click)="openShowAccessTokenDialog()"
-            <ng-container i18n>Create Account</ng-container>
+            >
-          </button>
+              <ng-container i18n>Create Account</ng-container>
-          @if (hasPermissionForSocialLogin) {
+            </button>
+          }
+          @if (hasPermissionForAuthGoogle && hasPermissionForAuthToken) {
             <div class="my-3 text-muted" i18n>or</div>
+          }
+          @if (hasPermissionForAuthGoogle) {
             <a
               class="px-4 rounded-pill w-100"
               href="../api/v1/auth/google"

libs/common/src/lib/permissions.ts

@@ -32,7 +32,8 @@ export const permissions = {
   enableFearAndGreedIndex: 'enableFearAndGreedIndex',
   enableImport: 'enableImport',
   enableBlog: 'enableBlog',
-  enableSocialLogin: 'enableSocialLogin',
+  enableAuthGoogle: 'enableAuthGoogle',
+  enableAuthToken: 'enableAuthToken',
   enableStatistics: 'enableStatistics',
   enableSubscription: 'enableSubscription',
   enableSubscriptionInterstitial: 'enableSubscriptionInterstitial',
@@ -157,7 +158,7 @@ export function filterGlobalPermissions(
   if (aUtmSource === 'ios') {
     return globalPermissions.filter((permission) => {
       return (
-        permission !== permissions.enableSocialLogin &&
+        permission !== permissions.enableAuthGoogle &&
         permission !== permissions.enableSubscription
       );
     });