wip: todos

Author: Julusian

meteor/server/api/peripheralDevice.ts

@@ -634,7 +634,7 @@ peripheralDeviceRouter.post('/:deviceId/uploadCredentials', bodyParser(), async
 		await PeripheralDevices.updateAsync(peripheralDevice._id, {
 			$set: {
 				'secretSettings.credentials': body,
-				'settings.secretCredentials': true,
+				'settings.secretCredentials': true, // nocommit - fix me
 			},
 		})
 
@@ -705,7 +705,7 @@ peripheralDeviceRouter.post('/:deviceId/resetAuth', async (ctx) => {
 			$unset: {
 				// User credentials
 				'secretSettings.accessToken': true,
-				'settings.secretAccessToken': true,
+				'settings.secretAccessToken': true, // nocommit - fix me
 				accessTokenUrl: true,
 			},
 		})
@@ -735,10 +735,10 @@ peripheralDeviceRouter.post('/:deviceId/resetAppCredentials', async (ctx) => {
 			$unset: {
 				// App credentials
 				'secretSettings.credentials': true,
-				'settings.secretCredentials': true,
+				'settings.secretCredentials': true, // nocommit - fix me
 				// User credentials
 				'secretSettings.accessToken': true,
-				'settings.secretAccessToken': true,
+				'settings.secretAccessToken': true, // nocommit - fix me
 				accessTokenUrl: true,
 			},
 		})

meteor/server/api/rest/v1/studios.ts

@@ -240,8 +240,7 @@ class StudiosServerAPI implements StudiosRestAPI {
 		}
 		await PeripheralDevices.updateAsync(deviceId, {
 			$set: {
-				// nocommit - this
-				studioId,
+				studioId, // nocommit - this
 			},
 		})
 
@@ -262,7 +261,7 @@ class StudiosServerAPI implements StudiosRestAPI {
 			)
 		await PeripheralDevices.updateAsync(deviceId, {
 			$unset: {
-				studioId: 1,
+				studioId: 1, // nocommit - this
 			},
 		})
 

meteor/server/migration/1_50_0.ts

@@ -171,7 +171,7 @@ export const addSteps = addMigrationSteps('1.50.0', [
 			})
 			const badObject = objects.find(
 				(device) =>
-					!!Object.values<unknown>((device.settings as any)?.['devices'] ?? {}).find(
+					!!Object.values<unknown>((device as any).settings?.['devices'] ?? {}).find(
 						(subdev: any) => !subdev?.type || !subdev?.options
 					)
 			)
@@ -187,7 +187,7 @@ export const addSteps = addMigrationSteps('1.50.0', [
 				'settings.device': { $exists: true },
 			})
 			for (const obj of objects) {
-				const newDevices: any = clone((obj.settings as any)?.['devices'] || {})
+				const newDevices: any = clone((obj as any).settings?.['devices'] || {})
 
 				for (const [id, subdev] of Object.entries<any>(newDevices)) {
 					if (!subdev) continue
@@ -501,7 +501,7 @@ export const addSteps = addMigrationSteps('1.50.0', [
 
 				const newOverrides: SomeObjectOverrideOp[] = []
 
-				for (const [id, subDevice] of Object.entries<unknown>((device.settings as any)?.['devices'] || {})) {
+				for (const [id, subDevice] of Object.entries<unknown>((device as any).settings?.['devices'] || {})) {
 					newOverrides.push(
 						literal<ObjectOverrideSetOp>({
 							op: 'set',
@@ -555,7 +555,7 @@ export const addSteps = addMigrationSteps('1.50.0', [
 
 				const newOverrides: SomeObjectOverrideOp[] = []
 
-				for (const [id, subDevice] of Object.entries<unknown>((device.settings as any)?.['devices'] || {})) {
+				for (const [id, subDevice] of Object.entries<unknown>((device as any).settings?.['devices'] || {})) {
 					newOverrides.push(
 						literal<ObjectOverrideSetOp>({
 							op: 'set',
@@ -609,7 +609,7 @@ export const addSteps = addMigrationSteps('1.50.0', [
 
 				const newOverrides: SomeObjectOverrideOp[] = []
 
-				for (const [id, subDevice] of Object.entries<unknown>((device.settings as any)?.['devices'] || {})) {
+				for (const [id, subDevice] of Object.entries<unknown>((device as any).settings?.['devices'] || {})) {
 					newOverrides.push(
 						literal<ObjectOverrideSetOp>({
 							op: 'set',

meteor/server/publications/peripheralDeviceForDevice.ts

@@ -171,7 +171,7 @@ async function setupPeripheralDevicePublicationObservers(
 					triggerUpdate({ invalidatePublication: true })
 				},
 				changed: (_id, fields) => {
-					if ('studioId' in fields) studioObserver.restart()
+					if ('studioAndConfigId' in fields) studioObserver.restart()
 
 					triggerUpdate({ invalidatePublication: true })
 				},