Merge branch 'master' into new-forms-part-2
This commit is contained in:
Jens Langhammer
108
web/package-lock.json
generated
108
web/package-lock.json
generated
@ -302,13 +302,13 @@
|
||||
}
|
||||
},
|
||||
"@sentry/browser": {
|
||||
"version": "6.2.3",
|
||||
"resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-6.2.3.tgz",
|
||||
"integrity": "sha512-QUqrZdAosY2MPAUfJYpyCT+dA6v7A2h8imO8R3Lbi0hRSPr+L7zjqHgFs3CTHJLmLV74cxHt6rVVUPSksYNQDQ==",
|
||||
"version": "6.2.4",
|
||||
"resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-6.2.4.tgz",
|
||||
"integrity": "sha512-OV1CQUxNawncpSEcrA+YccOu72rLC0tyYq/Pc4D/ihpfJmvR0o0L8vZYESay55V5lcqnJPFp8IyCJ2bF8IZTsA==",
|
||||
"requires": {
|
||||
"@sentry/core": "6.2.3",
|
||||
"@sentry/types": "6.2.3",
|
||||
"@sentry/utils": "6.2.3",
|
||||
"@sentry/core": "6.2.4",
|
||||
"@sentry/types": "6.2.4",
|
||||
"@sentry/utils": "6.2.4",
|
||||
"tslib": "^1.9.3"
|
||||
},
|
||||
"dependencies": {
|
||||
@ -320,14 +320,14 @@
|
||||
}
|
||||
},
|
||||
"@sentry/core": {
|
||||
"version": "6.2.3",
|
||||
"resolved": "https://registry.npmjs.org/@sentry/core/-/core-6.2.3.tgz",
|
||||
"integrity": "sha512-GpfHoSJiXchVXgyaMWVtIPVw2t97KkD1OJ4JdL3/TeH3auX5XvsN5iHTk+x/Er8t13IpOnvidH1xWdV1dnax2w==",
|
||||
"version": "6.2.4",
|
||||
"resolved": "https://registry.npmjs.org/@sentry/core/-/core-6.2.4.tgz",
|
||||
"integrity": "sha512-8Z98OTM4wFS2n3T+V8a6cYWHDAk1byWuMb8JquZLdYgR5O1jkSpSFrhksQ+B/wDbVw05VOolSNFJsDTC2D5qXg==",
|
||||
"requires": {
|
||||
"@sentry/hub": "6.2.3",
|
||||
"@sentry/minimal": "6.2.3",
|
||||
"@sentry/types": "6.2.3",
|
||||
"@sentry/utils": "6.2.3",
|
||||
"@sentry/hub": "6.2.4",
|
||||
"@sentry/minimal": "6.2.4",
|
||||
"@sentry/types": "6.2.4",
|
||||
"@sentry/utils": "6.2.4",
|
||||
"tslib": "^1.9.3"
|
||||
},
|
||||
"dependencies": {
|
||||
@ -339,12 +339,12 @@
|
||||
}
|
||||
},
|
||||
"@sentry/hub": {
|
||||
"version": "6.2.3",
|
||||
"resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-6.2.3.tgz",
|
||||
"integrity": "sha512-D5Horfo2l0p52S7KPvy7qwWNMrE4IsCN8ODbfcCsfJu7hEXJmItbkbohIVSqO5neukhn5nu+x8kyCe9Q5u1Q6g==",
|
||||
"version": "6.2.4",
|
||||
"resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-6.2.4.tgz",
|
||||
"integrity": "sha512-dY8Vj3c4oIirNNNzWkJvoRMzjlU8Nw3PJ/IwhdWjiQhj5/oqOzJwJQSMeOKdOGIhArAifr0hSXdy1+tHGEOOdQ==",
|
||||
"requires": {
|
||||
"@sentry/types": "6.2.3",
|
||||
"@sentry/utils": "6.2.3",
|
||||
"@sentry/types": "6.2.4",
|
||||
"@sentry/utils": "6.2.4",
|
||||
"tslib": "^1.9.3"
|
||||
},
|
||||
"dependencies": {
|
||||
@ -356,12 +356,12 @@
|
||||
}
|
||||
},
|
||||
"@sentry/minimal": {
|
||||
"version": "6.2.3",
|
||||
"resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.2.3.tgz",
|
||||
"integrity": "sha512-Gpn9x4NQAG7E94EK1+hAz9GUcYrffTuqJ/XgqvHYk0jsHZ6RfsXYrmBac0ZwUxOivMf2t0n5opK0v5rhMDfF2w==",
|
||||
"version": "6.2.4",
|
||||
"resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.2.4.tgz",
|
||||
"integrity": "sha512-KN+Abbz5CCAceSMvwymSG8GIVPaz4Y/xuY7R7dA8IlzncHaWRQ/Ss0PXjYUWL4YoTlTK6id1AW0i3JMICHMVgw==",
|
||||
"requires": {
|
||||
"@sentry/hub": "6.2.3",
|
||||
"@sentry/types": "6.2.3",
|
||||
"@sentry/hub": "6.2.4",
|
||||
"@sentry/types": "6.2.4",
|
||||
"tslib": "^1.9.3"
|
||||
},
|
||||
"dependencies": {
|
||||
@ -373,17 +373,51 @@
|
||||
}
|
||||
},
|
||||
"@sentry/tracing": {
|
||||
"version": "6.2.3",
|
||||
"resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-6.2.3.tgz",
|
||||
"integrity": "sha512-OnQZKp7qVera+Z4ly6hgybGgyf10p2VDXqwueXkMVeLD+PwlPG8a8NMpKkZ+QxwRbQbSFhRLQaib3NX34tusBQ==",
|
||||
"version": "6.2.4",
|
||||
"resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-6.2.4.tgz",
|
||||
"integrity": "sha512-FNPTd22Q487SVyGM4BXlVeeRwPr9CG0OV8bz+GRHQtpVDhL+zdkGlIJYbxZnrOcdyYNVgLCJUPDHqyv55nhU4A==",
|
||||
"requires": {
|
||||
"@sentry/hub": "6.2.3",
|
||||
"@sentry/minimal": "6.2.3",
|
||||
"@sentry/types": "6.2.3",
|
||||
"@sentry/utils": "6.2.3",
|
||||
"@sentry/hub": "6.2.4",
|
||||
"@sentry/minimal": "6.2.4",
|
||||
"@sentry/types": "6.2.4",
|
||||
"@sentry/utils": "6.2.4",
|
||||
"tslib": "^1.9.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"@sentry/hub": {
|
||||
"version": "6.2.4",
|
||||
"resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-6.2.4.tgz",
|
||||
"integrity": "sha512-dY8Vj3c4oIirNNNzWkJvoRMzjlU8Nw3PJ/IwhdWjiQhj5/oqOzJwJQSMeOKdOGIhArAifr0hSXdy1+tHGEOOdQ==",
|
||||
"requires": {
|
||||
"@sentry/types": "6.2.4",
|
||||
"@sentry/utils": "6.2.4",
|
||||
"tslib": "^1.9.3"
|
||||
}
|
||||
},
|
||||
"@sentry/minimal": {
|
||||
"version": "6.2.4",
|
||||
"resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.2.4.tgz",
|
||||
"integrity": "sha512-KN+Abbz5CCAceSMvwymSG8GIVPaz4Y/xuY7R7dA8IlzncHaWRQ/Ss0PXjYUWL4YoTlTK6id1AW0i3JMICHMVgw==",
|
||||
"requires": {
|
||||
"@sentry/hub": "6.2.4",
|
||||
"@sentry/types": "6.2.4",
|
||||
"tslib": "^1.9.3"
|
||||
}
|
||||
},
|
||||
"@sentry/types": {
|
||||
"version": "6.2.4",
|
||||
"resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.2.4.tgz",
|
||||
"integrity": "sha512-c+vEExoj8H67NPaskTvxJBSAtDWzfFXOmlkicEZPUWbkL+Yxxlbzp1lI8K6GOks56UYMUBUU/fwQvv/34cO96g=="
|
||||
},
|
||||
"@sentry/utils": {
|
||||
"version": "6.2.4",
|
||||
"resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.2.4.tgz",
|
||||
"integrity": "sha512-lavbb3yQMUleVffmDkPH7X3dlgbXlyiFNmfER+swJ6WRxa4Yq6I8yea2s6maoqnZMhZe+yztn455DPwXIItfCA==",
|
||||
"requires": {
|
||||
"@sentry/types": "6.2.4",
|
||||
"tslib": "^1.9.3"
|
||||
}
|
||||
},
|
||||
"tslib": {
|
||||
"version": "1.14.1",
|
||||
"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
|
||||
@ -392,16 +426,16 @@
|
||||
}
|
||||
},
|
||||
"@sentry/types": {
|
||||
"version": "6.2.3",
|
||||
"resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.2.3.tgz",
|
||||
"integrity": "sha512-BpA+9FherWgYlkMD/82bGFh/gAqZNlZX5UE8vWLKyyzNyOEEz3v9ScxE8dOSWE4v5iXJR1O3jjxaTcRQxPVgCA=="
|
||||
"version": "6.2.4",
|
||||
"resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.2.4.tgz",
|
||||
"integrity": "sha512-c+vEExoj8H67NPaskTvxJBSAtDWzfFXOmlkicEZPUWbkL+Yxxlbzp1lI8K6GOks56UYMUBUU/fwQvv/34cO96g=="
|
||||
},
|
||||
"@sentry/utils": {
|
||||
"version": "6.2.3",
|
||||
"resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.2.3.tgz",
|
||||
"integrity": "sha512-YnkJm97wSvck39eRpqWjIuuwbvzPilvAcMqhbUy9yK/UBQMDGUzAKCOKH40udw1DwMUCWjJ71mOCDgUorE4Fog==",
|
||||
"version": "6.2.4",
|
||||
"resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.2.4.tgz",
|
||||
"integrity": "sha512-lavbb3yQMUleVffmDkPH7X3dlgbXlyiFNmfER+swJ6WRxa4Yq6I8yea2s6maoqnZMhZe+yztn455DPwXIItfCA==",
|
||||
"requires": {
|
||||
"@sentry/types": "6.2.3",
|
||||
"@sentry/types": "6.2.4",
|
||||
"tslib": "^1.9.3"
|
||||
},
|
||||
"dependencies": {
|
||||
|
||||
@ -14,8 +14,8 @@
|
||||
"@patternfly/patternfly": "^4.90.5",
|
||||
"@polymer/iron-form": "^3.0.1",
|
||||
"@polymer/paper-input": "^3.2.1",
|
||||
"@sentry/browser": "^6.2.3",
|
||||
"@sentry/tracing": "^6.2.3",
|
||||
"@sentry/browser": "^6.2.4",
|
||||
"@sentry/tracing": "^6.2.4",
|
||||
"@types/chart.js": "^2.9.31",
|
||||
"@types/codemirror": "0.0.108",
|
||||
"@types/grecaptcha": "^3.0.1",
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import { CoreApi, Application, ProvidersApi, Provider } from "authentik-api";
|
||||
import { CoreApi, Application, ProvidersApi, Provider, ApplicationPolicyEngineModeEnum } from "authentik-api";
|
||||
import { gettext } from "django";
|
||||
import { customElement, property } from "lit-element";
|
||||
import { html, TemplateResult } from "lit-html";
|
||||
@ -97,6 +97,19 @@ export class ApplicationForm extends Form<Application> {
|
||||
}), html``)}
|
||||
</select>
|
||||
</ak-form-element-horizontal>
|
||||
<ak-form-element-horizontal
|
||||
label=${gettext("Policy engine mode")}
|
||||
?required=${true}
|
||||
name="policyEngineMode">
|
||||
<select class="pf-c-form-control">
|
||||
<option value=${ApplicationPolicyEngineModeEnum.Any} ?selected=${this.application?.policyEngineMode === ApplicationPolicyEngineModeEnum.Any}>
|
||||
${gettext("ANY, any policy must match to grant access.")}
|
||||
</option>
|
||||
<option value=${ApplicationPolicyEngineModeEnum.All} ?selected=${this.application?.policyEngineMode === ApplicationPolicyEngineModeEnum.All}>
|
||||
${gettext("ALL, all policies must match to grant access.")}
|
||||
</option>
|
||||
</select>
|
||||
</ak-form-element-horizontal>
|
||||
<ak-form-element-horizontal
|
||||
label=${gettext("Launch URL")}
|
||||
name="launchUrl">
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import { Flow, FlowDesignationEnum, FlowsApi } from "authentik-api";
|
||||
import { Flow, FlowDesignationEnum, FlowPolicyEngineModeEnum, FlowsApi } from "authentik-api";
|
||||
import { gettext } from "django";
|
||||
import { customElement, property } from "lit-element";
|
||||
import { html, TemplateResult } from "lit-html";
|
||||
@ -93,6 +93,19 @@ export class FlowForm extends Form<Flow> {
|
||||
<input type="text" value="${ifDefined(this.flow?.slug)}" class="pf-c-form-control" required>
|
||||
<p class="pf-c-form__helper-text">${gettext("Visible in the URL.")}</p>
|
||||
</ak-form-element-horizontal>
|
||||
<ak-form-element-horizontal
|
||||
label=${gettext("Policy engine mode")}
|
||||
?required=${true}
|
||||
name="policyEngineMode">
|
||||
<select class="pf-c-form-control">
|
||||
<option value=${FlowPolicyEngineModeEnum.Any} ?selected=${this.flow?.policyEngineMode === FlowPolicyEngineModeEnum.Any}>
|
||||
${gettext("ANY, any policy must match to grant access.")}
|
||||
</option>
|
||||
<option value=${FlowPolicyEngineModeEnum.All} ?selected=${this.flow?.policyEngineMode === FlowPolicyEngineModeEnum.All}>
|
||||
${gettext("ALL, all policies must match to grant access.")}
|
||||
</option>
|
||||
</select>
|
||||
</ak-form-element-horizontal>
|
||||
<ak-form-element-horizontal
|
||||
label=${gettext("Designation")}
|
||||
?required=${true}
|
||||
|
||||
Reference in New Issue
Block a user