diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0529b3dd8..7c59eafa7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -61,7 +61,7 @@ jobs: - uses: actions/checkout@v1 - name: prepare ts api client run: | - docker run --rm -v $(pwd):/local openapitools/openapi-generator-cli generate -i /local/swagger.yaml -g typescript-fetch -o /local/web/src/api --additional-properties=typescriptThreePlus=true + docker run --rm -v $(pwd):/local openapitools/openapi-generator-cli generate -i /local/swagger.yaml -g typescript-fetch -o /local/web/api --additional-properties=typescriptThreePlus=true,supportsES6=true,npmName=authentik-api,npmVersion=1.0.0 - name: Docker Login Registry env: DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e8f392c78..bab38924d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -279,7 +279,7 @@ stages: displayName: Build static files for e2e inputs: script: | - docker run --rm -v $(pwd):/local openapitools/openapi-generator-cli generate -i /local/swagger.yaml -g typescript-fetch -o /local/web/src/api --additional-properties=typescriptThreePlus=true + docker run --rm -v $(pwd):/local openapitools/openapi-generator-cli generate -i /local/swagger.yaml -g typescript-fetch -o /local/web/api --additional-properties=typescriptThreePlus=true,supportsES6=true,npmName=authentik-api,npmVersion=1.0.0 cd web npm i npm run build diff --git a/web/.gitignore b/web/.gitignore index e9e54c17e..93c965069 100644 --- a/web/.gitignore +++ b/web/.gitignore @@ -107,3 +107,4 @@ tmp/ temp/ # End of https://www.gitignore.io/api/node +api/** diff --git a/web/Dockerfile b/web/Dockerfile index 0d56aa20e..1eb894cb1 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -2,6 +2,7 @@ FROM node as npm-builder COPY . /static/ +ENV NODE_ENV production RUN cd /static && npm i && npm run build FROM nginx diff --git a/web/azure-pipelines.yml b/web/azure-pipelines.yml index 5275b7e3d..c94c25568 100644 --- a/web/azure-pipelines.yml +++ b/web/azure-pipelines.yml @@ -23,7 +23,7 @@ stages: - task: CmdLine@2 inputs: script: | - docker run --rm -v $(pwd):/local openapitools/openapi-generator-cli generate -i /local/swagger.yaml -g typescript-fetch -o /local/web/src/api --additional-properties=typescriptThreePlus=true + docker run --rm -v $(pwd):/local openapitools/openapi-generator-cli generate -i /local/swagger.yaml -g typescript-fetch -o /local/web/api --additional-properties=typescriptThreePlus=true,supportsES6=true,npmName=authentik-api,npmVersion=1.0.0 - task: PublishPipelineArtifact@1 inputs: targetPath: 'web/src/api/' diff --git a/web/package-lock.json b/web/package-lock.json index 654b2708f..8b169fe95 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -707,6 +707,9 @@ "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==", "dev": true }, + "authentik-api": { + "version": "file:api" + }, "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", diff --git a/web/package.json b/web/package.json index 470385bb1..fed96ded1 100644 --- a/web/package.json +++ b/web/package.json @@ -17,6 +17,7 @@ "@types/chart.js": "^2.9.31", "@types/codemirror": "0.0.108", "@types/grecaptcha": "^3.0.1", + "authentik-api": "file:api", "base64-js": "^1.5.1", "chart.js": "^2.9.4", "codemirror": "^5.59.4", diff --git a/web/rollup.config.js b/web/rollup.config.js index c571ee8f8..d54842c85 100644 --- a/web/rollup.config.js +++ b/web/rollup.config.js @@ -16,17 +16,26 @@ const resources = [ { src: "./icons/*", dest: "dist/assets/icons" }, ]; -// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types -function manualChunks(id) { - if (id.includes("node_modules")) { - return "vendor"; - } - if (id.includes("src/api/")) { - return "api"; - } -} - export default [ + // Autogenerated API Client + { + input: "./api/src/index.ts", + output: [ + { + format: "es", + dir: "./api/dist/", + sourcemap: true, + }, + ], + plugins: [ + typescript(), + process.env.NODE_ENV === "production" ? terser() : undefined, + ].filter(p => p), + watch: { + clearScreen: false, + }, + }, + // Main Application { input: "./src/main.ts", output: [ @@ -34,29 +43,29 @@ export default [ format: "es", dir: "dist", sourcemap: true, - manualChunks: manualChunks, }, ], plugins: [ cssimport(), typescript(), externalGlobals({ - django: "django" + django: "django", }), resolve({ browser: true }), commonjs(), sourcemaps(), - terser(), + process.env.NODE_ENV === "production" ? terser() : undefined, copy({ targets: [...resources], copyOnce: false, }), - ], + ].filter(p => p), watch: { clearScreen: false, }, external: ["django"] }, + // Flow executor { input: "./src/flow.ts", output: [ @@ -64,7 +73,6 @@ export default [ format: "es", dir: "dist", sourcemap: true, - manualChunks: manualChunks, }, ], plugins: [ @@ -76,12 +84,12 @@ export default [ resolve({ browser: true }), commonjs(), sourcemaps(), - terser(), + process.env.NODE_ENV === "production" ? terser() : undefined, copy({ targets: [...resources], copyOnce: false, }), - ], + ].filter(p => p), watch: { clearScreen: false, }, diff --git a/web/src/api/.gitignore b/web/src/api/.gitignore deleted file mode 100644 index 2b9f4aa81..000000000 --- a/web/src/api/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -apis/** -models/** -index.ts -runtime.ts -.openapi-generator/** diff --git a/web/src/api/.openapi-generator-ignore b/web/src/api/.openapi-generator-ignore deleted file mode 100644 index 7484ee590..000000000 --- a/web/src/api/.openapi-generator-ignore +++ /dev/null @@ -1,23 +0,0 @@ -# OpenAPI Generator Ignore -# Generated by openapi-generator https://github.com/openapitools/openapi-generator - -# Use this file to prevent files from being overwritten by the generator. -# The patterns follow closely to .gitignore or .dockerignore. - -# As an example, the C# client generator defines ApiClient.cs. -# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line: -#ApiClient.cs - -# You can match any string of characters against a directory, file or extension with a single asterisk (*): -#foo/*/qux -# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux - -# You can recursively match patterns against a directory, file or extension with a double asterisk (**): -#foo/**/qux -# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux - -# You can also negate patterns with an exclamation (!). -# For example, you can ignore all files in a docs folder with the file extension .md: -#docs/*.md -# Then explicitly reverse the ignore rule for a single file: -#!docs/README.md diff --git a/web/src/api/Client.ts b/web/src/api/Client.ts index bdc6236c9..20a8efd22 100644 --- a/web/src/api/Client.ts +++ b/web/src/api/Client.ts @@ -5,12 +5,10 @@ export interface QueryArguments { } export interface BaseInheritanceModel { - objectType: string; verboseName: string; verboseNamePlural: string; - } export interface AKPagination { diff --git a/web/src/api/Config.ts b/web/src/api/Config.ts index 2d4432d4a..2ad38589a 100644 --- a/web/src/api/Config.ts +++ b/web/src/api/Config.ts @@ -2,9 +2,7 @@ import * as Sentry from "@sentry/browser"; import { Integrations } from "@sentry/tracing"; import { VERSION } from "../constants"; import { SentryIgnoredError } from "../common/errors"; -import { Configuration } from "./runtime"; -import { RootApi } from "./apis"; -import { Config } from "."; +import { Config, Configuration, RootApi } from "authentik-api"; import { getCookie } from "../utils"; export const DEFAULT_CONFIG = new Configuration({ diff --git a/web/src/api/Events.ts b/web/src/api/Events.ts index 8b021fc20..e5c297951 100644 --- a/web/src/api/Events.ts +++ b/web/src/api/Events.ts @@ -1,4 +1,4 @@ -import { Event } from "./models"; +import { Event } from "authentik-api"; export interface EventUser { pk: number; diff --git a/web/src/api/Flows.ts b/web/src/api/Flows.ts index 91e76f2a1..47b1da83e 100644 --- a/web/src/api/Flows.ts +++ b/web/src/api/Flows.ts @@ -1,4 +1,4 @@ -import { ChallengeTypeEnum } from "./models"; +import { ChallengeTypeEnum } from "authentik-api"; export interface Error { code: string; diff --git a/web/src/api/Users.ts b/web/src/api/Users.ts index f9b0de78b..0f913a967 100644 --- a/web/src/api/Users.ts +++ b/web/src/api/Users.ts @@ -1,6 +1,5 @@ -import { CoreApi } from "./apis"; +import { CoreApi, User } from "authentik-api"; import { DEFAULT_CONFIG } from "./Config"; -import { User } from "./models"; let _globalMePromise: Promise; export function me(): Promise { diff --git a/web/src/elements/buttons/TokenCopyButton.ts b/web/src/elements/buttons/TokenCopyButton.ts index 6d203e5dc..0fa257bd4 100644 --- a/web/src/elements/buttons/TokenCopyButton.ts +++ b/web/src/elements/buttons/TokenCopyButton.ts @@ -3,7 +3,7 @@ import { css, CSSResult, customElement, html, LitElement, property, TemplateResu import GlobalsStyle from "@patternfly/patternfly/base/patternfly-globals.css"; // @ts-ignore import ButtonStyle from "@patternfly/patternfly/components/Button/button.css"; -import { CoreApi } from "../../api"; +import { CoreApi } from "authentik-api"; import { ERROR_CLASS, PRIMARY_CLASS, SUCCESS_CLASS } from "../../constants"; import { ColorStyles } from "../../common/styles"; import { DEFAULT_CONFIG } from "../../api/Config"; diff --git a/web/src/elements/charts/AdminLoginsChart.ts b/web/src/elements/charts/AdminLoginsChart.ts index 5bad3923f..9411597d3 100644 --- a/web/src/elements/charts/AdminLoginsChart.ts +++ b/web/src/elements/charts/AdminLoginsChart.ts @@ -1,6 +1,6 @@ import { customElement } from "lit-element"; import Chart from "chart.js"; -import { AdminApi, LoginMetrics } from "../../api"; +import { AdminApi, LoginMetrics } from "authentik-api"; import { AKChart } from "./Chart"; import { DEFAULT_CONFIG } from "../../api/Config"; diff --git a/web/src/elements/charts/ApplicationAuthorizeChart.ts b/web/src/elements/charts/ApplicationAuthorizeChart.ts index a72bf44d9..4c33b7e77 100644 --- a/web/src/elements/charts/ApplicationAuthorizeChart.ts +++ b/web/src/elements/charts/ApplicationAuthorizeChart.ts @@ -1,5 +1,5 @@ import { customElement, property } from "lit-element"; -import { Coordinate, CoreApi } from "../../api"; +import { Coordinate, CoreApi } from "authentik-api"; import { DEFAULT_CONFIG } from "../../api/Config"; import { AKChart } from "./Chart"; diff --git a/web/src/elements/notifications/NotificationDrawer.ts b/web/src/elements/notifications/NotificationDrawer.ts index 6fe61c850..ffef63b6f 100644 --- a/web/src/elements/notifications/NotificationDrawer.ts +++ b/web/src/elements/notifications/NotificationDrawer.ts @@ -1,6 +1,6 @@ import { gettext } from "django"; import { css, CSSResult, customElement, html, LitElement, property, TemplateResult } from "lit-element"; -import { EventsApi, Notification } from "../../api"; +import { EventsApi, Notification } from "authentik-api"; import { AKResponse } from "../../api/Client"; import { DEFAULT_CONFIG } from "../../api/Config"; import { COMMON_STYLES } from "../../common/styles"; diff --git a/web/src/elements/policies/BoundPoliciesList.ts b/web/src/elements/policies/BoundPoliciesList.ts index 0f9f344de..7c79c82ca 100644 --- a/web/src/elements/policies/BoundPoliciesList.ts +++ b/web/src/elements/policies/BoundPoliciesList.ts @@ -2,7 +2,7 @@ import { gettext } from "django"; import { customElement, html, property, TemplateResult } from "lit-element"; import { AKResponse } from "../../api/Client"; import { Table, TableColumn } from "../../elements/table/Table"; -import { PoliciesApi, PolicyBinding } from "../../api"; +import { PoliciesApi, PolicyBinding } from "authentik-api"; import "../../elements/Tabs"; import "../../elements/buttons/ModalButton"; diff --git a/web/src/elements/sidebar/SidebarBrand.ts b/web/src/elements/sidebar/SidebarBrand.ts index 1d9e5eef7..c24ffbac5 100644 --- a/web/src/elements/sidebar/SidebarBrand.ts +++ b/web/src/elements/sidebar/SidebarBrand.ts @@ -4,7 +4,7 @@ import PageStyle from "@patternfly/patternfly/components/Page/page.css"; // @ts-ignore import GlobalsStyle from "@patternfly/patternfly/base/patternfly-globals.css"; import { configureSentry } from "../../api/Config"; -import { Config } from "../../api"; +import { Config } from "authentik-api"; import { ifDefined } from "lit-html/directives/if-defined"; export const DefaultConfig: Config = { diff --git a/web/src/flows/FlowExecutor.ts b/web/src/flows/FlowExecutor.ts index fa8526ccc..8a8775064 100644 --- a/web/src/flows/FlowExecutor.ts +++ b/web/src/flows/FlowExecutor.ts @@ -27,7 +27,7 @@ import { CaptchaChallenge } from "./stages/captcha/CaptchaStage"; import { COMMON_STYLES } from "../common/styles"; import { SpinnerSize } from "../elements/Spinner"; import { StageHost } from "./stages/base"; -import { Challenge, ChallengeTypeEnum, FlowsApi } from "../api"; +import { Challenge, ChallengeTypeEnum, FlowsApi } from "authentik-api"; import { DEFAULT_CONFIG } from "../api/Config"; @customElement("ak-flow-executor") diff --git a/web/src/flows/stages/email/EmailStage.ts b/web/src/flows/stages/email/EmailStage.ts index d20a10544..95e1193ff 100644 --- a/web/src/flows/stages/email/EmailStage.ts +++ b/web/src/flows/stages/email/EmailStage.ts @@ -1,6 +1,6 @@ import { gettext } from "django"; import { CSSResult, customElement, html, property, TemplateResult } from "lit-element"; -import { Challenge } from "../../../api"; +import { Challenge } from "authentik-api"; import { COMMON_STYLES } from "../../../common/styles"; import { BaseStage } from "../base"; import "../../../elements/utils/LoadingState"; diff --git a/web/src/pages/LibraryPage.ts b/web/src/pages/LibraryPage.ts index b94caae24..763ac0e7d 100644 --- a/web/src/pages/LibraryPage.ts +++ b/web/src/pages/LibraryPage.ts @@ -2,7 +2,7 @@ import { gettext } from "django"; import { css, CSSResult, customElement, html, LitElement, property, TemplateResult } from "lit-element"; import { ifDefined } from "lit-html/directives/if-defined"; import { until } from "lit-html/directives/until"; -import { Application, CoreApi } from "../api"; +import { Application, CoreApi } from "authentik-api"; import { AKResponse } from "../api/Client"; import { DEFAULT_CONFIG } from "../api/Config"; import { me } from "../api/Users"; diff --git a/web/src/pages/admin-overview/TopApplicationsTable.ts b/web/src/pages/admin-overview/TopApplicationsTable.ts index a343d80f4..095bf918b 100644 --- a/web/src/pages/admin-overview/TopApplicationsTable.ts +++ b/web/src/pages/admin-overview/TopApplicationsTable.ts @@ -1,7 +1,7 @@ import { gettext } from "django"; import { CSSResult, customElement, html, LitElement, property, TemplateResult } from "lit-element"; import { COMMON_STYLES } from "../../common/styles"; -import { EventsApi, EventTopPerUser } from "../../api"; +import { EventsApi, EventTopPerUser } from "authentik-api"; import "../../elements/Spinner"; import { DEFAULT_CONFIG } from "../../api/Config"; diff --git a/web/src/pages/admin-overview/cards/FlowCacheStatusCard.ts b/web/src/pages/admin-overview/cards/FlowCacheStatusCard.ts index e61904e5b..d4fa394c5 100644 --- a/web/src/pages/admin-overview/cards/FlowCacheStatusCard.ts +++ b/web/src/pages/admin-overview/cards/FlowCacheStatusCard.ts @@ -2,7 +2,7 @@ import { gettext } from "django"; import { customElement, html, TemplateResult } from "lit-element"; import { AdminStatus, AdminStatusCard } from "./AdminStatusCard"; import "../../../elements/buttons/ModalButton"; -import { FlowsApi } from "../../../api"; +import { FlowsApi } from "authentik-api"; import { DEFAULT_CONFIG } from "../../../api/Config"; @customElement("ak-admin-status-card-flow-cache") diff --git a/web/src/pages/admin-overview/cards/PolicyCacheStatusCard.ts b/web/src/pages/admin-overview/cards/PolicyCacheStatusCard.ts index b2b3a657e..13fba5bd1 100644 --- a/web/src/pages/admin-overview/cards/PolicyCacheStatusCard.ts +++ b/web/src/pages/admin-overview/cards/PolicyCacheStatusCard.ts @@ -3,7 +3,7 @@ import { customElement } from "lit-element"; import { TemplateResult, html } from "lit-html"; import { AdminStatusCard, AdminStatus } from "./AdminStatusCard"; import "../../../elements/buttons/ModalButton"; -import { PoliciesApi } from "../../../api"; +import { PoliciesApi } from "authentik-api"; import { DEFAULT_CONFIG } from "../../../api/Config"; @customElement("ak-admin-status-card-policy-cache") diff --git a/web/src/pages/admin-overview/cards/PolicyUnboundStatusCard.ts b/web/src/pages/admin-overview/cards/PolicyUnboundStatusCard.ts index 3211d09f5..c84a55eec 100644 --- a/web/src/pages/admin-overview/cards/PolicyUnboundStatusCard.ts +++ b/web/src/pages/admin-overview/cards/PolicyUnboundStatusCard.ts @@ -1,6 +1,6 @@ import { gettext } from "django"; import { customElement } from "lit-element"; -import { PoliciesApi } from "../../../api"; +import { PoliciesApi } from "authentik-api"; import { DEFAULT_CONFIG } from "../../../api/Config"; import { AdminStatusCard, AdminStatus } from "./AdminStatusCard"; diff --git a/web/src/pages/admin-overview/cards/ProviderStatusCard.ts b/web/src/pages/admin-overview/cards/ProviderStatusCard.ts index 277614661..f8832479a 100644 --- a/web/src/pages/admin-overview/cards/ProviderStatusCard.ts +++ b/web/src/pages/admin-overview/cards/ProviderStatusCard.ts @@ -1,6 +1,6 @@ import { gettext } from "django"; import { customElement } from "lit-element"; -import { ProvidersApi } from "../../../api"; +import { ProvidersApi } from "authentik-api"; import { DEFAULT_CONFIG } from "../../../api/Config"; import { AdminStatusCard, AdminStatus } from "./AdminStatusCard"; diff --git a/web/src/pages/admin-overview/cards/UserCountStatusCard.ts b/web/src/pages/admin-overview/cards/UserCountStatusCard.ts index 2b0d90aad..2455d6570 100644 --- a/web/src/pages/admin-overview/cards/UserCountStatusCard.ts +++ b/web/src/pages/admin-overview/cards/UserCountStatusCard.ts @@ -1,5 +1,5 @@ import { customElement } from "lit-element"; -import { CoreApi } from "../../../api"; +import { CoreApi } from "authentik-api"; import { DEFAULT_CONFIG } from "../../../api/Config"; import { AdminStatusCard, AdminStatus } from "./AdminStatusCard"; diff --git a/web/src/pages/admin-overview/cards/VersionStatusCard.ts b/web/src/pages/admin-overview/cards/VersionStatusCard.ts index 083008a41..d17f9f21e 100644 --- a/web/src/pages/admin-overview/cards/VersionStatusCard.ts +++ b/web/src/pages/admin-overview/cards/VersionStatusCard.ts @@ -1,6 +1,6 @@ import { gettext } from "django"; import { customElement, html, TemplateResult } from "lit-element"; -import { AdminApi, Version } from "../../../api"; +import { AdminApi, Version } from "authentik-api"; import { DEFAULT_CONFIG } from "../../../api/Config"; import { AdminStatusCard, AdminStatus } from "./AdminStatusCard"; diff --git a/web/src/pages/admin-overview/cards/WorkerStatusCard.ts b/web/src/pages/admin-overview/cards/WorkerStatusCard.ts index 0f085184f..4044ef03a 100644 --- a/web/src/pages/admin-overview/cards/WorkerStatusCard.ts +++ b/web/src/pages/admin-overview/cards/WorkerStatusCard.ts @@ -1,6 +1,6 @@ import { gettext } from "django"; import { customElement } from "lit-element"; -import { AdminApi } from "../../../api"; +import { AdminApi } from "authentik-api"; import { DEFAULT_CONFIG } from "../../../api/Config"; import { AdminStatus, AdminStatusCard } from "./AdminStatusCard"; diff --git a/web/src/pages/applications/ApplicationListPage.ts b/web/src/pages/applications/ApplicationListPage.ts index 73f0c1c5c..0bb831737 100644 --- a/web/src/pages/applications/ApplicationListPage.ts +++ b/web/src/pages/applications/ApplicationListPage.ts @@ -7,7 +7,7 @@ import "../../elements/buttons/ModalButton"; import "../../elements/buttons/SpinnerButton"; import { TableColumn } from "../../elements/table/Table"; import { PAGE_SIZE } from "../../constants"; -import { Application, CoreApi } from "../../api"; +import { Application, CoreApi } from "authentik-api"; import { DEFAULT_CONFIG } from "../../api/Config"; import { AdminURLManager } from "../../api/legacy"; diff --git a/web/src/pages/applications/ApplicationViewPage.ts b/web/src/pages/applications/ApplicationViewPage.ts index 467432595..600770bb2 100644 --- a/web/src/pages/applications/ApplicationViewPage.ts +++ b/web/src/pages/applications/ApplicationViewPage.ts @@ -8,7 +8,7 @@ import "../../elements/buttons/ModalButton"; import "../../elements/buttons/SpinnerButton"; import "../../elements/policies/BoundPoliciesList"; import "../../elements/utils/LoadingState"; -import { Application, CoreApi } from "../../api"; +import { Application, CoreApi } from "authentik-api"; import { DEFAULT_CONFIG } from "../../api/Config"; @customElement("ak-application-view") diff --git a/web/src/pages/crypto/CertificateKeyPairListPage.ts b/web/src/pages/crypto/CertificateKeyPairListPage.ts index 78a0a68b8..2fcd6364d 100644 --- a/web/src/pages/crypto/CertificateKeyPairListPage.ts +++ b/web/src/pages/crypto/CertificateKeyPairListPage.ts @@ -3,7 +3,7 @@ import { customElement, html, property, TemplateResult } from "lit-element"; import { AKResponse } from "../../api/Client"; import { TablePage } from "../../elements/table/TablePage"; -import { CryptoApi, CertificateKeyPair } from "../../api"; +import { CryptoApi, CertificateKeyPair } from "authentik-api"; import "../../elements/buttons/ModalButton"; import "../../elements/buttons/SpinnerButton"; diff --git a/web/src/pages/events/EventInfo.ts b/web/src/pages/events/EventInfo.ts index ae0509b4e..c5ab46e7d 100644 --- a/web/src/pages/events/EventInfo.ts +++ b/web/src/pages/events/EventInfo.ts @@ -1,7 +1,7 @@ import { gettext } from "django"; import { css, CSSResult, customElement, html, LitElement, property, TemplateResult } from "lit-element"; import { until } from "lit-html/directives/until"; -import { FlowsApi } from "../../api"; +import { FlowsApi } from "authentik-api"; import { COMMON_STYLES } from "../../common/styles"; import "../../elements/Spinner"; import "../../elements/Expand"; diff --git a/web/src/pages/events/EventInfoPage.ts b/web/src/pages/events/EventInfoPage.ts index cd83a8622..1c8ced381 100644 --- a/web/src/pages/events/EventInfoPage.ts +++ b/web/src/pages/events/EventInfoPage.ts @@ -1,6 +1,6 @@ import { gettext } from "django"; import { css, CSSResult, customElement, html, LitElement, property, TemplateResult } from "lit-element"; -import { EventsApi } from "../../api"; +import { EventsApi } from "authentik-api"; import { DEFAULT_CONFIG } from "../../api/Config"; import { EventWithContext } from "../../api/Events"; import { COMMON_STYLES } from "../../common/styles"; diff --git a/web/src/pages/events/EventListPage.ts b/web/src/pages/events/EventListPage.ts index 7a0449590..fd6d9aa24 100644 --- a/web/src/pages/events/EventListPage.ts +++ b/web/src/pages/events/EventListPage.ts @@ -1,6 +1,6 @@ import { gettext } from "django"; import { customElement, html, property, TemplateResult } from "lit-element"; -import { Event, EventsApi } from "../../api"; +import { Event, EventsApi } from "authentik-api"; import { AKResponse } from "../../api/Client"; import { DEFAULT_CONFIG } from "../../api/Config"; import { EventWithContext } from "../../api/Events"; diff --git a/web/src/pages/events/RuleListPage.ts b/web/src/pages/events/RuleListPage.ts index 3160c4bd3..decb6b545 100644 --- a/web/src/pages/events/RuleListPage.ts +++ b/web/src/pages/events/RuleListPage.ts @@ -8,7 +8,7 @@ import "../../elements/buttons/ModalButton"; import "../../elements/buttons/SpinnerButton"; import { TableColumn } from "../../elements/table/Table"; import { PAGE_SIZE } from "../../constants"; -import { EventsApi, NotificationRule } from "../../api"; +import { EventsApi, NotificationRule } from "authentik-api"; import { DEFAULT_CONFIG } from "../../api/Config"; import { AdminURLManager } from "../../api/legacy"; diff --git a/web/src/pages/events/TransportListPage.ts b/web/src/pages/events/TransportListPage.ts index a51d46c4f..7c8c95245 100644 --- a/web/src/pages/events/TransportListPage.ts +++ b/web/src/pages/events/TransportListPage.ts @@ -8,7 +8,7 @@ import "../../elements/buttons/ModalButton"; import "../../elements/buttons/SpinnerButton"; import { TableColumn } from "../../elements/table/Table"; import { PAGE_SIZE } from "../../constants"; -import { EventsApi, NotificationTransport } from "../../api"; +import { EventsApi, NotificationTransport } from "authentik-api"; import { DEFAULT_CONFIG } from "../../api/Config"; import { AdminURLManager } from "../../api/legacy"; diff --git a/web/src/pages/flows/BoundStagesList.ts b/web/src/pages/flows/BoundStagesList.ts index 8aed13881..c1fa88415 100644 --- a/web/src/pages/flows/BoundStagesList.ts +++ b/web/src/pages/flows/BoundStagesList.ts @@ -10,7 +10,7 @@ import "../../elements/buttons/Dropdown"; import "../../elements/policies/BoundPoliciesList"; import { until } from "lit-html/directives/until"; import { PAGE_SIZE } from "../../constants"; -import { FlowsApi, FlowStageBinding, StagesApi } from "../../api"; +import { FlowsApi, FlowStageBinding, StagesApi } from "authentik-api"; import { DEFAULT_CONFIG } from "../../api/Config"; import { AdminURLManager } from "../../api/legacy"; diff --git a/web/src/pages/flows/FlowDiagram.ts b/web/src/pages/flows/FlowDiagram.ts index cf93fc729..8556b74a5 100644 --- a/web/src/pages/flows/FlowDiagram.ts +++ b/web/src/pages/flows/FlowDiagram.ts @@ -1,7 +1,7 @@ import { customElement, html, LitElement, property, TemplateResult } from "lit-element"; import FlowChart from "flowchart.js"; import { loading } from "../../utils"; -import { FlowsApi } from "../../api"; +import { FlowsApi } from "authentik-api"; import { DEFAULT_CONFIG } from "../../api/Config"; export const FONT_COLOUR_DARK_MODE = "#fafafa"; diff --git a/web/src/pages/flows/FlowListPage.ts b/web/src/pages/flows/FlowListPage.ts index 58999f20d..66b37bad4 100644 --- a/web/src/pages/flows/FlowListPage.ts +++ b/web/src/pages/flows/FlowListPage.ts @@ -7,7 +7,7 @@ import "../../elements/buttons/ModalButton"; import "../../elements/buttons/SpinnerButton"; import { TableColumn } from "../../elements/table/Table"; import { PAGE_SIZE } from "../../constants"; -import { Flow, FlowsApi } from "../../api"; +import { Flow, FlowsApi } from "authentik-api"; import { DEFAULT_CONFIG } from "../../api/Config"; import { AdminURLManager } from "../../api/legacy"; diff --git a/web/src/pages/flows/FlowViewPage.ts b/web/src/pages/flows/FlowViewPage.ts index 01f550e4e..e38e20283 100644 --- a/web/src/pages/flows/FlowViewPage.ts +++ b/web/src/pages/flows/FlowViewPage.ts @@ -8,7 +8,7 @@ import "../../elements/buttons/SpinnerButton"; import "../../elements/policies/BoundPoliciesList"; import "./BoundStagesList"; import "./FlowDiagram"; -import { Flow, FlowsApi } from "../../api"; +import { Flow, FlowsApi } from "authentik-api"; import { DEFAULT_CONFIG } from "../../api/Config"; @customElement("ak-flow-view") diff --git a/web/src/pages/groups/GroupListPage.ts b/web/src/pages/groups/GroupListPage.ts index 82dfceb5e..9d896b468 100644 --- a/web/src/pages/groups/GroupListPage.ts +++ b/web/src/pages/groups/GroupListPage.ts @@ -7,7 +7,7 @@ import "../../elements/buttons/ModalButton"; import "../../elements/buttons/SpinnerButton"; import { TableColumn } from "../../elements/table/Table"; import { PAGE_SIZE } from "../../constants"; -import { CoreApi, Group } from "../../api"; +import { CoreApi, Group } from "authentik-api"; import { DEFAULT_CONFIG } from "../../api/Config"; import { AdminURLManager } from "../../api/legacy"; diff --git a/web/src/pages/outposts/OutpostHealth.ts b/web/src/pages/outposts/OutpostHealth.ts index 6746d05a2..b19d004e1 100644 --- a/web/src/pages/outposts/OutpostHealth.ts +++ b/web/src/pages/outposts/OutpostHealth.ts @@ -1,7 +1,7 @@ import { gettext } from "django"; import { CSSResult, customElement, html, LitElement, property, TemplateResult } from "lit-element"; import { until } from "lit-html/directives/until"; -import { OutpostsApi } from "../../api"; +import { OutpostsApi } from "authentik-api"; import { DEFAULT_CONFIG } from "../../api/Config"; import { COMMON_STYLES } from "../../common/styles"; import "../../elements/Spinner"; diff --git a/web/src/pages/outposts/OutpostListPage.ts b/web/src/pages/outposts/OutpostListPage.ts index c9bbfea8b..637a5be19 100644 --- a/web/src/pages/outposts/OutpostListPage.ts +++ b/web/src/pages/outposts/OutpostListPage.ts @@ -10,7 +10,7 @@ import "../../elements/buttons/SpinnerButton"; import "../../elements/buttons/ModalButton"; import "../../elements/buttons/TokenCopyButton"; import { PAGE_SIZE } from "../../constants"; -import { Outpost, OutpostsApi } from "../../api"; +import { Outpost, OutpostsApi } from "authentik-api"; import { DEFAULT_CONFIG } from "../../api/Config"; import { AdminURLManager } from "../../api/legacy"; import { ifDefined } from "lit-html/directives/if-defined"; diff --git a/web/src/pages/outposts/OutpostServiceConnectionListPage.ts b/web/src/pages/outposts/OutpostServiceConnectionListPage.ts index a904f4b34..fed9d9698 100644 --- a/web/src/pages/outposts/OutpostServiceConnectionListPage.ts +++ b/web/src/pages/outposts/OutpostServiceConnectionListPage.ts @@ -11,7 +11,7 @@ import "../../elements/buttons/ModalButton"; import "../../elements/buttons/Dropdown"; import { until } from "lit-html/directives/until"; import { PAGE_SIZE } from "../../constants"; -import { OutpostsApi, ServiceConnection } from "../../api"; +import { OutpostsApi, ServiceConnection } from "authentik-api"; import { DEFAULT_CONFIG } from "../../api/Config"; import { AdminURLManager } from "../../api/legacy"; diff --git a/web/src/pages/policies/PolicyListPage.ts b/web/src/pages/policies/PolicyListPage.ts index 20481c427..270425fdb 100644 --- a/web/src/pages/policies/PolicyListPage.ts +++ b/web/src/pages/policies/PolicyListPage.ts @@ -9,7 +9,7 @@ import "../../elements/buttons/SpinnerButton"; import { TableColumn } from "../../elements/table/Table"; import { until } from "lit-html/directives/until"; import { PAGE_SIZE } from "../../constants"; -import { PoliciesApi, Policy } from "../../api"; +import { PoliciesApi, Policy } from "authentik-api"; import { DEFAULT_CONFIG } from "../../api/Config"; import { AdminURLManager } from "../../api/legacy"; diff --git a/web/src/pages/property-mappings/PropertyMappingListPage.ts b/web/src/pages/property-mappings/PropertyMappingListPage.ts index 88e191a3b..715f33598 100644 --- a/web/src/pages/property-mappings/PropertyMappingListPage.ts +++ b/web/src/pages/property-mappings/PropertyMappingListPage.ts @@ -9,7 +9,7 @@ import "../../elements/buttons/SpinnerButton"; import { TableColumn } from "../../elements/table/Table"; import { until } from "lit-html/directives/until"; import { PAGE_SIZE } from "../../constants"; -import { PropertyMapping, PropertymappingsApi } from "../../api"; +import { PropertyMapping, PropertymappingsApi } from "authentik-api"; import { DEFAULT_CONFIG } from "../../api/Config"; import { AdminURLManager } from "../../api/legacy"; diff --git a/web/src/pages/providers/OAuth2ProviderViewPage.ts b/web/src/pages/providers/OAuth2ProviderViewPage.ts index 611703aca..55f62e63d 100644 --- a/web/src/pages/providers/OAuth2ProviderViewPage.ts +++ b/web/src/pages/providers/OAuth2ProviderViewPage.ts @@ -9,7 +9,7 @@ import "../../elements/Tabs"; import { Page } from "../../elements/Page"; import { convertToTitle } from "../../utils"; import "./RelatedApplicationButton"; -import { OAuth2Provider, OAuth2ProviderSetupURLs, ProvidersApi } from "../../api"; +import { OAuth2Provider, OAuth2ProviderSetupURLs, ProvidersApi } from "authentik-api"; import { DEFAULT_CONFIG } from "../../api/Config"; import { AdminURLManager } from "../../api/legacy"; diff --git a/web/src/pages/providers/ProviderListPage.ts b/web/src/pages/providers/ProviderListPage.ts index 6c5effaab..7398488d7 100644 --- a/web/src/pages/providers/ProviderListPage.ts +++ b/web/src/pages/providers/ProviderListPage.ts @@ -9,7 +9,7 @@ import "../../elements/buttons/Dropdown"; import { TableColumn } from "../../elements/table/Table"; import { until } from "lit-html/directives/until"; import { PAGE_SIZE } from "../../constants"; -import { Provider, ProvidersApi } from "../../api"; +import { Provider, ProvidersApi } from "authentik-api"; import { DEFAULT_CONFIG } from "../../api/Config"; import { AdminURLManager } from "../../api/legacy"; diff --git a/web/src/pages/providers/ProviderViewPage.ts b/web/src/pages/providers/ProviderViewPage.ts index d6d5bc80d..9bca6d940 100644 --- a/web/src/pages/providers/ProviderViewPage.ts +++ b/web/src/pages/providers/ProviderViewPage.ts @@ -8,7 +8,7 @@ import "../../elements/utils/LoadingState"; import "./SAMLProviderViewPage"; import "./OAuth2ProviderViewPage"; import "./ProxyProviderViewPage"; -import { Provider, ProvidersApi } from "../../api"; +import { Provider, ProvidersApi } from "authentik-api"; import { DEFAULT_CONFIG } from "../../api/Config"; import { ifDefined } from "lit-html/directives/if-defined"; diff --git a/web/src/pages/providers/ProxyProviderViewPage.ts b/web/src/pages/providers/ProxyProviderViewPage.ts index a2727f94b..227bfd365 100644 --- a/web/src/pages/providers/ProxyProviderViewPage.ts +++ b/web/src/pages/providers/ProxyProviderViewPage.ts @@ -8,7 +8,7 @@ import "../../elements/CodeMirror"; import "../../elements/Tabs"; import { Page } from "../../elements/Page"; import "./RelatedApplicationButton"; -import { ProvidersApi, ProxyProvider } from "../../api"; +import { ProvidersApi, ProxyProvider } from "authentik-api"; import { DEFAULT_CONFIG } from "../../api/Config"; import { AdminURLManager } from "../../api/legacy"; diff --git a/web/src/pages/providers/RelatedApplicationButton.ts b/web/src/pages/providers/RelatedApplicationButton.ts index c2a1fa24c..77f1dd1d7 100644 --- a/web/src/pages/providers/RelatedApplicationButton.ts +++ b/web/src/pages/providers/RelatedApplicationButton.ts @@ -1,6 +1,6 @@ import { gettext } from "django"; import { customElement, html, LitElement, property, TemplateResult } from "lit-element"; -import { Provider } from "../../api"; +import { Provider } from "authentik-api"; import { AdminURLManager } from "../../api/legacy"; import "../../elements/buttons/ModalButton"; diff --git a/web/src/pages/providers/SAMLProviderViewPage.ts b/web/src/pages/providers/SAMLProviderViewPage.ts index 0abcfc32b..9dab7cf57 100644 --- a/web/src/pages/providers/SAMLProviderViewPage.ts +++ b/web/src/pages/providers/SAMLProviderViewPage.ts @@ -9,7 +9,7 @@ import "../../elements/CodeMirror"; import "../../elements/Tabs"; import { Page } from "../../elements/Page"; import "./RelatedApplicationButton"; -import { ProvidersApi, SAMLProvider } from "../../api"; +import { ProvidersApi, SAMLProvider } from "authentik-api"; import { DEFAULT_CONFIG } from "../../api/Config"; import { AdminURLManager, AppURLManager } from "../../api/legacy"; diff --git a/web/src/pages/sources/LDAPSourceViewPage.ts b/web/src/pages/sources/LDAPSourceViewPage.ts index b07a08514..858c167cf 100644 --- a/web/src/pages/sources/LDAPSourceViewPage.ts +++ b/web/src/pages/sources/LDAPSourceViewPage.ts @@ -9,7 +9,7 @@ import "../../elements/CodeMirror"; import "../../elements/Tabs"; import { Page } from "../../elements/Page"; import { until } from "lit-html/directives/until"; -import { LDAPSource, SourcesApi } from "../../api"; +import { LDAPSource, SourcesApi } from "authentik-api"; import { DEFAULT_CONFIG } from "../../api/Config"; import { AdminURLManager } from "../../api/legacy"; diff --git a/web/src/pages/sources/OAuthSourceViewPage.ts b/web/src/pages/sources/OAuthSourceViewPage.ts index 5cf883f86..3135ba9ff 100644 --- a/web/src/pages/sources/OAuthSourceViewPage.ts +++ b/web/src/pages/sources/OAuthSourceViewPage.ts @@ -7,7 +7,7 @@ import "../../elements/buttons/SpinnerButton"; import "../../elements/CodeMirror"; import "../../elements/Tabs"; import { Page } from "../../elements/Page"; -import { OAuthSource, SourcesApi } from "../../api"; +import { OAuthSource, SourcesApi } from "authentik-api"; import { DEFAULT_CONFIG } from "../../api/Config"; import { AdminURLManager } from "../../api/legacy"; diff --git a/web/src/pages/sources/SAMLSourceViewPage.ts b/web/src/pages/sources/SAMLSourceViewPage.ts index 2afd0ec73..8cbbc8e8b 100644 --- a/web/src/pages/sources/SAMLSourceViewPage.ts +++ b/web/src/pages/sources/SAMLSourceViewPage.ts @@ -8,7 +8,7 @@ import "../../elements/buttons/SpinnerButton"; import "../../elements/CodeMirror"; import "../../elements/Tabs"; import { Page } from "../../elements/Page"; -import { SAMLSource, SourcesApi } from "../../api"; +import { SAMLSource, SourcesApi } from "authentik-api"; import { DEFAULT_CONFIG } from "../../api/Config"; import { AdminURLManager, AppURLManager } from "../../api/legacy"; diff --git a/web/src/pages/sources/SourceViewPage.ts b/web/src/pages/sources/SourceViewPage.ts index ebafc074c..b30eb8111 100644 --- a/web/src/pages/sources/SourceViewPage.ts +++ b/web/src/pages/sources/SourceViewPage.ts @@ -1,5 +1,5 @@ import { css, CSSResult, customElement, html, LitElement, property, TemplateResult } from "lit-element"; -import { Source, SourcesApi } from "../../api"; +import { Source, SourcesApi } from "authentik-api"; import { DEFAULT_CONFIG } from "../../api/Config"; import { COMMON_STYLES } from "../../common/styles"; diff --git a/web/src/pages/sources/SourcesListPage.ts b/web/src/pages/sources/SourcesListPage.ts index 27f3dd2e4..89c462836 100644 --- a/web/src/pages/sources/SourcesListPage.ts +++ b/web/src/pages/sources/SourcesListPage.ts @@ -9,7 +9,7 @@ import "../../elements/buttons/SpinnerButton"; import "../../elements/buttons/Dropdown"; import { until } from "lit-html/directives/until"; import { PAGE_SIZE } from "../../constants"; -import { Source, SourcesApi } from "../../api"; +import { Source, SourcesApi } from "authentik-api"; import { DEFAULT_CONFIG } from "../../api/Config"; import { AdminURLManager } from "../../api/legacy"; diff --git a/web/src/pages/stages/InvitationListPage.ts b/web/src/pages/stages/InvitationListPage.ts index 4fba9f84f..94c5ab0d1 100644 --- a/web/src/pages/stages/InvitationListPage.ts +++ b/web/src/pages/stages/InvitationListPage.ts @@ -7,7 +7,7 @@ import "../../elements/buttons/ModalButton"; import "../../elements/buttons/SpinnerButton"; import { TableColumn } from "../../elements/table/Table"; import { PAGE_SIZE } from "../../constants"; -import { Invitation, StagesApi } from "../../api"; +import { Invitation, StagesApi } from "authentik-api"; import { DEFAULT_CONFIG } from "../../api/Config"; import { AdminURLManager } from "../../api/legacy"; diff --git a/web/src/pages/stages/PromptListPage.ts b/web/src/pages/stages/PromptListPage.ts index e83a7c401..e4319563e 100644 --- a/web/src/pages/stages/PromptListPage.ts +++ b/web/src/pages/stages/PromptListPage.ts @@ -7,7 +7,7 @@ import "../../elements/buttons/ModalButton"; import "../../elements/buttons/SpinnerButton"; import { TableColumn } from "../../elements/table/Table"; import { PAGE_SIZE } from "../../constants"; -import { Prompt, StagesApi } from "../../api"; +import { Prompt, StagesApi } from "authentik-api"; import { DEFAULT_CONFIG } from "../../api/Config"; import { AdminURLManager } from "../../api/legacy"; diff --git a/web/src/pages/stages/StageListPage.ts b/web/src/pages/stages/StageListPage.ts index 06f82eb78..eff238e49 100644 --- a/web/src/pages/stages/StageListPage.ts +++ b/web/src/pages/stages/StageListPage.ts @@ -9,7 +9,7 @@ import "../../elements/buttons/SpinnerButton"; import "../../elements/buttons/Dropdown"; import { until } from "lit-html/directives/until"; import { PAGE_SIZE } from "../../constants"; -import { Stage, StagesApi } from "../../api"; +import { Stage, StagesApi } from "authentik-api"; import { DEFAULT_CONFIG } from "../../api/Config"; import { AdminURLManager } from "../../api/legacy"; diff --git a/web/src/pages/system-tasks/SystemTaskListPage.ts b/web/src/pages/system-tasks/SystemTaskListPage.ts index b6bda5c61..697b3220a 100644 --- a/web/src/pages/system-tasks/SystemTaskListPage.ts +++ b/web/src/pages/system-tasks/SystemTaskListPage.ts @@ -7,7 +7,7 @@ import "../../elements/buttons/ModalButton"; import "../../elements/buttons/SpinnerButton"; import "../../elements/buttons/ActionButton"; import { TableColumn } from "../../elements/table/Table"; -import { AdminApi, Task, TaskStatusEnum } from "../../api"; +import { AdminApi, Task, TaskStatusEnum } from "authentik-api"; import { DEFAULT_CONFIG } from "../../api/Config"; @customElement("ak-system-task-list") diff --git a/web/src/pages/tokens/TokenListPage.ts b/web/src/pages/tokens/TokenListPage.ts index 573b385fe..13f7167eb 100644 --- a/web/src/pages/tokens/TokenListPage.ts +++ b/web/src/pages/tokens/TokenListPage.ts @@ -8,7 +8,7 @@ import "../../elements/buttons/Dropdown"; import "../../elements/buttons/TokenCopyButton"; import { TableColumn } from "../../elements/table/Table"; import { PAGE_SIZE } from "../../constants"; -import { CoreApi, Token } from "../../api"; +import { CoreApi, Token } from "authentik-api"; import { DEFAULT_CONFIG } from "../../api/Config"; import { AdminURLManager } from "../../api/legacy"; diff --git a/web/src/pages/tokens/UserTokenList.ts b/web/src/pages/tokens/UserTokenList.ts index 86a1a62fb..ce8ff8ccb 100644 --- a/web/src/pages/tokens/UserTokenList.ts +++ b/web/src/pages/tokens/UserTokenList.ts @@ -7,7 +7,7 @@ import "../../elements/buttons/Dropdown"; import "../../elements/buttons/TokenCopyButton"; import { Table, TableColumn } from "../../elements/table/Table"; import { PAGE_SIZE } from "../../constants"; -import { CoreApi, Token } from "../../api"; +import { CoreApi, Token } from "authentik-api"; import { DEFAULT_CONFIG } from "../../api/Config"; import { AdminURLManager } from "../../api/legacy"; diff --git a/web/src/pages/users/UserListPage.ts b/web/src/pages/users/UserListPage.ts index ab32aca24..67b3c7e98 100644 --- a/web/src/pages/users/UserListPage.ts +++ b/web/src/pages/users/UserListPage.ts @@ -8,7 +8,7 @@ import "../../elements/buttons/Dropdown"; import "../../elements/buttons/ActionButton"; import { TableColumn } from "../../elements/table/Table"; import { PAGE_SIZE } from "../../constants"; -import { CoreApi, User } from "../../api"; +import { CoreApi, User } from "authentik-api"; import { DEFAULT_CONFIG } from "../../api/Config"; import { AdminURLManager } from "../../api/legacy";