Move access key creation into a helper function.

2 files changed, 15 insertions, 9 deletions

diff --git a/modules/rest/controllers/rest.php b/modules/rest/controllers/rest.php
index a6b618e8..9f0bc5b3 100644
--- a/modules/rest/controllers/rest.php
+++ b/modules/rest/controllers/rest.php
@@ -27,15 +27,7 @@ class Rest_Controller extends Controller {
       throw new Rest_Exception("Forbidden", 403);
     }
 
-    $key = ORM::factory("user_access_token")
-      ->where("user_id", "=", $user->id)
-      ->find();
-    if (!$key->loaded()) {
-      $key->user_id = $user->id;
-      $key->access_key = md5($user->name . rand());
-      $key->save();
-    }
-
+    $key = rest::get_access_token($user->id);
     rest::reply($key->access_key);
  }
 
diff --git a/modules/rest/helpers/rest.php b/modules/rest/helpers/rest.php
index fccb365e..cd3de725 100644
--- a/modules/rest/helpers/rest.php
+++ b/modules/rest/helpers/rest.php
@@ -49,6 +49,20 @@ class rest_Core {
     identity::set_active_user($user);
   }
 
+  static function get_access_token($user_id) {
+    $key = ORM::factory("user_access_token")
+      ->where("user_id", "=", $user_id)
+      ->find();
+
+    if (!$key->loaded()) {
+      $key->user_id = $user_id;
+      $key->access_key = md5(rand());
+      $key->save();
+    }
+    return $key;
+  }
+
+
   /**
    * Convert a REST url into an object.
    * Eg: "http://example.com/gallery3/index.php/rest/gallery/Family/Wedding" -> Item_Model