Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow users to set "targetToken" property on JWT Signer #618

Merged
merged 2 commits into from
Jan 31, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,22 @@
</div>
</lib-form-field-container>
<lib-form-field-toggle [(toggleOn)]="showMore" (toggleOnChange)="showMoreChanged($event)" style="margin: 0px 10px"></lib-form-field-toggle>
<lib-form-field-container
*ngIf="showMore && showTokenType"
[title]="'Tarket Token Type'"
[label]="'Required'"
[helpText]="'The target token type. Can be either Access or ID'"
class="form-field-advanced"
>
<select
[(ngModel)]="targetToken"
id="authPolicyId"
class="form-field-dropdown"
>
<option value="ACCESS">Access</option>
<option value="ID">ID</option>
</select>
</lib-form-field-container>
<div [hidden]="!showMore" class="form-group-column">
<lib-form-field-container
[title]="'Custom Tags'"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import {ProjectableForm} from "../projectable-form.class";
import {GrowlerService} from "../../messaging/growler.service";
import {ExtensionService, SHAREDZ_EXTENSION} from "../../extendable/extensions-noop.service";

import semver from 'semver';
import {cloneDeep, defer, delay, forOwn, keys, invert, isEmpty, isNil, unset} from 'lodash';
import {GrowlerModel} from "../../messaging/growler.model";
import {SETTINGS_SERVICE, SettingsService} from "../../../services/settings.service";
Expand Down Expand Up @@ -234,6 +235,25 @@ export class JwtSignerFormComponent extends ProjectableForm implements OnInit, O
return isEmpty(this.errors);
}

get showTokenType() {
return !isEmpty(this.settingsService?.zitiSemver) && semver.gte(this.settingsService?.zitiSemver, '1.3.4')
}

get targetToken() {
if (this.formData && !this.formData.targetToken) {
this.formData.targetToken = 'ACCESS';
this.initData = cloneDeep(this.formData);
}
return this.formData.targetToken;
}

set targetToken(val) {
if (!this.formData) {
return;
}
this.formData.targetToken = val;
}

get apiCallURL() {
return this.settings.selectedEdgeController + '/edge/management/v1/external-jwt-signers' + (this.formData.id ? `/${this.formData.id}` : '');
}
Expand All @@ -256,6 +276,9 @@ export class JwtSignerFormComponent extends ProjectableForm implements OnInit, O
if (!isEmpty(this.formData.jwksEndpoint)) {
data.jwksEndpoint = this.formData.jwksEndpoint;
}
if (!isEmpty(this.formData.targetToken) && this.showTokenType) {
data.targetToken = this.formData.targetToken;
}
if (!isEmpty(this.formData.id)) {
data.id = this.formData.id;
}
Expand Down
1 change: 1 addition & 0 deletions projects/ziti-console-lib/src/lib/models/jwt-signer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ export class JwtSigner {
jwksEndpoint: string = undefined;
certPem: string = undefined;
tags: any = {};
targetToken: string = 'ACCESS';
};
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,11 @@ export class CertificateAuthoritiesPageService extends ListPageServiceClass {

private addActionsPerRow(results: any): any[] {
return results.data.map((row) => {
row.actionList = ['update', 'verify', 'delete',];
let actionList = ['update', 'delete'];
if (!row.isVerified) {
actionList = ['update', 'verify', 'delete'];
}
row.actionList = actionList;
return row;
});
}
Expand Down
Loading