wip: cleanup

Author: Julusian

meteor/server/api/snapshot.ts

@@ -39,7 +39,6 @@ import { importIngestRundown } from './ingest/http'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { RundownLayoutBase } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
 import { DBTriggeredActions } from '@sofie-automation/meteor-lib/dist/collections/TriggeredActions'
-import { Settings } from '../Settings'
 import { MethodContext, MethodContextAPI } from './methodContext'
 import { saveIntoDb, sumChanges } from '../lib/database'
 import * as fs from 'fs'
@@ -154,9 +153,6 @@ async function createSystemSnapshot(
 	const coreSystem = await getCoreSystemAsync()
 	if (!coreSystem) throw new Meteor.Error(500, `coreSystem not set up`)
 
-	if (Settings.enableUserAccounts && !organizationId)
-		throw new Meteor.Error(500, 'Not able to create a systemSnaphost without organizationId')
-
 	let queryStudio: MongoQuery<DBStudio> = {}
 	let queryShowStyleBases: MongoQuery<DBShowStyleBase> = {}
 	let queryShowStyleVariants: MongoQuery<DBShowStyleVariant> = {}

meteor/server/systemStatus/api.ts

@@ -6,7 +6,6 @@ import {
 } from '@sofie-automation/meteor-lib/dist/api/systemStatus'
 import { getDebugStates, getSystemStatus } from './systemStatus'
 import { protectString } from '../lib/tempLib'
-import { Settings } from '../Settings'
 import { MethodContextAPI } from '../api/methodContext'
 import { profiler } from '../api/profiler'
 import { PeripheralDeviceId } from '@sofie-automation/corelib/dist/dataModel/Ids'
@@ -22,53 +21,38 @@ const apmNamespace = 'http'
 export const metricsRouter = new KoaRouter()
 export const healthRouter = new KoaRouter()
 
-if (!Settings.enableUserAccounts) {
-	// For backwards compatibility:
+metricsRouter.get('/', async (ctx) => {
+	const transaction = profiler.startTransaction('metrics', apmNamespace)
+	try {
+		ctx.response.type = PrometheusHTTPContentType
 
-	metricsRouter.get('/', async (ctx) => {
-		const transaction = profiler.startTransaction('metrics', apmNamespace)
-		try {
-			ctx.response.type = PrometheusHTTPContentType
+		const [meteorMetrics, workerMetrics] = await Promise.all([
+			getPrometheusMetricsString(),
+			collectWorkerPrometheusMetrics(),
+		])
 
-			const [meteorMetrics, workerMetrics] = await Promise.all([
-				getPrometheusMetricsString(),
-				collectWorkerPrometheusMetrics(),
-			])
-
-			ctx.body = [meteorMetrics, ...workerMetrics].join('\n\n')
-		} catch (ex) {
-			ctx.response.status = 500
-			ctx.body = ex + ''
-		}
-		transaction?.end()
-	})
-
-	healthRouter.get('/', async (ctx) => {
-		const transaction = profiler.startTransaction('health', apmNamespace)
-		const status = await getSystemStatus(ctx)
-		health(status, ctx)
-		transaction?.end()
-	})
+		ctx.body = [meteorMetrics, ...workerMetrics].join('\n\n')
+	} catch (ex) {
+		ctx.response.status = 500
+		ctx.body = ex + ''
+	}
+	transaction?.end()
+})
 
-	healthRouter.get('/:studioId', async (ctx) => {
-		const transaction = profiler.startTransaction('health', apmNamespace)
-		const status = await getSystemStatus(ctx, protectString(ctx.params.studioId))
-		health(status, ctx)
-		transaction?.end()
-	})
-}
-healthRouter.get('/:token', async (ctx) => {
+healthRouter.get('/', async (ctx) => {
 	const transaction = profiler.startTransaction('health', apmNamespace)
 	const status = await getSystemStatus(ctx)
 	health(status, ctx)
 	transaction?.end()
 })
-healthRouter.get('/:token/:studioId', async (ctx) => {
+
+healthRouter.get('/:studioId', async (ctx) => {
 	const transaction = profiler.startTransaction('health', apmNamespace)
 	const status = await getSystemStatus(ctx, protectString(ctx.params.studioId))
 	health(status, ctx)
 	transaction?.end()
 })
+
 function health(status: StatusResponse, ctx: Koa.ParameterizedContext) {
 	ctx.response.type = 'application/json'
 

packages/meteor-lib/src/Settings.ts

@@ -17,10 +17,7 @@ export interface ISettings {
 	defaultTimeScale: number
 	// Allow grabbing the entire timeline
 	allowGrabbingTimeline: boolean
-	/** If true, enables security measures, access control and user accounts. */
-	/** @deprecated */
-	enableUserAccounts: boolean
-	/** If true, enable header based security measures */
+	/** If true, enable http header based security measures */
 	enableHeaderAuth: boolean
 	/** Default duration to use to render parts when no duration is provided */
 	defaultDisplayDuration: number
@@ -72,8 +69,7 @@ export const DEFAULT_SETTINGS = Object.freeze<ISettings>({
 	disableBlurBorder: false,
 	defaultTimeScale: 1,
 	allowGrabbingTimeline: true,
-	enableUserAccounts: false,
-	enableHeaderAuth: true, // nocommit - hack for testing
+	enableHeaderAuth: false,
 	defaultDisplayDuration: 3000,
 	allowMultiplePlaylistsInGUI: false,
 	poisonKey: 'Escape',