associations should expire now

diff --git a/classes/OpenID_ElggStore.php b/classes/OpenID_ElggStore.php
index de8aa226ad798578b1bf32de95919313506282fa..5f6c63e42163b8476f3f37a47ec7aa634b572d2a 100644 (file)
--- a/classes/OpenID_ElggStore.php
+++ b/classes/OpenID_ElggStore.php
@@ -26,6 +26,7 @@ class OpenID_ElggStore extends Auth_OpenID_OpenIDStore {
                $object->secret = base64_encode($association->secret);
                $object->issued = $association->issued;
                $object->lifetime = $association->lifetime;
+               $object->expires = $object->issued + $object->lifetime;
                $object->assoc_type = $association->assoc_type;
 
                $object->save();
@@ -132,7 +133,7 @@ class OpenID_ElggStore extends Auth_OpenID_OpenIDStore {
                        'type' => 'object',
                        'subtype' => 'openid_client::association',
                        'metadata_name_value_pairs' => array(
-                               array('name' => 'lifetime', 'value' => time(), 'operand' => '<')
+                               array('name' => 'expires', 'value' => time(), 'operand' => '<')
                        ),
                        'limit' => 0,
                );