From 4abd62661f9bb3aaeb73e05bd9a5dc85b4c1781a Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Mon, 13 Apr 2015 14:23:41 +0200 Subject: [PATCH] Updated example jsons --- examples/admin-client/example-realm.json | 4 ++-- examples/basic-auth/basicauthrealm.json | 4 ++-- .../facebook-identity-provider-realm.json | 4 ++-- .../google-identity-provider-realm.json | 4 ++-- .../saml-broker-authentication-realm.json | 4 ++-- .../saml-broker-realm.json | 2 +- .../twitter-identity-provider-realm.json | 4 ++-- examples/cordova/example-realm.json | 6 +++--- examples/cors/cors-realm.json | 6 +++--- examples/demo-template/testrealm.json | 21 +++++++++---------- examples/fuse/testrealm.json | 17 +++++++-------- examples/js-console/example-realm.json | 6 +++--- examples/kerberos/kerberosrealm.json | 2 +- examples/multi-tenant/tenant1-realm.json | 4 ++-- examples/multi-tenant/tenant2-realm.json | 6 +++--- examples/saml/testsaml.json | 12 +++++------ 16 files changed, 52 insertions(+), 54 deletions(-) diff --git a/examples/admin-client/example-realm.json b/examples/admin-client/example-realm.json index 2615e56676..3317f48f76 100755 --- a/examples/admin-client/example-realm.json +++ b/examples/admin-client/example-realm.json @@ -17,12 +17,12 @@ "value": "password" } ], - "applicationRoles": { + "clientRoles": { "realm-management": [ "realm-admin" ] } } ], - "applications": [ + "clients": [ { "name": "examples-admin-client", "enabled": true, diff --git a/examples/basic-auth/basicauthrealm.json b/examples/basic-auth/basicauthrealm.json index f6bac20a5b..0ed1bf5606 100644 --- a/examples/basic-auth/basicauthrealm.json +++ b/examples/basic-auth/basicauthrealm.json @@ -24,7 +24,7 @@ "value" : "password" } ], "realmRoles": [ "user","admin" ], - "applicationRoles": { + "clientRoles": { "realm-management": [ "realm-admin" ] } } @@ -41,7 +41,7 @@ } ] }, - "applications": [ + "clients": [ { "name": "basic-auth-service", "enabled": true, diff --git a/examples/broker/facebook-authentication/facebook-identity-provider-realm.json b/examples/broker/facebook-authentication/facebook-identity-provider-realm.json index 32a370497a..cc8c636e63 100644 --- a/examples/broker/facebook-authentication/facebook-identity-provider-realm.json +++ b/examples/broker/facebook-authentication/facebook-identity-provider-realm.json @@ -17,7 +17,7 @@ "value" : "password" } ], "realmRoles": [ "user","admin" ], - "applicationRoles": { + "clientRoles": { "realm-management": [ "realm-admin" ] } } @@ -30,7 +30,7 @@ } ] }, - "applications": [ + "clients": [ { "name": "facebook-authentication", "enabled": true, diff --git a/examples/broker/google-authentication/google-identity-provider-realm.json b/examples/broker/google-authentication/google-identity-provider-realm.json index 8b4deef92b..a721e34b13 100644 --- a/examples/broker/google-authentication/google-identity-provider-realm.json +++ b/examples/broker/google-authentication/google-identity-provider-realm.json @@ -17,7 +17,7 @@ "value" : "password" } ], "realmRoles": [ "user","admin" ], - "applicationRoles": { + "clientRoles": { "realm-management": [ "realm-admin" ] } } @@ -30,7 +30,7 @@ } ] }, - "applications": [ + "clients": [ { "name": "google-authentication", "enabled": true, diff --git a/examples/broker/saml-broker-authentication/saml-broker-authentication-realm.json b/examples/broker/saml-broker-authentication/saml-broker-authentication-realm.json index f8fbc8a242..ad757ab414 100644 --- a/examples/broker/saml-broker-authentication/saml-broker-authentication-realm.json +++ b/examples/broker/saml-broker-authentication/saml-broker-authentication-realm.json @@ -17,7 +17,7 @@ "value" : "password" } ], "realmRoles": [ "user","admin" ], - "applicationRoles": { + "clientRoles": { "realm-management": [ "realm-admin" ] } } @@ -30,7 +30,7 @@ } ] }, - "applications": [ + "clients": [ { "name": "saml-broker-authentication", "enabled": true, diff --git a/examples/broker/saml-broker-authentication/saml-broker-realm.json b/examples/broker/saml-broker-authentication/saml-broker-realm.json index 7f1cde0b82..8d0bad467b 100644 --- a/examples/broker/saml-broker-authentication/saml-broker-realm.json +++ b/examples/broker/saml-broker-authentication/saml-broker-realm.json @@ -26,7 +26,7 @@ } ] }, - "applications": [ + "clients": [ { "name": "http://localhost:8080/auth/realms/saml-broker-authentication-realm", "protocol": "saml", diff --git a/examples/broker/twitter-authentication/twitter-identity-provider-realm.json b/examples/broker/twitter-authentication/twitter-identity-provider-realm.json index 4b709044c7..f9add02775 100644 --- a/examples/broker/twitter-authentication/twitter-identity-provider-realm.json +++ b/examples/broker/twitter-authentication/twitter-identity-provider-realm.json @@ -18,7 +18,7 @@ "value" : "password" } ], "realmRoles": [ "user","admin" ], - "applicationRoles": { + "clientRoles": { "realm-management": [ "realm-admin" ] } } @@ -31,7 +31,7 @@ } ] }, - "applications": [ + "clients": [ { "name": "twitter-authentication", "enabled": true, diff --git a/examples/cordova/example-realm.json b/examples/cordova/example-realm.json index f0d6ad282f..d07a5d38a9 100755 --- a/examples/cordova/example-realm.json +++ b/examples/cordova/example-realm.json @@ -18,7 +18,7 @@ "value" : "password" } ], "realmRoles": [ "user" ], - "applicationRoles": { + "clientRoles": { "account": ["view-profile", "manage-account"] } } @@ -41,7 +41,7 @@ "roles": ["user"] } ], - "applications": [ + "clients": [ { "name": "cordova", "enabled": true, @@ -50,7 +50,7 @@ "webOrigins": ["localhost"] } ], - "applicationScopeMappings": { + "clientScopeMappings": { "account": [ { "client": "cordova", diff --git a/examples/cors/cors-realm.json b/examples/cors/cors-realm.json index ab08ee39e7..9e59580675 100755 --- a/examples/cors/cors-realm.json +++ b/examples/cors/cors-realm.json @@ -23,7 +23,7 @@ "value" : "password" } ], "realmRoles": [ "user" ], - "applicationRoles": { + "clientRoles": { "realm-management": [ "realm-admin" ] } } @@ -42,7 +42,7 @@ "roles": ["user"] } ], - "applications": [ + "clients": [ { "name": "angular-cors-product", "enabled": true, @@ -56,7 +56,7 @@ ] } ], - "applicationScopeMappings": { + "clientScopeMappings": { "realm-management": [ { "client": "angular-cors-product", diff --git a/examples/demo-template/testrealm.json b/examples/demo-template/testrealm.json index 031e20bc54..4b4d669fd6 100755 --- a/examples/demo-template/testrealm.json +++ b/examples/demo-template/testrealm.json @@ -24,7 +24,7 @@ "value" : "password" } ], "realmRoles": [ "user" ], - "applicationRoles": { + "clientRoles": { "account": [ "manage-account" ] } }, @@ -39,7 +39,7 @@ "value" : "password" } ], "realmRoles": [ "user" ], - "applicationRoles": { + "clientRoles": { "account": [ "manage-account" ] } }, @@ -54,7 +54,7 @@ "value" : "password" } ], "realmRoles": [ "user" ], - "applicationRoles": { + "clientRoles": { "account": [ "manage-account" ] } }, @@ -69,7 +69,7 @@ "value" : "password" } ], "realmRoles": [ "user","admin" ], - "applicationRoles": { + "clientRoles": { "realm-management": [ "realm-admin" ] } } @@ -92,7 +92,7 @@ "roles": ["user"] } ], - "applications": [ + "clients": [ { "name": "customer-portal", "enabled": true, @@ -146,12 +146,11 @@ "adminUrl": "/database", "baseUrl": "/database", "bearerOnly": true - } - ], - "oauthClients": [ + }, { "name": "third-party", "enabled": true, + "consentRequired": true, "redirectUris": [ "/oauth-client/*", "/oauth-client-cdi/*" @@ -162,11 +161,11 @@ "name": "admin-client", "enabled": true, "publicClient": true, - "directGrantsOnly": true - + "directGrantsOnly": true, + "consentRequired": true } ], - "applicationScopeMappings": { + "clientScopeMappings": { "realm-management": [ { "client": "admin-client", diff --git a/examples/fuse/testrealm.json b/examples/fuse/testrealm.json index 9ec73f9c73..d474e66de4 100644 --- a/examples/fuse/testrealm.json +++ b/examples/fuse/testrealm.json @@ -24,7 +24,7 @@ "value" : "password" } ], "realmRoles": [ "user" ], - "applicationRoles": { + "clientRoles": { "account": [ "manage-account" ] } }, @@ -39,7 +39,7 @@ "value" : "password" } ], "realmRoles": [ "user" ], - "applicationRoles": { + "clientRoles": { "account": [ "manage-account" ] } }, @@ -54,7 +54,7 @@ "value" : "password" } ], "realmRoles": [ "user" ], - "applicationRoles": { + "clientRoles": { "account": [ "manage-account" ] } }, @@ -69,7 +69,7 @@ "value" : "password" } ], "realmRoles": [ "user","admin" ], - "applicationRoles": { + "clientRoles": { "realm-management": [ "realm-admin" ] } }, @@ -84,7 +84,7 @@ "value" : "password" } ], "realmRoles": [ "user", "jmxAdmin" ], - "applicationRoles": { + "clientRoles": { "account": [ "manage-account" ], "realm-management": [ "realm-admin" ] } @@ -134,7 +134,7 @@ } ] }, - "applications": [ + "clients": [ { "name": "customer-portal", "enabled": true, @@ -178,14 +178,13 @@ "adminUrl": "http://localhost:8383/admin-camel-endpoint", "baseUrl": "http://localhost:8383/admin-camel-endpoint", "bearerOnly": true - } - ], - "oauthClients": [ + }, { "name": "ssh-jmx-admin-client", "enabled": true, "publicClient": false, "directGrantsOnly": true, + "consentRequired": true, "secret": "password" } ], diff --git a/examples/js-console/example-realm.json b/examples/js-console/example-realm.json index ddbb6eaf6a..81c92aa1f5 100755 --- a/examples/js-console/example-realm.json +++ b/examples/js-console/example-realm.json @@ -18,7 +18,7 @@ "value" : "password" } ], "realmRoles": [ "user" ], - "applicationRoles": { + "clientRoles": { "account": ["view-profile", "manage-account"] } } @@ -41,7 +41,7 @@ "roles": ["user"] } ], - "applications": [ + "clients": [ { "name": "js-console", "enabled": true, @@ -53,7 +53,7 @@ "webOrigins": [] } ], - "applicationScopeMappings": { + "clientScopeMappings": { "account": [ { "client": "js-console", diff --git a/examples/kerberos/kerberosrealm.json b/examples/kerberos/kerberosrealm.json index 4339e364a5..006961ca0d 100644 --- a/examples/kerberos/kerberosrealm.json +++ b/examples/kerberos/kerberosrealm.json @@ -13,7 +13,7 @@ "roles": [ "user" ] } ], - "applications": [ + "clients": [ { "name": "kerberos-app", "enabled": true, diff --git a/examples/multi-tenant/tenant1-realm.json b/examples/multi-tenant/tenant1-realm.json index e7a9cc9dfa..e759b12644 100644 --- a/examples/multi-tenant/tenant1-realm.json +++ b/examples/multi-tenant/tenant1-realm.json @@ -20,7 +20,7 @@ "value" : "user-tenant1" } ], "realmRoles": [ "user" ], - "applicationRoles": { + "clientRoles": { "multi-tenant": [ "user" ] } } @@ -40,7 +40,7 @@ } ], - "applications": [ + "clients": [ { "name": "multi-tenant", "enabled": true, diff --git a/examples/multi-tenant/tenant2-realm.json b/examples/multi-tenant/tenant2-realm.json index d628b731f1..2cd0e618cf 100644 --- a/examples/multi-tenant/tenant2-realm.json +++ b/examples/multi-tenant/tenant2-realm.json @@ -21,7 +21,7 @@ "value" : "user-tenant2" } ], "realmRoles": [ "user" ], - "applicationRoles": { + "clientRoles": { "multi-tenant": [ "user" ] } } @@ -41,9 +41,9 @@ } ], - "applications": [ + "clients": [ { - "name": "multi-tenant", + "clientId": "multi-tenant", "enabled": true, "adminUrl": "/multitenant/tenant2", "baseUrl": "/multitenant/tenant2", diff --git a/examples/saml/testsaml.json b/examples/saml/testsaml.json index b7f66af0de..7cf4a8ef52 100755 --- a/examples/saml/testsaml.json +++ b/examples/saml/testsaml.json @@ -25,9 +25,9 @@ "realmRoles": ["manager"] } ], - "applications": [ + "clients": [ { - "name": "http://localhost:8080/sales-post/", + "clientId": "http://localhost:8080/sales-post/", "enabled": true, "fullScopeAllowed": true, "protocol": "saml", @@ -41,7 +41,7 @@ } }, { - "name": "http://localhost:8080/sales-post-sig/", + "clientId": "http://localhost:8080/sales-post-sig/", "enabled": true, "protocol": "saml", "fullScopeAllowed": true, @@ -60,7 +60,7 @@ } }, { - "name": "http://localhost:8080/sales-post-enc/", + "clientId": "http://localhost:8080/sales-post-enc/", "enabled": true, "protocol": "saml", "fullScopeAllowed": true, @@ -82,7 +82,7 @@ } }, { - "name": "http://localhost:8080/employee/", + "clientId": "http://localhost:8080/employee/", "enabled": true, "fullScopeAllowed": true, "protocol": "saml", @@ -96,7 +96,7 @@ } }, { - "name": "http://localhost:8080/employee-sig/", + "clientId": "http://localhost:8080/employee-sig/", "enabled": true, "protocol": "saml", "fullScopeAllowed": true,