diff --git a/service/src/authentication/saml.js b/service/src/authentication/saml.js index 2c33bae42..0c1a5ffaa 100644 --- a/service/src/authentication/saml.js +++ b/service/src/authentication/saml.js @@ -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; diff --git a/service/src/models/authenticationconfiguration.js b/service/src/models/authenticationconfiguration.js index 7af58085c..87fedec9f 100644 --- a/service/src/models/authenticationconfiguration.js +++ b/service/src/models/authenticationconfiguration.js @@ -59,7 +59,7 @@ function DbAuthenticationConfigurationToObject(config, ret, options) { ret.icon = ret.icon ? ret.icon.toString('base64') : null; } -}; +} exports.transform = DbAuthenticationConfigurationToObject; exports.secureMask = secureMask; diff --git a/web-app/src/app/admin/admin-authentication/admin-authentication-saml/admin-authentication-saml.component.html b/web-app/src/app/admin/admin-authentication/admin-authentication-saml/admin-authentication-saml.component.html index 80e044b00..af132dcfe 100644 --- a/web-app/src/app/admin/admin-authentication/admin-authentication-saml/admin-authentication-saml.component.html +++ b/web-app/src/app/admin/admin-authentication/admin-authentication-saml/admin-authentication-saml.component.html @@ -32,7 +32,7 @@ Private Key - Private key used to sign requests. Supports well formatted PEM or single-line. diff --git a/web-app/src/app/admin/admin-authentication/admin-authentication-saml/admin-authentication-saml.component.ts b/web-app/src/app/admin/admin-authentication/admin-authentication-saml/admin-authentication-saml.component.ts index eb66df88a..be0b85df1 100644 --- a/web-app/src/app/admin/admin-authentication/admin-authentication-saml/admin-authentication-saml.component.ts +++ b/web-app/src/app/admin/admin-authentication/admin-authentication-saml/admin-authentication-saml.component.ts @@ -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'}, @@ -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 {