Skip to content

Commit

Permalink
[service][web-app] change saml privateCert setting to privateKey to m…
Browse files Browse the repository at this point in the history
…atch passport-saml
  • Loading branch information
restjohn committed Oct 26, 2023
1 parent d6321f8 commit b8f05df
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 9 deletions.
4 changes: 2 additions & 2 deletions service/src/authentication/saml.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ function configure(strategy) {
cert: strategy.settings.cert,
issuer: strategy.settings.issuer
}
if (strategy.settings.privateCert) {
options.privateCert = strategy.settings.privateCert;
if (strategy.settings.privateKey) {
options.privateKey = strategy.settings.privateKey;
}
if (strategy.settings.decryptionPvk) {
options.decryptionPvk = strategy.settings.decryptionPvk;
Expand Down
2 changes: 1 addition & 1 deletion service/src/models/authenticationconfiguration.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ function DbAuthenticationConfigurationToObject(config, ret, options) {

ret.icon = ret.icon ? ret.icon.toString('base64') : null;
}
};
}

exports.transform = DbAuthenticationConfigurationToObject;
exports.secureMask = secureMask;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

<mat-form-field appearance="outline">
<mat-label>Private Key</mat-label>
<textarea matInput [readonly]="!editable" [(ngModel)]="strategy.settings.privateCert"
<textarea matInput [readonly]="!editable" [(ngModel)]="strategy.settings.privateKey"
(click)="setDirty(true)"></textarea>
<mat-hint align="end">
Private key used to sign requests. Supports well formatted PEM or single-line.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export class AdminAuthenticationSAMLComponent implements OnInit {
{value: 'sha256', viewValue: 'SHA-256'},
{value: 'sha512', viewValue: 'SHA-512'}
];

racs: RACComparison[] = [
{value: 'exact', viewValue: 'Exact'},
{value: 'minimum', viewValue: 'Minimum'},
Expand All @@ -43,10 +43,6 @@ export class AdminAuthenticationSAMLComponent implements OnInit {
if (!this.strategy.settings.profile) {
this.strategy.settings.profile = {};
}

if (!this.strategy.settings.options) {
this.strategy.settings.options = {};
}
}

setDirty(isDirty: boolean): void {
Expand Down

0 comments on commit b8f05df

Please sign in to comment.