wip: fix

Author: Julusian

meteor/server/api/heapSnapshot.ts

@@ -7,10 +7,10 @@ import { fixValidPath } from '../lib/lib'
 import { sleep } from '../lib/lib'
 import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 import { logger } from '../logging'
-import { assertConnectionIsDeveloper, RequestCredentials } from '../security/auth'
+import { assertConnectionHasOneOfPermissions, RequestCredentials } from '../security/auth'
 
 async function retrieveHeapSnapshot(cred: RequestCredentials): Promise<Readable> {
-	assertConnectionIsDeveloper(cred)
+	assertConnectionHasOneOfPermissions(cred, 'developer')
 
 	logger.warn('Taking heap snapshot, expect system to be unresponsive for a few seconds..')
 	await sleep(100) // Allow the logger to catch up before continuing..

meteor/server/methods.ts

@@ -5,7 +5,7 @@ import { extractFunctionSignature } from './lib'
 import { MethodContext, MethodContextAPI } from './api/methodContext'
 import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 import { isPromise } from '@sofie-automation/shared-lib/dist/lib/lib'
-import { assertConnectionIsDeveloper } from './security/auth'
+import { assertConnectionHasOneOfPermissions } from './security/auth'
 
 type MeteorMethod = (this: MethodContext, ...args: any[]) => any
 
@@ -152,7 +152,7 @@ export function MeteorDebugMethods(methods: { [key: string]: MeteorDebugMethod }
 	for (const [key, fn] of Object.entries<MeteorDebugMethod>(methods)) {
 		if (key && !!fn) {
 			fiberMethods[key] = function (this: Meteor.MethodThisType, ...args: any[]) {
-				assertConnectionIsDeveloper(this.connection)
+				assertConnectionHasOneOfPermissions(this.connection, 'developer')
 
 				return fn.call(this, ...args)
 			}

meteor/server/security/auth.ts

@@ -40,10 +40,6 @@ export function parseConnectionPermissions(conn: RequestCredentials): UserPermis
 	return parseUserPermissions(header)
 }
 
-export function assertConnectionIsDeveloper(conn: RequestCredentials | null): void {
-	return assertConnectionHasOneOfPermissions(conn, 'developer')
-}
-
 export function assertConnectionHasOneOfPermissions(
 	conn: RequestCredentials | null,
 	...allowedPermissions: Array<keyof UserPermissions>
@@ -52,10 +48,7 @@ export function assertConnectionHasOneOfPermissions(
 
 	triggerWriteAccess()
 
-	if (!conn) {
-		// nocommit - this won't work nicely
-		throw new Meteor.Error(403, 'Can only be invoked by clients')
-	}
+	if (!conn) throw new Meteor.Error(403, 'Can only be invoked by clients')
 
 	const permissions = parseConnectionPermissions(conn)
 	for (const permission of allowedPermissions) {

meteor/server/systemStatus/systemStatus.ts

@@ -25,7 +25,7 @@ import { MethodContext } from '../api/methodContext'
 import { getBlueprintVersions } from './blueprintVersions'
 import { getUpgradeSystemStatusMessages } from './blueprintUpgradeStatus'
 import { triggerWriteAccessBecauseNoCheckNecessary } from '../security/securityVerify'
-import { assertConnectionIsDeveloper, RequestCredentials } from '../security/auth'
+import { assertConnectionHasOneOfPermissions, RequestCredentials } from '../security/auth'
 
 const PackageInfo = require('../../package.json')
 const integrationVersionRange = parseCoreIntegrationCompatabilityRange(PackageInfo.version)
@@ -388,6 +388,7 @@ export async function getDebugStates(
 	methodContext: MethodContext,
 	peripheralDeviceId: PeripheralDeviceId
 ): Promise<object> {
-	assertConnectionIsDeveloper(methodContext.connection)
+	assertConnectionHasOneOfPermissions(methodContext.connection, 'developer')
+
 	return ServerPeripheralDeviceAPI.getDebugStates(peripheralDeviceId)
 }

packages/meteor-lib/src/api/user.ts

@@ -6,4 +6,3 @@ export interface NewUserAPI {
 export enum UserAPIMethods {
 	'getUserPermissions' = 'user.getUserPermissions',
 }
-