diff --git a/addons/api/addon/models/auth-method.js b/addons/api/addon/models/auth-method.js index 699f5137e..dc03abc0d 100644 --- a/addons/api/addon/models/auth-method.js +++ b/addons/api/addon/models/auth-method.js @@ -7,7 +7,7 @@ import { equal } from '@ember/object/computed'; */ export const options = { oidc: { - signing_algorithm: [ + signing_algorithms: [ 'RS256', 'RS384', 'RS512', diff --git a/addons/api/addon/models/fragment-auth-method-attributes.js b/addons/api/addon/models/fragment-auth-method-attributes.js index b023401f2..5fb952ccd 100644 --- a/addons/api/addon/models/fragment-auth-method-attributes.js +++ b/addons/api/addon/models/fragment-auth-method-attributes.js @@ -20,4 +20,21 @@ export default class FragmentAuthMethodAttributesModel extends Fragment { emptyArrayIfMissing: true, }) account_claim_maps; + + @fragmentArray('fragment-string', { + emptyArrayIfMissing: true, + }) + claims_scopes; + + @fragmentArray('fragment-string', { + emptyArrayIfMissing: true, + }) + signing_algorithms; + + @fragmentArray('fragment-string', { + emptyArrayIfMissing: true, + }) + allowed_audiences; + + @fragmentArray('fragment-string', { emptyArrayIfMissing: true }) idp_ca_certs; } diff --git a/addons/api/mirage/generated/factories/auth-method.js b/addons/api/mirage/generated/factories/auth-method.js index 8fd338a53..c309202f2 100644 --- a/addons/api/mirage/generated/factories/auth-method.js +++ b/addons/api/mirage/generated/factories/auth-method.js @@ -24,6 +24,11 @@ export default Factory.extend({ client_secret_hmac: 'GY7blb4ynM5TEPNi_qnphJ9aDWhW8FpmN3D-eP_L7Zk', issuer: 'http://127.0.0.1:57070', state: 'active-public', + account_claim_maps: ['oid=sub', 'full_name=name'], + claims_scopes: ['profile', 'email'], + signing_algorithms: ['RS256', 'RS384'], + allowed_audiences: ['www.alice.com', 'www.alice.com/admin'], + idp_ca_certs: ['certificate-1234', 'certificate-5678'], }; break; } diff --git a/addons/api/tests/unit/serializers/auth-method-test.js b/addons/api/tests/unit/serializers/auth-method-test.js index c9c7ec1bb..ac2ecdcc4 100644 --- a/addons/api/tests/unit/serializers/auth-method-test.js +++ b/addons/api/tests/unit/serializers/auth-method-test.js @@ -37,6 +37,16 @@ module('Unit | Serializer | auth method', function (hooks) { attributes: { state: 'foo', account_claim_maps: [{ from: 'foo', to: 'bar' }], + claims_scopes: [{ value: 'profile' }, { value: 'email' }], + signing_algorithms: [{ value: 'RS256' }, { value: 'RS384' }], + allowed_audiences: [ + { value: 'www.alice.com' }, + { value: 'www.alice.com/admin' }, + ], + idp_ca_certs: [ + { value: 'certificate-1234' }, + { value: 'certificate-5678' }, + ], }, }); @@ -48,6 +58,10 @@ module('Unit | Serializer | auth method', function (hooks) { description: null, attributes: { account_claim_maps: ['foo=bar'], + claims_scopes: ['profile', 'email'], + signing_algorithms: ['RS256', 'RS384'], + allowed_audiences: ['www.alice.com', 'www.alice.com/admin'], + idp_ca_certs: ['certificate-1234', 'certificate-5678'], api_url_prefix: null, callback_url: null, client_id: null,