Skip to content

[_]: feat/allow the rClone activation #348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xabg2 merged 2 commits into from
Jan 22, 2026
Merged

[_]: feat/allow the rClone activation #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cf2a34
feat(gateway): allow the rClone activation
xabg2 Jan 21, 2026
8139e0c
tests: fix fixtures
xabg2 Jan 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions infrastructure/mongodb/mongo-init.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ db.tiers.insertMany([
cli: {
enabled: false,
},
rclone: {
enabled: false,
},
darkMonitor: {
enabled: false,
},
Expand Down Expand Up @@ -126,6 +129,9 @@ db.tiers.insertMany([
cli: {
enabled: false,
},
rclone: {
enabled: false,
},
darkMonitor: {
enabled: false,
},
Expand Down Expand Up @@ -177,6 +183,9 @@ db.tiers.insertMany([
cli: {
enabled: false,
},
rclone: {
enabled: false,
},
darkMonitor: {
enabled: true,
},
Expand Down Expand Up @@ -228,6 +237,9 @@ db.tiers.insertMany([
cli: {
enabled: true,
},
rclone: {
enabled: true,
},
darkMonitor: {
enabled: true,
},
Expand Down Expand Up @@ -279,6 +291,9 @@ db.tiers.insertMany([
cli: {
enabled: true,
},
rclone: {
enabled: false,
},
darkMonitor: {
enabled: true,
},
Expand Down Expand Up @@ -330,6 +345,9 @@ db.tiers.insertMany([
cli: {
enabled: false,
},
rclone: {
enabled: false,
},
darkMonitor: {
enabled: false,
},
Expand Down Expand Up @@ -381,6 +399,9 @@ db.tiers.insertMany([
cli: {
enabled: false,
},
rclone: {
enabled: false,
},
darkMonitor: {
enabled: true,
},
Expand Down Expand Up @@ -432,6 +453,9 @@ db.tiers.insertMany([
cli: {
enabled: true,
},
rclone: {
enabled: true,
},
darkMonitor: {
enabled: true,
},
Expand Down Expand Up @@ -483,6 +507,9 @@ db.tiers.insertMany([
cli: {
enabled: true,
},
rclone: {
enabled: true,
},
darkMonitor: {
enabled: true,
},
Expand Down
2 changes: 1 addition & 1 deletion src/controller/gateway.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export function gatewayController({
properties: {
feature: {
type: 'string',
enum: [Service.Antivirus, Service.Backups, Service.Cleaner, Service.Cli],
enum: [Service.Antivirus, Service.Backups, Service.Cleaner, Service.Cli, Service.rClone],
},
userUuid: {
type: 'string',
Expand Down
6 changes: 6 additions & 0 deletions src/core/users/Tier.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ interface CliFeatures {
enabled: boolean;
}

interface RCloneFeatures {
enabled: boolean;
}

export enum Service {
Drive = 'drive',
Backups = 'backups',
Expand All @@ -61,6 +65,7 @@ export enum Service {
Cli = 'cli',
Cleaner = 'cleaner',
darkMonitor = 'darkMonitor',
rClone = 'rclone',
}

export interface Tier {
Expand All @@ -78,5 +83,6 @@ export interface Tier {
[Service.Cleaner]: CleanerFeatures;
[Service.darkMonitor]: DarkMonitorFeatures;
[Service.Cli]: CliFeatures;
[Service.rClone]: RCloneFeatures;
};
}
6 changes: 3 additions & 3 deletions src/services/userFeaturesOverride.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,17 @@ export class UserFeaturesOverridesService {
break;

case Service.Cli:
await this.usersService.overrideDriveLimit({ userUuid, feature: Service.Cli, enabled: true });
case Service.rClone:
await this.usersService.overrideDriveLimit({ userUuid, feature: service, enabled: true });

await this.userFeatureOverridesRepository.upsert({
userId: userId,
featuresPerService: {
[Service.Cli]: {
[service]: {
enabled: true,
},
},
});

break;

default:
Expand Down
2 changes: 1 addition & 1 deletion src/services/users.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function signToken(duration: string, secret: string) {
});
}

type OverrideServiceAvailable = Service.Cli;
type OverrideServiceAvailable = Service.Cli | Service.rClone;

export class UsersService {
constructor(
Expand Down
1 change: 1 addition & 0 deletions tests/src/fixtures.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,6 +612,7 @@ export const newTier = (params?: Partial<Tier>): Tier => {
backups: { enabled: false },
cleaner: { enabled: false },
cli: { enabled: false },
rclone: { enabled: false },
drive: {
enabled: false,
foreignTierId: randomUUID(),
Expand Down
3 changes: 3 additions & 0 deletions tests/src/services/products.service.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ describe('Products Service Tests', () => {
[Service.darkMonitor]: { enabled: false },
[Service.Cleaner]: { enabled: false },
[Service.Cli]: { enabled: false },
[Service.rClone]: { enabled: false },
},
});

Expand Down Expand Up @@ -161,6 +162,7 @@ describe('Products Service Tests', () => {
[Service.darkMonitor]: { enabled: true },
[Service.Cleaner]: { enabled: true },
[Service.Cli]: { enabled: true },
[Service.rClone]: { enabled: true },
},
});

Expand Down Expand Up @@ -330,6 +332,7 @@ describe('Products Service Tests', () => {
[Service.darkMonitor]: { enabled: false },
[Service.Cleaner]: { enabled: false },
[Service.Cli]: { enabled: false },
[Service.rClone]: { enabled: false },
},
});

Expand Down
26 changes: 26 additions & 0 deletions tests/src/services/userFeaturesOverride.service.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,32 @@ describe('User Tier Override', () => {
expect(upsertSpy).not.toHaveBeenCalled();
expect(overrideDriveLimitSpy).not.toHaveBeenCalled();
});

test('When the service is rClone, then the service should be enabled', async () => {
const mockedUser = getUser();
const rCloneService = Service.rClone;
const upsertPayload = {
userId: mockedUser.id,
featuresPerService: {
[rCloneService]: {
enabled: true,
},
},
};
const findByUserIdSpy = jest.spyOn(userFeatureOverridesRepository, 'findByUserId').mockResolvedValue(null);
const upsertSpy = jest.spyOn(userFeatureOverridesRepository, 'upsert').mockResolvedValue();
const overrideDriveLimitSpy = jest.spyOn(usersService, 'overrideDriveLimit').mockResolvedValue();

await userFeaturesOverridesService.upsertCustomUserFeatures(mockedUser, rCloneService);

expect(findByUserIdSpy).toHaveBeenCalledWith(mockedUser.id);
expect(upsertSpy).toHaveBeenCalledWith(upsertPayload);
expect(overrideDriveLimitSpy).toHaveBeenCalledWith({
userUuid: mockedUser.uuid,
feature: Service.rClone,
enabled: true,
});
});
});

describe('Get the custom user features', () => {
Expand Down
Loading