summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
Diffstat (limited to 'classes')
-rw-r--r--classes/Oauth_application_user.php2
-rw-r--r--classes/Oauth_token_association.php44
-rw-r--r--classes/statusnet.ini13
3 files changed, 57 insertions, 2 deletions
diff --git a/classes/Oauth_application_user.php b/classes/Oauth_application_user.php
index fcf6553ff..e1b4b8c04 100644
--- a/classes/Oauth_application_user.php
+++ b/classes/Oauth_application_user.php
@@ -13,7 +13,7 @@ class Oauth_application_user extends Memcached_DataObject
public $profile_id; // int(4) primary_key not_null
public $application_id; // int(4) primary_key not_null
public $access_type; // tinyint(1)
- public $token; // varchar(255) primary_key not_null
+ public $token; // varchar(255)
public $created; // datetime not_null
public $modified; // timestamp not_null default_CURRENT_TIMESTAMP
diff --git a/classes/Oauth_token_association.php b/classes/Oauth_token_association.php
new file mode 100644
index 000000000..051732712
--- /dev/null
+++ b/classes/Oauth_token_association.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Table Definition for oauth_association
+ */
+require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
+
+class Oauth_token_association extends Memcached_DataObject
+{
+ ###START_AUTOCODE
+ /* the code below is auto generated do not remove the above tag */
+
+ public $__table = 'oauth_token_association'; // table name
+ public $profile_id; // int(4) primary_key not_null
+ public $application_id; // int(4) primary_key not_null
+ public $token; // varchar(255) primary key not null
+ public $created; // datetime not_null
+ public $modified; // timestamp not_null default_CURRENT_TIMESTAMP
+
+ /* Static get */
+ function staticGet($k, $v = NULL) {
+ return Memcached_DataObject::staticGet('oauth_token_association', $k, $v);
+ }
+ /* the code above is auto generated do not remove the tag below */
+ ###END_AUTOCODE
+
+ static function getByUserAndToken($user, $token)
+ {
+ if (empty($user) || empty($token)) {
+ return null;
+ }
+
+ $oau = new oauth_request_token();
+
+ $oau->profile_id = $user->id;
+ $oau->token = $token;
+ $oau->limit(1);
+
+ $result = $oau->find(true);
+
+ return empty($result) ? null : $oau;
+ }
+
+}
+
diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index 7aa115fec..ef631e28d 100644
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -393,13 +393,24 @@ name = U
profile_id = 129
application_id = 129
access_type = 17
-token = 130
+token = 2
created = 142
modified = 384
[oauth_application_user__keys]
profile_id = K
application_id = K
+
+[oauth_token_association]
+profile_id = 129
+application_id = 129
+token = 130
+created = 142
+modified = 384
+
+[oauth_token_association__keys]
+profile_id = K
+application_id = K
token = K
[profile]