fix: support admin-created accounts without GitHub

Author: MartinKolarik

.env.docker.development.example

@@ -80,4 +80,3 @@ TARGET_HW_DEVICE_FIRMWARE=v2.0 # Same format as in gp_probes.hardwareDeviceFirmw
 
 # Are updated during `pnpm run init`
 AUTH_GITHUB_DEFAULT_ROLE_ID=
-AUTH_DISABLE_DEFAULT=false

.env.docker.e2e.example

@@ -83,4 +83,3 @@ TARGET_HW_DEVICE_FIRMWARE=v2.0 # Same format as in gp_probes.hardwareDeviceFirmw
 
 # Are updated during `pnpm run init`
 AUTH_GITHUB_DEFAULT_ROLE_ID=
-AUTH_DISABLE_DEFAULT=false

.env.docker.production.example

@@ -84,4 +84,3 @@ TARGET_HW_DEVICE_FIRMWARE=v2.0 # Same format as in gp_probes.hardwareDeviceFirmw
 
 # Are updated during `pnpm run init`
 AUTH_GITHUB_DEFAULT_ROLE_ID=
-AUTH_DISABLE_DEFAULT=

README.md

@@ -53,13 +53,13 @@ pnpm run seed
 ## Prod first deploy
 
 1. copy `.env.scripts.development.example` to `.env.scripts.production` and fulfill all empty values except `ADMIN_ACCESS_TOKEN`.
-2. copy `.env.docker.production.example` to the env vars of the container and fulfill all empty values except `AUTH_GITHUB_DEFAULT_ROLE_ID` and `AUTH_DISABLE_DEFAULT`.
+2. copy `.env.docker.production.example` to the env vars of the container and fulfill all empty values except `AUTH_GITHUB_DEFAULT_ROLE_ID`.
 3. run the remote container.
 4. `pnpm run schema:apply:production`
 5. `pnpm run migrate:production`
 6. get default role id and set it to the `AUTH_GITHUB_DEFAULT_ROLE_ID` env var
 7. restart the container
-8. login using github. Re-login as admin and give github user admin rights. Then set that value `AUTH_DISABLE_DEFAULT=true`. Then restart the container
+8. login using github. Re-login as admin and give github user admin rights.
 9. Login using github. Generate a static access token for your user and save it to the local .env file as `ADMIN_ACCESS_TOKEN`
 
 ### Prod updates

snapshots/collections-schema.yml

@@ -735,7 +735,7 @@ fields:
       max_length: 255
       numeric_precision: null
       numeric_scale: null
-      is_nullable: false
+      is_nullable: true
       is_unique: false
       is_indexed: false
       is_primary_key: false

src/extensions/operations/adopted-probes-credits-cron-handler/src/repositories/directus.ts

@@ -10,7 +10,7 @@ type AdoptedProbe = {
 
 type User = {
 	id: string;
-	external_identifier: string;
+	external_identifier: string | null;
 };
 
 export const getAdoptedProbes = async ({ services, getSchema }: OperationContext) => {
@@ -51,8 +51,13 @@ export const addProbeCredits = async (adoptedProbes: AdoptedProbe[], { services,
 
 	const users = await usersService.readMany(adoptedProbes.map(({ userId }) => userId)) as User[];
 	const usersMap = new Map(users.map(user => [ user.id, user ]));
+	const eligibleProbes = adoptedProbes.filter(({ userId }) => usersMap.get(userId)?.external_identifier);
 
-	const result = await creditsAdditionsService.createMany(adoptedProbes.map(({ id, userId, ip, name }) => ({
+	if (eligibleProbes.length === 0) {
+		return [];
+	}
+
+	const result = await creditsAdditionsService.createMany(eligibleProbes.map(({ id, userId, ip, name }) => ({
 		github_id: usersMap.get(userId)?.external_identifier,
 		amount: parseInt(env.CREDITS_PER_ADOPTED_PROBE_DAY, 10),
 		reason: 'adopted_probe',

src/extensions/operations/adopted-probes-credits-cron-handler/test/api.test.ts

@@ -75,6 +75,49 @@ describe('Adopted probes status cron handler', () => {
 		expect(result).to.equal('Created credits with ids: 1');
 	});
 
+	it('should skip non-GitHub owners without blocking other owners credits or the online hours reset', async () => {
+		readByQuery.resolves([
+			{ id: '1', ip: '1.2.3.4', userId: 'github-user', onlineTimesToday: 120 },
+			{ id: '2', ip: '1.2.3.5', userId: 'non-github-user', onlineTimesToday: 120 },
+		]);
+
+		readMany.resolves([
+			{ id: 'github-user', external_identifier: '123456' },
+			{ id: 'non-github-user', external_identifier: null },
+		]);
+
+		createMany.resolves([ 1 ]);
+
+		const result = await operationApi.handler({}, { data, database, env, getSchema, services, logger, accountability });
+
+		expect(createMany.args[0]).to.deep.equal([ [{
+			github_id: '123456',
+			amount: 100,
+			reason: 'adopted_probe',
+			meta: { id: '1', ip: '1.2.3.4', name: null },
+			adopted_probe: '1',
+		}] ]);
+
+		expect(updateByQuery.args[0]).to.deep.equal([{}, { onlineTimesToday: 0 }, { emitEvents: false }]);
+		expect(result).to.equal('Created credits with ids: 1');
+	});
+
+	it('should reset online hours without creating credits when all owners lack GitHub IDs', async () => {
+		readByQuery.resolves([
+			{ id: '1', ip: '1.2.3.4', userId: 'non-github-user', onlineTimesToday: 120 },
+		]);
+
+		readMany.resolves([
+			{ id: 'non-github-user', external_identifier: null },
+		]);
+
+		const result = await operationApi.handler({}, { data, database, env, getSchema, services, logger, accountability });
+
+		expect(createMany.callCount).to.equal(0);
+		expect(updateByQuery.args[0]).to.deep.equal([{}, { onlineTimesToday: 0 }, { emitEvents: false }]);
+		expect(result).to.equal('No credits created');
+	});
+
 	it('should not assign credits for <20 hours online and still reset online hours', async () => {
 		readByQuery.resolves([{
 			id: '1',