Merge branch 'main' into fix/sso-enabled

Author: pujitm

api/generated-schema.graphql

@@ -1779,17 +1779,8 @@ input ConnectSignInInput {
   """The API key for authentication"""
   apiKey: String!
 
-  """The ID token for authentication"""
-  idToken: String
-
   """User information for the sign-in"""
   userInfo: ConnectUserInfoInput
-
-  """The access token for authentication"""
-  accessToken: String
-
-  """The refresh token for authentication"""
-  refreshToken: String
 }
 
 input ConnectUserInfoInput {

api/src/unraid-api/config/api-config.module.ts

@@ -4,7 +4,7 @@ import { ConfigService, registerAs } from '@nestjs/config';
 import type { ApiConfig } from '@unraid/shared/services/api-config.js';
 import { csvStringToArray } from '@unraid/shared/util/data.js';
 import { fileExists } from '@unraid/shared/util/file.js';
-import { bufferTime, debounceTime } from 'rxjs/operators';
+import { bufferTime } from 'rxjs/operators';
 
 import { API_VERSION } from '@app/environment.js';
 import { ApiStateConfig } from '@app/unraid-api/config/factory/api-state.model.js';

api/src/unraid-api/graph/resolvers/rclone/rclone-api.service.ts

@@ -37,8 +37,23 @@ export class RCloneApiService implements OnModuleInit, OnModuleDestroy {
         process.env.RCLONE_PASSWORD || crypto.randomBytes(24).toString('base64');
     constructor() {}
 
+    /**
+     * Returns whether the RClone service is initialized and ready to use
+     */
+    get initialized(): boolean {
+        return this.isInitialized;
+    }
+
     async onModuleInit(): Promise<void> {
         try {
+            // Check if rclone binary is available first
+            const isBinaryAvailable = await this.checkRcloneBinaryExists();
+            if (!isBinaryAvailable) {
+                this.logger.warn('RClone binary not found on system, skipping initialization');
+                this.isInitialized = false;
+                return;
+            }
+
             const { getters } = await import('@app/store/index.js');
             // Check if Rclone Socket is running, if not, start it.
             this.rcloneSocketPath = getters.paths()['rclone-socket'];
@@ -198,16 +213,38 @@ export class RCloneApiService implements OnModuleInit, OnModuleDestroy {
      * Checks if the RClone socket is running
      */
     private async checkRcloneSocketRunning(): Promise<boolean> {
-        // Use the API check instead of execa('rclone', ['about']) as rclone might not be in PATH
-        // or configured correctly for the execa environment vs the rcd environment.
         try {
             // A simple API call to check if the daemon is responsive
             await this.callRcloneApi('core/pid');
             this.logger.debug('RClone socket is running and responsive.');
             return true;
         } catch (error: unknown) {
-            // Log less verbosely during checks
-            // this.logger.error(`Error checking RClone socket: ${error}`);
+            // Silently handle socket connection errors during checks
+            if (error instanceof Error) {
+                if (error.message.includes('ENOENT') || error.message.includes('ECONNREFUSED')) {
+                    this.logger.debug('RClone socket not accessible - daemon likely not running');
+                } else {
+                    this.logger.debug(`RClone socket check failed: ${error.message}`);
+                }
+            }
+            return false;
+        }
+    }
+
+    /**
+     * Checks if the RClone binary is available on the system
+     */
+    private async checkRcloneBinaryExists(): Promise<boolean> {
+        try {
+            await execa('rclone', ['version']);
+            this.logger.debug('RClone binary is available on the system.');
+            return true;
+        } catch (error: unknown) {
+            if (error instanceof Error && 'code' in error && error.code === 'ENOENT') {
+                this.logger.warn('RClone binary not found in PATH.');
+            } else {
+                this.logger.error(`Error checking RClone binary: ${error}`);
+            }
             return false;
         }
     }

api/src/unraid-api/graph/resolvers/rclone/rclone.service.ts

@@ -48,7 +48,13 @@ export class RCloneService {
      */
     async onModuleInit(): Promise<void> {
         try {
-            await this.loadProviderInfo();
+            if (!this.rcloneApiService.initialized) {
+                this.logger.warn(
+                    'RClone API service is not initialized, skipping provider info loading'
+                );
+            } else {
+                await this.loadProviderInfo();
+            }
         } catch (error) {
             this.logger.error(`Failed to initialize RcloneBackupSettingsService: ${error}`);
         }

packages/unraid-api-plugin-connect/justfile

@@ -4,6 +4,10 @@
 default:
     @just --list
 
+# Watch for changes in src files and run clean + build
+watch:
+    watchexec -r -e ts,tsx -w src -- pnpm build
+
 # Count TypeScript lines in src directory, excluding test and generated files
 count-lines:
     #!/usr/bin/env bash

packages/unraid-api-plugin-connect/package.json

@@ -25,6 +25,7 @@
     "description": "Unraid Connect plugin for Unraid API",
     "devDependencies": {
         "@apollo/client": "^3.11.8",
+        "@faker-js/faker": "^9.8.0",
         "@graphql-codegen/cli": "^5.0.3",
         "@graphql-typed-document-node/core": "^3.2.0",
         "@ianvs/prettier-plugin-sort-imports": "^4.4.1",
@@ -46,6 +47,7 @@
         "class-transformer": "^0.5.1",
         "class-validator": "^0.14.1",
         "execa": "^9.5.1",
+        "fast-check": "^4.1.1",
         "got": "^14.4.6",
         "graphql": "^16.9.0",
         "graphql-scalars": "^1.23.0",

packages/unraid-api-plugin-connect/src/model/connect-config.model.ts

@@ -1,6 +1,7 @@
 import { UsePipes, ValidationPipe } from '@nestjs/common';
 import { registerAs } from '@nestjs/config';
 import { Field, InputType, ObjectType } from '@nestjs/graphql';
+import { ValidateIf } from 'class-validator';
 
 import { URL_TYPE } from '@unraid/shared/network.model.js';
 import { plainToInstance } from 'class-transformer';
@@ -58,9 +59,11 @@ export class MyServersConfig {
     localApiKey!: string;
 
     // User Information
-    @Field(() => String)
+    @Field(() => String, { nullable: true })
+    @IsOptional()
+    @ValidateIf((o) => o.email !== undefined && o.email !== null && o.email !== '')
     @IsEmail()
-    email!: string;
+    email?: string | null;
 
     @Field(() => String)
     @IsString()
@@ -74,19 +77,6 @@ export class MyServersConfig {
     @IsString()
     regWizTime!: string;
 
-    // Authentication Tokens
-    @Field(() => String)
-    @IsString()
-    accesstoken!: string;
-
-    @Field(() => String)
-    @IsString()
-    idtoken!: string;
-
-    @Field(() => String)
-    @IsString()
-    refreshtoken!: string;
-
     // Remote Access Settings
     @Field(() => DynamicRemoteAccessType)
     @IsEnum(DynamicRemoteAccessType)
@@ -207,13 +197,9 @@ export const emptyMyServersConfig = (): MyServersConfig => ({
     upnpEnabled: false,
     apikey: '',
     localApiKey: '',
-    email: '',
     username: '',
     avatar: '',
     regWizTime: '',
-    accesstoken: '',
-    idtoken: '',
-    refreshtoken: '',
     dynamicRemoteAccessType: DynamicRemoteAccessType.DISABLED,
 });
 

packages/unraid-api-plugin-connect/src/model/connect.model.ts

@@ -93,28 +93,13 @@ export class ConnectSignInInput {
     @MinLength(5)
     apiKey!: string;
 
-    @Field(() => String, { nullable: true, description: 'The ID token for authentication' })
-    @IsString()
-    @IsOptional()
-    idToken?: string;
-
     @Field(() => ConnectUserInfoInput, {
         nullable: true,
         description: 'User information for the sign-in',
     })
     @ValidateNested()
     @IsOptional()
     userInfo?: ConnectUserInfoInput;
-
-    @Field(() => String, { nullable: true, description: 'The access token for authentication' })
-    @IsString()
-    @IsOptional()
-    accessToken?: string;
-
-    @Field(() => String, { nullable: true, description: 'The refresh token for authentication' })
-    @IsString()
-    @IsOptional()
-    refreshToken?: string;
 }
 
 @InputType()

packages/unraid-api-plugin-connect/src/resolver/connect.resolver.ts

@@ -43,5 +43,4 @@ export class ConnectResolver {
     public async settings(): Promise<ConnectSettings> {
         return {} as ConnectSettings;
     }
-
 }

packages/unraid-api-plugin-connect/src/service/config.persistence.ts

@@ -34,7 +34,9 @@ export class ConnectConfigPersister implements OnModuleInit, OnModuleDestroy {
         // Persist changes to the config.
         this.configService.changes$.pipe(bufferTime(25)).subscribe({
             next: async (changes) => {
-                const connectConfigChanged = changes.some(({ path }) => path.startsWith('connect.config'));
+                const connectConfigChanged = changes.some(({ path }) =>
+                    path.startsWith('connect.config')
+                );
                 if (connectConfigChanged) {
                     await this.persist();
                 }
@@ -78,12 +80,14 @@ export class ConnectConfigPersister implements OnModuleInit, OnModuleDestroy {
      * @param config - The config object to validate.
      * @returns The validated config instance.
      */
-    private async validate(config: object) {
+    public async validate(config: object) {
         let instance: MyServersConfig;
         if (config instanceof MyServersConfig) {
             instance = config;
         } else {
-            instance = plainToInstance(MyServersConfig, config, { enableImplicitConversion: true });
+            instance = plainToInstance(MyServersConfig, config, {
+                enableImplicitConversion: true,
+            });
         }
         await validateOrReject(instance);
         return instance;
@@ -101,7 +105,7 @@ export class ConnectConfigPersister implements OnModuleInit, OnModuleDestroy {
             this.logger.verbose(`Config loaded from ${this.configPath}`);
             return true;
         } catch (error) {
-            this.logger.warn('Error loading config:', error);
+            this.logger.warn(error, 'Error loading config');
         }
 
         try {
@@ -150,7 +154,7 @@ export class ConnectConfigPersister implements OnModuleInit, OnModuleDestroy {
      * @throws {Error} - If the legacy config file does not exist.
      * @throws {Error} - If the legacy config file is not parse-able.
      */
-    public async convertLegacyConfig(config:LegacyConfig): Promise<MyServersConfig> {
+    public async convertLegacyConfig(config: LegacyConfig): Promise<MyServersConfig> {
         return this.validate({
             ...config.api,
             ...config.local,