Skip to content

Commit 5fa5d8e

Browse files
committed
wip: rearrange
1 parent b82d000 commit 5fa5d8e

35 files changed

+35
-35
lines changed

meteor/server/api/client.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { ClientAPI, NewClientAPI, ClientAPIMethods } from '@sofie-automation/met
77
import { UserActionsLogItem } from '@sofie-automation/meteor-lib/dist/collections/UserActionsLog'
88
import { registerClassToMeteorMethods } from '../methods'
99
import { MethodContext, MethodContextAPI } from './methodContext'
10-
import { isInTestWrite, triggerWriteAccessBecauseNoCheckNecessary } from '../security/lib/securityVerify'
10+
import { isInTestWrite, triggerWriteAccessBecauseNoCheckNecessary } from '../security/securityVerify'
1111
import { endTrace, sendTrace, startTrace } from './integration/influx'
1212
import { interpollateTranslation, translateMessage } from '@sofie-automation/corelib/dist/TranslatableMessage'
1313
import { UserError } from '@sofie-automation/corelib/dist/error'

meteor/server/api/peripheralDevice.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import { MOS } from '@sofie-automation/corelib'
2727
import { determineDiffTime } from './systemTime/systemTime'
2828
import { getTimeDiff } from './systemTime/api'
2929
import { MethodContextAPI, MethodContext } from './methodContext'
30-
import { triggerWriteAccess, triggerWriteAccessBecauseNoCheckNecessary } from '../security/lib/securityVerify'
30+
import { triggerWriteAccess, triggerWriteAccessBecauseNoCheckNecessary } from '../security/securityVerify'
3131
import { checkAccessAndGetPeripheralDevice } from '../security/check'
3232
import { UserActionsLogItem } from '@sofie-automation/meteor-lib/dist/collections/UserActionsLog'
3333
import { PackageManagerIntegration } from './integration/expectedPackages'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
88
import { MethodContextAPI } from '../../methodContext'
99
import { logger } from '../../../logging'
1010
import { CURRENT_SYSTEM_VERSION } from '../../../migration/currentSystemVersion'
11-
import { triggerWriteAccess } from '../../../security/lib/securityVerify'
11+
import { triggerWriteAccess } from '../../../security/securityVerify'
1212
import { makeMeteorConnectionFromKoa } from '../koa'
1313
import { registerRoutes as registerBlueprintsRoutes } from './blueprints'
1414
import { registerRoutes as registerDevicesRoutes } from './devices'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import { QueueNextSegmentResult, StudioJobs } from '@sofie-automation/corelib/di
3333
import { getCurrentTime } from '../../../lib/lib'
3434
import { TriggerReloadDataResponse } from '@sofie-automation/meteor-lib/dist/api/userActions'
3535
import { ServerRundownAPI } from '../../rundown'
36-
import { triggerWriteAccess } from '../../../security/lib/securityVerify'
36+
import { triggerWriteAccess } from '../../../security/securityVerify'
3737

3838
class PlaylistsServerAPI implements PlaylistsRestAPI {
3939
constructor(private context: ServerAPIContext) {}

meteor/server/api/rundown.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { Blueprint } from '@sofie-automation/corelib/dist/dataModel/Blueprint'
1919
import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
2020
import { RundownPlaylistId } from '@sofie-automation/corelib/dist/dataModel/Ids'
2121
import { Blueprints, Rundowns, ShowStyleBases, ShowStyleVariants, Studios } from '../collections'
22-
import { triggerWriteAccessBecauseNoCheckNecessary } from '../security/lib/securityVerify'
22+
import { triggerWriteAccessBecauseNoCheckNecessary } from '../security/securityVerify'
2323

2424
export namespace ServerRundownAPI {
2525
/** Remove an individual rundown */

meteor/server/api/singleUseTokens.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Time } from '@sofie-automation/blueprints-integration'
33
import { getHash } from '@sofie-automation/corelib/dist/hash'
44
import { getCurrentTime } from '../lib/lib'
55
import { SINGLE_USE_TOKEN_SALT } from '@sofie-automation/meteor-lib/dist/api/userActions'
6-
import { isInTestWrite } from '../security/lib/securityVerify'
6+
import { isInTestWrite } from '../security/securityVerify'
77

88
// The following code is taken from an NPM pacakage called "@sunknudsen/totp", but copied here, instead
99
// of used as a dependency so that it's not vulnerable to a supply chain attack

meteor/server/api/system.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import { nightlyCronjobInner } from '../cronjobs'
2424
import { TranslationsBundleId } from '@sofie-automation/corelib/dist/dataModel/Ids'
2525
import { createAsyncOnlyMongoCollection, AsyncOnlyMongoCollection } from '../collections/collection'
2626
import { generateToken } from './singleUseTokens'
27-
import { triggerWriteAccessBecauseNoCheckNecessary } from '../security/lib/securityVerify'
27+
import { triggerWriteAccessBecauseNoCheckNecessary } from '../security/securityVerify'
2828
import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
2929
import { assertConnectionHasOneOfPermissions } from '../security/auth'
3030
import { UserPermissions } from '@sofie-automation/meteor-lib/dist/userPermissions'

meteor/server/api/user.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { MethodContextAPI } from './methodContext'
22
import { NewUserAPI, UserAPIMethods } from '@sofie-automation/meteor-lib/dist/api/user'
33
import { registerClassToMeteorMethods } from '../methods'
4-
import { triggerWriteAccessBecauseNoCheckNecessary } from '../security/lib/securityVerify'
4+
import { triggerWriteAccessBecauseNoCheckNecessary } from '../security/securityVerify'
55
import { parseUserPermissions, USER_PERMISSIONS_HEADER } from '@sofie-automation/meteor-lib/dist/userPermissions'
66

77
class ServerUserAPI extends MethodContextAPI implements NewUserAPI {

meteor/server/api/userActions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { MediaManagerAPI } from './mediaManager'
1414
import { MOSDeviceActions } from './ingest/mosDevice/actions'
1515
import { MethodContextAPI } from './methodContext'
1616
import { ServerClientAPI } from './client'
17-
import { triggerWriteAccessBecauseNoCheckNecessary } from '../security/lib/securityVerify'
17+
import { triggerWriteAccessBecauseNoCheckNecessary } from '../security/securityVerify'
1818
import { Bucket } from '@sofie-automation/meteor-lib/dist/collections/Buckets'
1919
import { BucketsAPI } from './buckets'
2020
import { BucketAdLib } from '@sofie-automation/corelib/dist/dataModel/BucketAdLibPiece'

meteor/server/collections/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyE
3232
import { createAsyncOnlyMongoCollection, createAsyncOnlyReadOnlyMongoCollection } from './collection'
3333
import { ObserveChangesForHash } from './lib'
3434
import { logger } from '../logging'
35-
import { allowOnlyFields, rejectFields } from '../security/lib/lib'
35+
import { allowOnlyFields, rejectFields } from '../security/allowDeny'
3636
import type { DBNotificationObj } from '@sofie-automation/corelib/dist/dataModel/Notifications'
3737
import { checkUserIdHasOneOfPermissions } from '../security/auth'
3838

0 commit comments

Comments
 (0)