keycloak-memoizeit

diff --git a/examples/authz/photoz/photoz-authz-policy/src/main/resources/com/photoz/authz/policy/contextual/Main.drl b/examples/authz/photoz/photoz-authz-policy/src/main/resources/com/photoz/authz/policy/contextual/Main.drl
index d187467..8a6a772 100644
--- a/examples/authz/photoz/photoz-authz-policy/src/main/resources/com/photoz/authz/policy/contextual/Main.drl
+++ b/examples/authz/photoz/photoz-authz-policy/src/main/resources/com/photoz/authz/policy/contextual/Main.drl
@@ -7,7 +7,7 @@ rule "Authorize Using Context Information"
     when
        $evaluation : Evaluation(
            $attributes: context.attributes,
-           $attributes.containsValue("kc.authz.context.authc.method", "otp"),
+           $attributes.containsValue("kc.identity.authc.method", "otp"),
            $attributes.containsValue("someAttribute", "you_can_access")
        )
     then

diff --git a/examples/authz/photoz/photoz-restful-api-authz-service.json b/examples/authz/photoz/photoz-restful-api-authz-service.json
index 0c575cd..1d0356c 100644
--- a/examples/authz/photoz/photoz-restful-api-authz-service.json
+++ b/examples/authz/photoz/photoz-restful-api-authz-service.json
@@ -77,7 +77,7 @@
       "logic": "POSITIVE",
       "decisionStrategy": "UNANIMOUS",
       "config": {
-        "code": "var contextAttributes = $evaluation.getContext().getAttributes();\n\nif (contextAttributes.containsValue('kc.authz.context.client.network.ip_address', '127.0.0.1')) {\n    $evaluation.grant();\n}"
+        "code": "var contextAttributes = $evaluation.getContext().getAttributes();\n\nif (contextAttributes.containsValue('kc.client.network.ip_address', '127.0.0.1')) {\n    $evaluation.grant();\n}"
       }
     },
     {

diff --git a/services/src/main/java/org/keycloak/authorization/admin/ResourceServerService.java b/services/src/main/java/org/keycloak/authorization/admin/ResourceServerService.java
index 1c31fcc..84e5295 100644
--- a/services/src/main/java/org/keycloak/authorization/admin/ResourceServerService.java
+++ b/services/src/main/java/org/keycloak/authorization/admin/ResourceServerService.java
@@ -463,7 +463,7 @@ public class ResourceServerService {
                 "\n" +
                 "// using attributes from the evaluation context to obtain the realm\n" +
                 "var contextAttributes = context.getAttributes();\n" +
-                "var realmName = contextAttributes.getValue('kc.authz.context.authc.realm').asString(0);\n" +
+                "var realmName = contextAttributes.getValue('kc.realm.name').asString(0);\n" +
                 "\n" +
                 "// using attributes from the identity to obtain the issuer\n" +
                 "var identity = context.getIdentity();\n" +

diff --git a/services/src/main/java/org/keycloak/authorization/common/KeycloakEvaluationContext.java b/services/src/main/java/org/keycloak/authorization/common/KeycloakEvaluationContext.java
index bc967b9..fc929ec 100644
--- a/services/src/main/java/org/keycloak/authorization/common/KeycloakEvaluationContext.java
+++ b/services/src/main/java/org/keycloak/authorization/common/KeycloakEvaluationContext.java
@@ -57,23 +57,23 @@ public class KeycloakEvaluationContext implements EvaluationContext {
     public Attributes getAttributes() {
         HashMap<String, Collection<String>> attributes = new HashMap<>();
 
-        attributes.put("kc.authz.context.time.date_time", Arrays.asList(new SimpleDateFormat("MM/dd/yyyy hh:mm:ss").format(new Date())));
-        attributes.put("kc.authz.context.client.network.ip_address", Arrays.asList(this.keycloakSession.getContext().getConnection().getRemoteAddr()));
-        attributes.put("kc.authz.context.client.network.host", Arrays.asList(this.keycloakSession.getContext().getConnection().getRemoteHost()));
+        attributes.put("kc.time.date_time", Arrays.asList(new SimpleDateFormat("MM/dd/yyyy hh:mm:ss").format(new Date())));
+        attributes.put("kc.client.network.ip_address", Arrays.asList(this.keycloakSession.getContext().getConnection().getRemoteAddr()));
+        attributes.put("kc.client.network.host", Arrays.asList(this.keycloakSession.getContext().getConnection().getRemoteHost()));
 
         AccessToken accessToken = this.identity.getAccessToken();
 
         if (accessToken != null) {
-            attributes.put("kc.authz.context.client_id", Arrays.asList(accessToken.getIssuedFor()));
+            attributes.put("kc.client.id", Arrays.asList(accessToken.getIssuedFor()));
         }
 
         List<String> userAgents = this.keycloakSession.getContext().getRequestHeaders().getRequestHeader("User-Agent");
 
         if (userAgents != null) {
-            attributes.put("kc.authz.context.client.user_agent", userAgents);
+            attributes.put("kc.client.user_agent", userAgents);
         }
 
-        attributes.put("kc.authz.context.authc.realm", Arrays.asList(this.keycloakSession.getContext().getRealm().getName()));
+        attributes.put("kc.realm.name", Arrays.asList(this.keycloakSession.getContext().getRealm().getName()));
 
         return Attributes.from(attributes);
     }

diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/authorization/AbstractPhotozAdminTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/authorization/AbstractPhotozAdminTest.java
index 8876f30..0786eab 100644
--- a/testsuite/integration/src/test/java/org/keycloak/testsuite/authorization/AbstractPhotozAdminTest.java
+++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/authorization/AbstractPhotozAdminTest.java
@@ -261,7 +261,7 @@ public abstract class AbstractPhotozAdminTest extends AbstractAuthorizationTest 
 
             config.put("code",
                     "var contextAttributes = $evaluation.getContext().getAttributes();" +
-                    "var networkAddress = contextAttributes.getValue('kc.authz.context.client.network.ip_address');" +
+                    "var networkAddress = contextAttributes.getValue('kc.client.network.ip_address');" +
                     "if ('127.0.0.1'.equals(networkAddress.asInetAddress(0).getHostAddress())) {" +
                         "$evaluation.grant();" +
                     "}");

diff --git a/themes/src/main/resources/theme/base/admin/resources/js/authz/authz-controller.js b/themes/src/main/resources/theme/base/admin/resources/js/authz/authz-controller.js
index e07ed1a..ecbe9d5 100644
--- a/themes/src/main/resources/theme/base/admin/resources/js/authz/authz-controller.js
+++ b/themes/src/main/resources/theme/base/admin/resources/js/authz/authz-controller.js
@@ -1044,7 +1044,7 @@ module.controller('PolicyEvaluateCtrl', function($scope, $http, $route, $locatio
             custom: true
         },
         {
-            key : "kc.authz.context.authc.method",
+            key : "kc.identity.authc.method",
             name : "Authentication Method",
             values: [
                 {
@@ -1062,23 +1062,23 @@ module.controller('PolicyEvaluateCtrl', function($scope, $http, $route, $locatio
             ]
         },
         {
-            key : "kc.authz.context.authc.realm",
+            key : "kc.realm.name",
             name : "Realm"
         },
         {
-            key : "kc.authz.context.time.date_time",
+            key : "kc.time.date_time",
             name : "Date/Time (MM/dd/yyyy hh:mm:ss)"
         },
         {
-            key : "kc.authz.context.client.network.ip_address",
+            key : "kc.client.network.ip_address",
             name : "Client IPv4 Address"
         },
         {
-            key : "kc.authz.context.client.network.host",
+            key : "kc.client.network.host",
             name : "Client Host"
         },
         {
-            key : "kc.authz.context.client.user_agent",
+            key : "kc.client.user_agent",
             name : "Client/User Agent"
         }
     ];