wip: cleanup

Author: Julusian

meteor/server/security/README.md

@@ -1,11 +1 @@
 import './lib/lib'
-
-import './buckets'
-import './noSecurity'
-import './organization'
-import './peripheralDevice'
-import './rundown'
-import './rundownPlaylist'
-import './showStyle'
-import './studio'
-import './system'

meteor/server/security/_security.ts

@@ -1,4 +1,3 @@
-import { User } from '@sofie-automation/meteor-lib/dist/collections/Users'
 import { PeripheralDevice } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
 import { cacheResult } from '../../lib/cacheResult'
 import { LIMIT_CACHE_TIME } from './security'
@@ -12,12 +11,6 @@ export interface Credentials {
 	token?: string
 }
 
-/**
- * A minimal set of properties about the user.
- * We keep it small so that we don't cache too much in memory or have to invalidate the credentials when something insignificant changes
- */
-export type ResolvedUser = Pick<User, '_id' | 'organizationId' | 'superAdmin'>
-
 /**
  * A minimal set of properties about the OeripheralDevice.
  * We keep it small so that we don't cache too much in memory or have to invalidate the credentials when something insignificant changes
@@ -26,54 +19,9 @@ export type ResolvedPeripheralDevice = Pick<PeripheralDevice, '_id' | 'organizat
 
 export interface ResolvedCredentials {
 	organizationId: OrganizationId | null
-	user?: ResolvedUser
+	user?: any
 	device?: ResolvedPeripheralDevice
 }
-export interface ResolvedUserCredentials {
-	organizationId: OrganizationId
-	user: ResolvedUser
-}
-export interface ResolvedPeripheralDeviceCredentials {
-	organizationId: OrganizationId
-	device: ResolvedPeripheralDevice
-}
-
-/**
- * Resolve the provided credentials, and retrieve the PeripheralDevice and Organization for the provided credentials.
- * @returns null if the PeripheralDevice was not found
- */
-export async function resolveAuthenticatedPeripheralDevice(
-	cred: Credentials
-): Promise<ResolvedPeripheralDeviceCredentials | null> {
-	const resolved = await resolveCredentials({ userId: null, token: cred.token })
-
-	if (resolved.device && resolved.organizationId) {
-		return {
-			organizationId: resolved.organizationId,
-			device: resolved.device,
-		}
-	} else {
-		return null
-	}
-}
-
-/**
- * Resolve the provided credentials, and retrieve the User and Organization for the provided credentials.
- * Note: this requies that the UserId came from a trusted source,it must not be from user input
- * @returns null if the user was not found
- */
-export async function resolveAuthenticatedUser(cred: Credentials): Promise<ResolvedUserCredentials | null> {
-	const resolved = await resolveCredentials({ userId: cred.userId })
-
-	if (resolved.user && resolved.organizationId) {
-		return {
-			organizationId: resolved.organizationId,
-			user: resolved.user,
-		}
-	} else {
-		return null
-	}
-}
 
 /**
  * Resolve the provided credentials/identifier, and fetch the authenticating document from the database.
@@ -152,7 +100,7 @@ export async function resolveCredentials(cred: Credentials | ResolvedCredentials
 function credCacheName(cred: Credentials) {
 	return `resolveCredentials_${cred.userId}_${cred.token}`
 }
-export function isResolvedCredentials(cred: Credentials | ResolvedCredentials): cred is ResolvedCredentials {
+function isResolvedCredentials(cred: Credentials | ResolvedCredentials): cred is ResolvedCredentials {
 	const c = cred as ResolvedCredentials
 	return !!(c.user || c.organizationId || c.device)
 }