diff --git a/plugins/permission-node/api-report.md b/plugins/permission-node/api-report.md index fe26dc2a1a..0044807857 100644 --- a/plugins/permission-node/api-report.md +++ b/plugins/permission-node/api-report.md @@ -3,11 +3,11 @@ > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/). ```ts -import { AuthorizeRequest } from '@backstage/permission-common'; -import { AuthorizeResult } from '@backstage/permission-common'; +import { AuthorizeRequest } from '@backstage/plugin-permission-common'; +import { AuthorizeResult } from '@backstage/plugin-permission-common'; import { BackstageIdentity } from '@backstage/plugin-auth-backend'; -import { PermissionCondition } from '@backstage/permission-common'; -import { PermissionCriteria } from '@backstage/permission-common'; +import { PermissionCondition } from '@backstage/plugin-permission-common'; +import { PermissionCriteria } from '@backstage/plugin-permission-common'; import { Router } from 'express'; // @public diff --git a/plugins/permission-node/package.json b/plugins/permission-node/package.json index a23cb0fae2..eaf9efdbba 100644 --- a/plugins/permission-node/package.json +++ b/plugins/permission-node/package.json @@ -19,8 +19,8 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/permission-common": "^0.1.0", "@backstage/plugin-auth-backend": "^0.4.6", + "@backstage/plugin-permission-common": "^0.1.0", "@types/express": "*", "express": "^4.17.1", "zod": "^3.11.6" diff --git a/plugins/permission-node/src/integration/createPermissionIntegration.test.ts b/plugins/permission-node/src/integration/createPermissionIntegration.test.ts index 6b0ca948bf..1ef310954f 100644 --- a/plugins/permission-node/src/integration/createPermissionIntegration.test.ts +++ b/plugins/permission-node/src/integration/createPermissionIntegration.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { AuthorizeResult } from '@backstage/permission-common'; +import { AuthorizeResult } from '@backstage/plugin-permission-common'; import express, { Express, Router } from 'express'; import request from 'supertest'; import { createPermissionIntegration } from './createPermissionIntegration'; diff --git a/plugins/permission-node/src/integration/createPermissionIntegration.ts b/plugins/permission-node/src/integration/createPermissionIntegration.ts index cbdcb72041..7a7ae0ea4b 100644 --- a/plugins/permission-node/src/integration/createPermissionIntegration.ts +++ b/plugins/permission-node/src/integration/createPermissionIntegration.ts @@ -20,7 +20,7 @@ import { AuthorizeResult, PermissionCondition, PermissionCriteria, -} from '@backstage/permission-common'; +} from '@backstage/plugin-permission-common'; import { PermissionRule } from '../types'; import { conditionFor } from './conditionFor'; import { applyConditions, mapConditions } from './util'; diff --git a/plugins/permission-node/src/integration/util.test.ts b/plugins/permission-node/src/integration/util.test.ts index 44a000d395..93f51d8275 100644 --- a/plugins/permission-node/src/integration/util.test.ts +++ b/plugins/permission-node/src/integration/util.test.ts @@ -17,7 +17,7 @@ import { PermissionCondition, PermissionCriteria, -} from '@backstage/permission-common'; +} from '@backstage/plugin-permission-common'; import { applyConditions, mapConditions } from './util'; describe('integration utils', () => { diff --git a/plugins/permission-node/src/integration/util.ts b/plugins/permission-node/src/integration/util.ts index 355964d573..631aee269e 100644 --- a/plugins/permission-node/src/integration/util.ts +++ b/plugins/permission-node/src/integration/util.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { PermissionCriteria } from '@backstage/permission-common'; +import { PermissionCriteria } from '@backstage/plugin-permission-common'; const isAndCriteria = ( filter: PermissionCriteria, diff --git a/plugins/permission-node/src/policy/types.ts b/plugins/permission-node/src/policy/types.ts index e81757d59c..d594d3bdb7 100644 --- a/plugins/permission-node/src/policy/types.ts +++ b/plugins/permission-node/src/policy/types.ts @@ -19,7 +19,7 @@ import { AuthorizeResult, PermissionCondition, PermissionCriteria, -} from '@backstage/permission-common'; +} from '@backstage/plugin-permission-common'; import { BackstageIdentity } from '@backstage/plugin-auth-backend'; /** diff --git a/plugins/permission-node/src/types.ts b/plugins/permission-node/src/types.ts index 308eafe481..d3379c40a6 100644 --- a/plugins/permission-node/src/types.ts +++ b/plugins/permission-node/src/types.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import type { PermissionCriteria } from '@backstage/permission-common'; +import type { PermissionCriteria } from '@backstage/plugin-permission-common'; /** * A conditional rule that can be provided in an {@link AuthorizeResult} response to an