habsi/authentik
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

providers: add provider/ prefix for property mappings API (#10874)

Browse Source
This commit is contained in:
Marc 'risson' Schmitt
2024-08-12 15:13:08 +02:00
committed by GitHub
parent dab41fe0b9
commit a7203be850
45 changed files with 284 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
web/src/admin/property-mappings/PropertyMappingListPage.ts
View File

@ -1,16 +1,16 @@
import "@goauthentik/admin/property-mappings/PropertyMappingGoogleWorkspaceForm";
import "@goauthentik/admin/property-mappings/PropertyMappingLDAPSourceForm";
import "@goauthentik/admin/property-mappings/PropertyMappingMicrosoftEntraForm";
import "@goauthentik/admin/property-mappings/PropertyMappingNotification";
import "@goauthentik/admin/property-mappings/PropertyMappingOAuthSourceForm";
import "@goauthentik/admin/property-mappings/PropertyMappingPlexSourceForm";
import "@goauthentik/admin/property-mappings/PropertyMappingRACForm";
import "@goauthentik/admin/property-mappings/PropertyMappingRadiusForm";
import "@goauthentik/admin/property-mappings/PropertyMappingSAMLForm";
import "@goauthentik/admin/property-mappings/PropertyMappingSAMLSourceForm";
import "@goauthentik/admin/property-mappings/PropertyMappingSCIMForm";
import "@goauthentik/admin/property-mappings/PropertyMappingSCIMSourceForm";
import "@goauthentik/admin/property-mappings/PropertyMappingScopeForm";
import "@goauthentik/admin/property-mappings/PropertyMappingProviderGoogleWorkspaceForm";
import "@goauthentik/admin/property-mappings/PropertyMappingProviderMicrosoftEntraForm";
import "@goauthentik/admin/property-mappings/PropertyMappingProviderRACForm";
import "@goauthentik/admin/property-mappings/PropertyMappingProviderRadiusForm";
import "@goauthentik/admin/property-mappings/PropertyMappingProviderSAMLForm";
import "@goauthentik/admin/property-mappings/PropertyMappingProviderSCIMForm";
import "@goauthentik/admin/property-mappings/PropertyMappingProviderScopeForm";
import "@goauthentik/admin/property-mappings/PropertyMappingSourceLDAPForm";
import "@goauthentik/admin/property-mappings/PropertyMappingSourceOAuthForm";
import "@goauthentik/admin/property-mappings/PropertyMappingSourcePlexForm";
import "@goauthentik/admin/property-mappings/PropertyMappingSourceSAMLForm";
import "@goauthentik/admin/property-mappings/PropertyMappingSourceSCIMForm";
import "@goauthentik/admin/property-mappings/PropertyMappingTestForm";
import "@goauthentik/admin/property-mappings/PropertyMappingWizard";
import "@goauthentik/admin/rbac/ObjectPermissionModal";

6
web/src/admin/property-mappings/PropertyMappingGoogleWorkspaceForm.ts → web/src/admin/property-mappings/PropertyMappingProviderGoogleWorkspaceForm.ts
View File

@ -7,8 +7,8 @@ import { customElement } from "lit/decorators.js";
import { GoogleWorkspaceProviderMapping, PropertymappingsApi } from "@goauthentik/api";
@customElement("ak-property-mapping-google-workspace-form")
export class PropertyMappingGoogleWorkspaceForm extends BasePropertyMappingForm<GoogleWorkspaceProviderMapping> {
@customElement("ak-property-mapping-provider-google-workspace-form")
export class PropertyMappingProviderGoogleWorkspaceForm extends BasePropertyMappingForm<GoogleWorkspaceProviderMapping> {
loadInstance(pk: string): Promise<GoogleWorkspaceProviderMapping> {
return new PropertymappingsApi(
DEFAULT_CONFIG,
@ -37,6 +37,6 @@ export class PropertyMappingGoogleWorkspaceForm extends BasePropertyMappingForm<
declare global {
interface HTMLElementTagNameMap {
"ak-property-mapping-google-workspace-form": PropertyMappingGoogleWorkspaceForm;
"ak-property-mapping-provider-google-workspace-form": PropertyMappingProviderGoogleWorkspaceForm;
}
}

6
web/src/admin/property-mappings/PropertyMappingMicrosoftEntraForm.ts → web/src/admin/property-mappings/PropertyMappingProviderMicrosoftEntraForm.ts
View File

@ -7,8 +7,8 @@ import { customElement } from "lit/decorators.js";
import { MicrosoftEntraProviderMapping, PropertymappingsApi } from "@goauthentik/api";
@customElement("ak-property-mapping-microsoft-entra-form")
export class PropertyMappingMicrosoftEntraForm extends BasePropertyMappingForm<MicrosoftEntraProviderMapping> {
@customElement("ak-property-mapping-provider-microsoft-entra-form")
export class PropertyMappingProviderMicrosoftEntraForm extends BasePropertyMappingForm<MicrosoftEntraProviderMapping> {
loadInstance(pk: string): Promise<MicrosoftEntraProviderMapping> {
return new PropertymappingsApi(
DEFAULT_CONFIG,
@ -37,6 +37,6 @@ export class PropertyMappingMicrosoftEntraForm extends BasePropertyMappingForm<M
declare global {
interface HTMLElementTagNameMap {
"ak-property-mapping-microsoft-entra-form": PropertyMappingMicrosoftEntraForm;
"ak-property-mapping-provider-microsoft-entra-form": PropertyMappingProviderMicrosoftEntraForm;
}
}

12
web/src/admin/property-mappings/PropertyMappingRACForm.ts → web/src/admin/property-mappings/PropertyMappingProviderRACForm.ts
View File

@ -32,10 +32,10 @@ export const staticSettingOptions: RadioOption<string | undefined>[] = [
},
];
@customElement("ak-property-mapping-rac-form")
export class PropertyMappingRACForm extends ModelForm<RACPropertyMapping, string> {
@customElement("ak-property-mapping-provider-rac-form")
export class PropertyMappingProviderRACForm extends ModelForm<RACPropertyMapping, string> {
loadInstance(pk: string): Promise<RACPropertyMapping> {
return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsRacRetrieve({
return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderRacRetrieve({
pmUuid: pk,
});
}
@ -50,12 +50,12 @@ export class PropertyMappingRACForm extends ModelForm<RACPropertyMapping, string
async send(data: RACPropertyMapping): Promise<RACPropertyMapping> {
if (this.instance) {
return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsRacUpdate({
return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderRacUpdate({
pmUuid: this.instance.pk,
rACPropertyMappingRequest: data,
});
} else {
return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsRacCreate({
return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderRacCreate({
rACPropertyMappingRequest: data,
});
}
@ -177,6 +177,6 @@ export class PropertyMappingRACForm extends ModelForm<RACPropertyMapping, string
declare global {
interface HTMLElementTagNameMap {
"ak-property-mapping-rac-form": PropertyMappingRACForm;
"ak-property-mapping-provider-rac-form": PropertyMappingProviderRACForm;
}
}

12
web/src/admin/property-mappings/PropertyMappingRadiusForm.ts → web/src/admin/property-mappings/PropertyMappingProviderRadiusForm.ts
View File

@ -7,22 +7,22 @@ import { customElement } from "lit/decorators.js";
import { PropertymappingsApi, RadiusProviderPropertyMapping } from "@goauthentik/api";
@customElement("ak-property-mapping-radius-form")
export class PropertyMappingRadiusForm extends BasePropertyMappingForm<RadiusProviderPropertyMapping> {
@customElement("ak-property-mapping-provider-radius-form")
export class PropertyMappingProviderRadiusForm extends BasePropertyMappingForm<RadiusProviderPropertyMapping> {
loadInstance(pk: string): Promise<RadiusProviderPropertyMapping> {
return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsRadiusRetrieve({
return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderRadiusRetrieve({
pmUuid: pk,
});
}
async send(data: RadiusProviderPropertyMapping): Promise<RadiusProviderPropertyMapping> {
if (this.instance) {
return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsRadiusUpdate({
return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderRadiusUpdate({
pmUuid: this.instance.pk,
radiusProviderPropertyMappingRequest: data,
});
} else {
return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsRadiusCreate({
return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderRadiusCreate({
radiusProviderPropertyMappingRequest: data,
});
}
@ -31,6 +31,6 @@ export class PropertyMappingRadiusForm extends BasePropertyMappingForm<RadiusPro
declare global {
interface HTMLElementTagNameMap {
"ak-property-mapping-radius-form": PropertyMappingRadiusForm;
"ak-property-mapping-provider-radius-form": PropertyMappingProviderRadiusForm;
}
}

12
web/src/admin/property-mappings/PropertyMappingSAMLForm.ts → web/src/admin/property-mappings/PropertyMappingProviderSAMLForm.ts
View File

@ -10,22 +10,22 @@ import { ifDefined } from "lit/directives/if-defined.js";
import { PropertymappingsApi, SAMLPropertyMapping } from "@goauthentik/api";
@customElement("ak-property-mapping-saml-form")
export class PropertyMappingSAMLForm extends BasePropertyMappingForm<SAMLPropertyMapping> {
@customElement("ak-property-mapping-provider-saml-form")
export class PropertyMappingProviderSAMLForm extends BasePropertyMappingForm<SAMLPropertyMapping> {
loadInstance(pk: string): Promise<SAMLPropertyMapping> {
return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsSamlRetrieve({
return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderSamlRetrieve({
pmUuid: pk,
});
}
async send(data: SAMLPropertyMapping): Promise<SAMLPropertyMapping> {
if (this.instance) {
return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsSamlUpdate({
return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderSamlUpdate({
pmUuid: this.instance.pk,
sAMLPropertyMappingRequest: data,
});
} else {
return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsSamlCreate({
return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderSamlCreate({
sAMLPropertyMappingRequest: data,
});
}
@ -64,6 +64,6 @@ export class PropertyMappingSAMLForm extends BasePropertyMappingForm<SAMLPropert
declare global {
interface HTMLElementTagNameMap {
"ak-property-mapping-saml-form": PropertyMappingSAMLForm;
"ak-property-mapping-provider-saml-form": PropertyMappingProviderSAMLForm;
}
}

12
web/src/admin/property-mappings/PropertyMappingSCIMForm.ts → web/src/admin/property-mappings/PropertyMappingProviderSCIMForm.ts
View File

@ -7,22 +7,22 @@ import { customElement } from "lit/decorators.js";
import { PropertymappingsApi, SCIMMapping } from "@goauthentik/api";
@customElement("ak-property-mapping-scim-form")
export class PropertyMappingSCIMForm extends BasePropertyMappingForm<SCIMMapping> {
@customElement("ak-property-mapping-provider-scim-form")
export class PropertyMappingProviderSCIMForm extends BasePropertyMappingForm<SCIMMapping> {
loadInstance(pk: string): Promise<SCIMMapping> {
return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsScimRetrieve({
return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderScimRetrieve({
pmUuid: pk,
});
}
async send(data: SCIMMapping): Promise<SCIMMapping> {
if (this.instance) {
return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsScimUpdate({
return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderScimUpdate({
pmUuid: this.instance.pk,
sCIMMappingRequest: data,
});
} else {
return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsScimCreate({
return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderScimCreate({
sCIMMappingRequest: data,
});
}
@ -31,6 +31,6 @@ export class PropertyMappingSCIMForm extends BasePropertyMappingForm<SCIMMapping
declare global {
interface HTMLElementTagNameMap {
"ak-property-mapping-scim-form": PropertyMappingSCIMForm;
"ak-property-mapping-provider-scim-form": PropertyMappingProviderSCIMForm;
}
}

12
web/src/admin/property-mappings/PropertyMappingScopeForm.ts → web/src/admin/property-mappings/PropertyMappingProviderScopeForm.ts
View File

@ -10,22 +10,22 @@ import { ifDefined } from "lit/directives/if-defined.js";
import { PropertymappingsApi, ScopeMapping } from "@goauthentik/api";
@customElement("ak-property-mapping-scope-form")
export class PropertyMappingScopeForm extends BasePropertyMappingForm<ScopeMapping> {
@customElement("ak-property-mapping-provider-scope-form")
export class PropertyMappingProviderScopeForm extends BasePropertyMappingForm<ScopeMapping> {
loadInstance(pk: string): Promise<ScopeMapping> {
return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsScopeRetrieve({
return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderScopeRetrieve({
pmUuid: pk,
});
}
async send(data: ScopeMapping): Promise<ScopeMapping> {
if (this.instance) {
return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsScopeUpdate({
return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderScopeUpdate({
pmUuid: this.instance.pk,
scopeMappingRequest: data,
});
} else {
return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsScopeCreate({
return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderScopeCreate({
scopeMappingRequest: data,
});
}
@ -64,6 +64,6 @@ export class PropertyMappingScopeForm extends BasePropertyMappingForm<ScopeMappi
declare global {
interface HTMLElementTagNameMap {
"ak-property-mapping-scope-form": PropertyMappingScopeForm;
"ak-property-mapping-provider-scope-form": PropertyMappingProviderScopeForm;
}
}

6
web/src/admin/property-mappings/PropertyMappingLDAPSourceForm.ts → web/src/admin/property-mappings/PropertyMappingSourceLDAPForm.ts
View File

@ -7,8 +7,8 @@ import { customElement } from "lit/decorators.js";
import { LDAPSourcePropertyMapping, PropertymappingsApi } from "@goauthentik/api";
@customElement("ak-property-mapping-ldap-source-form")
export class PropertyMappingLDAPSourceForm extends BasePropertyMappingForm<LDAPSourcePropertyMapping> {
@customElement("ak-property-mapping-source-ldap-form")
export class PropertyMappingSourceLDAPForm extends BasePropertyMappingForm<LDAPSourcePropertyMapping> {
docLink(): string {
return "/docs/sources/property-mappings/expression?utm_source=authentik";
}
@ -35,6 +35,6 @@ export class PropertyMappingLDAPSourceForm extends BasePropertyMappingForm<LDAPS
declare global {
interface HTMLElementTagNameMap {
"ak-property-mapping-ldap-source-form": PropertyMappingLDAPSourceForm;
"ak-property-mapping-source-ldap-form": PropertyMappingSourceLDAPForm;
}
}

6
web/src/admin/property-mappings/PropertyMappingOAuthSourceForm.ts → web/src/admin/property-mappings/PropertyMappingSourceOAuthForm.ts
View File

@ -7,8 +7,8 @@ import { customElement } from "lit/decorators.js";
import { OAuthSourcePropertyMapping, PropertymappingsApi } from "@goauthentik/api";
@customElement("ak-property-mapping-oauth-source-form")
export class PropertyMappingOAuthSourceForm extends BasePropertyMappingForm<OAuthSourcePropertyMapping> {
@customElement("ak-property-mapping-source-oauth-form")
export class PropertyMappingSourceOAuthForm extends BasePropertyMappingForm<OAuthSourcePropertyMapping> {
docLink(): string {
return "/docs/sources/property-mappings/expression?utm_source=authentik";
}
@ -35,6 +35,6 @@ export class PropertyMappingOAuthSourceForm extends BasePropertyMappingForm<OAut
declare global {
interface HTMLElementTagNameMap {
"ak-property-mapping-oauth-source-form": PropertyMappingOAuthSourceForm;
"ak-property-mapping-source-oauth-form": PropertyMappingSourceOAuthForm;
}
}

6
web/src/admin/property-mappings/PropertyMappingPlexSourceForm.ts → web/src/admin/property-mappings/PropertyMappingSourcePlexForm.ts
View File

@ -7,8 +7,8 @@ import { customElement } from "lit/decorators.js";
import { PlexSourcePropertyMapping, PropertymappingsApi } from "@goauthentik/api";
@customElement("ak-property-mapping-plex-source-form")
export class PropertyMappingPlexSourceForm extends BasePropertyMappingForm<PlexSourcePropertyMapping> {
@customElement("ak-property-mapping-source-plex-form")
export class PropertyMappingSourcePlexForm extends BasePropertyMappingForm<PlexSourcePropertyMapping> {
docLink(): string {
return "/docs/sources/property-mappings/expression?utm_source=authentik";
}
@ -35,6 +35,6 @@ export class PropertyMappingPlexSourceForm extends BasePropertyMappingForm<PlexS
declare global {
interface HTMLElementTagNameMap {
"ak-property-mapping-plex-source-form": PropertyMappingPlexSourceForm;
"ak-property-mapping-source-plex-form": PropertyMappingSourcePlexForm;
}
}

6
web/src/admin/property-mappings/PropertyMappingSAMLSourceForm.ts → web/src/admin/property-mappings/PropertyMappingSourceSAMLForm.ts
View File

@ -7,8 +7,8 @@ import { customElement } from "lit/decorators.js";
import { PropertymappingsApi, SAMLSourcePropertyMapping } from "@goauthentik/api";
@customElement("ak-property-mapping-saml-source-form")
export class PropertyMappingSAMLSourceForm extends BasePropertyMappingForm<SAMLSourcePropertyMapping> {
@customElement("ak-property-mapping-source-saml-form")
export class PropertyMappingSourceSAMLForm extends BasePropertyMappingForm<SAMLSourcePropertyMapping> {
docLink(): string {
return "/docs/sources/property-mappings/expression?utm_source=authentik";
}
@ -35,6 +35,6 @@ export class PropertyMappingSAMLSourceForm extends BasePropertyMappingForm<SAMLS
declare global {
interface HTMLElementTagNameMap {
"ak-property-mapping-saml-source-form": PropertyMappingSAMLSourceForm;
"ak-property-mapping-source-saml-form": PropertyMappingSourceSAMLForm;
}
}

6
web/src/admin/property-mappings/PropertyMappingSCIMSourceForm.ts → web/src/admin/property-mappings/PropertyMappingSourceSCIMForm.ts
View File

@ -7,8 +7,8 @@ import { customElement } from "lit/decorators.js";
import { PropertymappingsApi, SCIMSourcePropertyMapping } from "@goauthentik/api";
@customElement("ak-property-mapping-scim-source-form")
export class PropertyMappingSCIMSourceForm extends BasePropertyMappingForm<SCIMSourcePropertyMapping> {
@customElement("ak-property-mapping-source-scim-form")
export class PropertyMappingSourceSCIMForm extends BasePropertyMappingForm<SCIMSourcePropertyMapping> {
docLink(): string {
return "/docs/sources/property-mappings/expression?utm_source=authentik";
}
@ -35,6 +35,6 @@ export class PropertyMappingSCIMSourceForm extends BasePropertyMappingForm<SCIMS
declare global {
interface HTMLElementTagNameMap {
"ak-property-mapping-scim-source-form": PropertyMappingSCIMSourceForm;
"ak-property-mapping-source-scim-form": PropertyMappingSourceSCIMForm;
}
}

20
web/src/admin/property-mappings/PropertyMappingWizard.ts
View File

@ -1,12 +1,16 @@
import "@goauthentik/admin/property-mappings/PropertyMappingLDAPSourceForm";
import "@goauthentik/admin/property-mappings/PropertyMappingNotification";
import "@goauthentik/admin/property-mappings/PropertyMappingOAuthSourceForm";
import "@goauthentik/admin/property-mappings/PropertyMappingPlexSourceForm";
import "@goauthentik/admin/property-mappings/PropertyMappingRACForm";
import "@goauthentik/admin/property-mappings/PropertyMappingSAMLForm";
import "@goauthentik/admin/property-mappings/PropertyMappingSAMLSourceForm";
import "@goauthentik/admin/property-mappings/PropertyMappingSCIMSourceForm";
import "@goauthentik/admin/property-mappings/PropertyMappingScopeForm";
import "@goauthentik/admin/property-mappings/PropertyMappingProviderGoogleWorkspaceForm";
import "@goauthentik/admin/property-mappings/PropertyMappingProviderMicrosoftEntraForm";
import "@goauthentik/admin/property-mappings/PropertyMappingProviderRACForm";
import "@goauthentik/admin/property-mappings/PropertyMappingProviderRadiusForm";
import "@goauthentik/admin/property-mappings/PropertyMappingProviderSAMLForm";
import "@goauthentik/admin/property-mappings/PropertyMappingProviderSCIMForm";
import "@goauthentik/admin/property-mappings/PropertyMappingProviderScopeForm";
import "@goauthentik/admin/property-mappings/PropertyMappingSourceLDAPForm";
import "@goauthentik/admin/property-mappings/PropertyMappingSourceOAuthForm";
import "@goauthentik/admin/property-mappings/PropertyMappingSourcePlexForm";
import "@goauthentik/admin/property-mappings/PropertyMappingSourceSAMLForm";
import "@goauthentik/admin/property-mappings/PropertyMappingSourceSCIMForm";
import "@goauthentik/admin/property-mappings/PropertyMappingTestForm";
import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { AKElement } from "@goauthentik/elements/Base";