wip: cleanup

Author: Julusian

meteor/__mocks__/meteor.ts

@@ -1,7 +1,6 @@
 import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 import * as _ from 'underscore'
 import { Fiber } from './Fibers'
-import { MongoMock } from './mongo'
 import { USER_PERMISSIONS_HEADER } from '@sofie-automation/meteor-lib/dist/userPermissions'
 
 let controllableDefer = false
@@ -13,27 +12,14 @@ export function useNextTickDefer(): void {
 	controllableDefer = false
 }
 
-namespace Meteor {
+export namespace Meteor {
 	export interface Settings {
 		public: {
 			[id: string]: any
 		}
 		[id: string]: any
 	}
 
-	export interface UserEmail {
-		address: string
-		verified: boolean
-	}
-	export interface User {
-		_id?: string
-		username?: string
-		emails?: UserEmail[]
-		createdAt?: number
-		profile?: any
-		services?: any
-	}
-
 	export interface ErrorStatic {
 		new (error: string | number, reason?: string, details?: string): Error
 	}
@@ -107,23 +93,16 @@ export namespace MeteorMock {
 	export const settings: any = {}
 
 	export const mockMethods: { [name: string]: Function } = {}
-	export let mockUser: Meteor.User | undefined = undefined
 	export const mockStartupFunctions: Function[] = []
 
 	export const absolutePath = process.cwd()
 
-	export function user(): Meteor.User | undefined {
-		return mockUser
-	}
-	export function userId(): string | undefined {
-		return mockUser ? mockUser._id : undefined
-	}
 	function getMethodContext() {
 		return {
-			userId: mockUser ? mockUser._id : undefined,
 			connection: {
 				clientAddress: '1.1.1.1',
 				httpHeaders: {
+					// Default to full permissions for tests
 					[USER_PERMISSIONS_HEADER]: 'admin',
 				},
 			},
@@ -285,7 +264,6 @@ export namespace MeteorMock {
 			}
 		}
 	}
-	export let users: MongoMock.Collection<any> | undefined = undefined
 
 	// -- Mock functions: --------------------------
 	/**
@@ -298,12 +276,6 @@ export namespace MeteorMock {
 
 		waitTimeNoFakeTimers(10) // So that any observers or defers has had time to run.
 	}
-	export function mockLoginUser(newUser: Meteor.User): void {
-		mockUser = newUser
-	}
-	export function mockSetUsersCollection(usersCollection: MongoMock.Collection<any>): void {
-		users = usersCollection
-	}
 	export function mockSetClientEnvironment(): void {
 		mockIsClient = true
 	}

meteor/__mocks__/mongo.ts

@@ -350,5 +350,3 @@ export function setup(): any {
 		Mongo: MongoMock,
 	}
 }
-
-MeteorMock.mockSetUsersCollection(new MongoMock.Collection('Meteor.users'))

meteor/server/api/peripheralDevice.ts

@@ -67,6 +67,7 @@ import { convertPeripheralDeviceForGateway } from '../publications/peripheralDev
 import { executePeripheralDeviceFunction } from './peripheralDevice/executeFunction'
 import KoaRouter from '@koa/router'
 import bodyParser from 'koa-bodyparser'
+import { checkUserIdHasOneOfPermissions } from '../security/auth'
 
 const apmNamespace = 'peripheralDevice'
 export namespace ServerPeripheralDeviceAPI {

packages/shared-lib/src/peripheralDevice/methodsAPI.ts

@@ -116,7 +116,7 @@ export interface NewPeripheralDeviceAPI {
 	timelineTriggerTime(deviceId: PeripheralDeviceId, deviceToken: string, r: TimelineTriggerTimeResult): Promise<void>
 	requestUserAuthToken(deviceId: PeripheralDeviceId, deviceToken: string, authUrl: string): Promise<void>
 	storeAccessToken(deviceId: PeripheralDeviceId, deviceToken: string, authToken: string): Promise<void>
-	removePeripheralDevice(deviceId: PeripheralDeviceId): Promise<void>
+	removePeripheralDevice(deviceId: PeripheralDeviceId, deviceToken?: string): Promise<void>
 	reportResolveDone(
 		deviceId: PeripheralDeviceId,
 		deviceToken: string,

packages/webui/src/__mocks__/meteor.ts

@@ -1,5 +1,4 @@
 import * as _ from 'underscore'
-import { MongoMock } from './mongo'
 import type { DDP } from 'meteor/ddp'
 
 let controllableDefer = false
@@ -11,27 +10,14 @@ export function useNextTickDefer(): void {
 	controllableDefer = false
 }
 
-namespace Meteor {
+export namespace Meteor {
 	export interface Settings {
 		public: {
 			[id: string]: any
 		}
 		[id: string]: any
 	}
 
-	export interface UserEmail {
-		address: string
-		verified: boolean
-	}
-	export interface User {
-		_id?: string
-		username?: string
-		emails?: UserEmail[]
-		createdAt?: number
-		profile?: any
-		services?: any
-	}
-
 	export interface ErrorStatic {
 		new (error: string | number, reason?: string, details?: string): Error
 	}
@@ -89,7 +75,6 @@ export namespace MeteorMock {
 	export const settings: any = {}
 
 	export const mockMethods: { [name: string]: Function } = {}
-	export let mockUser: Meteor.User | undefined = undefined
 	export const mockStartupFunctions: Function[] = []
 
 	export function status(): DDP.DDPStatus {
@@ -100,15 +85,8 @@ export namespace MeteorMock {
 		}
 	}
 
-	export function user(): Meteor.User | undefined {
-		return mockUser
-	}
-	export function userId(): string | undefined {
-		return mockUser ? mockUser._id : undefined
-	}
 	function getMethodContext() {
 		return {
-			userId: mockUser ? mockUser._id : undefined,
 			connection: {
 				clientAddress: '1.1.1.1',
 			},
@@ -223,7 +201,6 @@ export namespace MeteorMock {
 	export function bindEnvironment(_fcn: Function): any {
 		throw new Error(500, 'bindEnvironment not supported on client')
 	}
-	export let users: MongoMock.Collection<any> | undefined = undefined
 
 	// -- Mock functions: --------------------------
 	/**
@@ -236,12 +213,6 @@ export namespace MeteorMock {
 
 		await waitTimeNoFakeTimers(10) // So that any observers or defers has had time to run.
 	}
-	export function mockLoginUser(newUser: Meteor.User): void {
-		mockUser = newUser
-	}
-	export function mockSetUsersCollection(usersCollection: MongoMock.Collection<any>): void {
-		users = usersCollection
-	}
 
 	/** Wait for time to pass ( unaffected by jest.useFakeTimers() ) */
 	export async function sleepNoFakeTimers(time: number): Promise<void> {

packages/webui/src/__mocks__/mongo.ts

@@ -349,5 +349,3 @@ export function setup(): any {
 		Mongo: MongoMock,
 	}
 }
-
-MeteorMock.mockSetUsersCollection(new MongoMock.Collection('Meteor.users'))