Merge branch '1.0.x' into schema-x

[quix0rs-gnu-social.git] / classes / Consumer.php

diff --git a/classes/Consumer.php b/classes/Consumer.php
index ad64a8491be38f16378a6a9be918da1c6ae7d0ef..c1090b85a37674bdf0615b95776baad9f08b69b9 100644 (file)
--- a/classes/Consumer.php
+++ b/classes/Consumer.php
@@ -36,4 +36,33 @@ class Consumer extends Memcached_DataObject
         return $cons;
     }
 
+    /**
+     * Delete a Consumer and related tokens and nonces
+     *
+     * XXX: Should this happen in an OAuthDataStore instead?
+     *
+     */
+    function delete()
+    {
+        // XXX: Is there any reason NOT to do this kind of cleanup?
+
+        $this->_deleteTokens();
+        $this->_deleteNonces();
+
+        parent::delete();
+    }
+
+    function _deleteTokens()
+    {
+        $token = new Token();
+        $token->consumer_key = $this->consumer_key;
+        $token->delete();
+    }
+
+    function _deleteNonces()
+    {
+        $nonce = new Nonce();
+        $nonce->consumer_key = $this->consumer_key;
+        $nonce->delete();
+    }
 }