Decided we didn't need to keep the token secret in the

Oauth_application_user record

diff --git a/classes/Oauth_application_user.php b/classes/Oauth_application_user.php
index e4c018f21982dbc8365fc01afecced64bb2b5561..a05371f563a67a84c0ef6d1eadeb7134dc08df71 100644 (file)
--- a/classes/Oauth_application_user.php
+++ b/classes/Oauth_application_user.php
@@ -14,7 +14,6 @@ class Oauth_application_user extends Memcached_DataObject
     public $application_id;                  // int(4)  primary_key not_null
     public $access_type;                     // tinyint(1)
     public $token;                           // varchar(255)
-    public $secret;                          // varchar(255)
     public $verifier;                        // varchar(255)
     public $created;                         // datetime   not_null
     public $modified;                        // timestamp   not_null default_CURRENT_TIMESTAMP

diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index 43f6c4466d2665b35455b24157b8cb7d2e9f9489..b358bbf60a5f62d39e31cf87b3304ea107e1f53e 100644 (file)
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -373,7 +373,6 @@ profile_id = 129
 application_id = 129
 access_type = 17
 token = 2
-secret = 2
 verifier = 2
 created = 142
 modified = 384

diff --git a/db/statusnet.sql b/db/statusnet.sql
index eb470606743024d76a42babf02367198accc11b1..c3160bcf87fe41bb96d231fa9bb3b145ab687e43 100644 (file)
--- a/db/statusnet.sql
+++ b/db/statusnet.sql
@@ -229,8 +229,7 @@ create table oauth_application_user (
     profile_id integer not null comment 'user of the application' references profile (id),
     application_id integer not null comment 'id of the application' references oauth_application (id),
     access_type tinyint default 0 comment 'access type, bit 1 = read, bit 2 = write, bit 3 = revoked',
-    token varchar(255) comment 'authorization token',
-    secret varchar(255) comment 'token secret',
+    token varchar(255) comment 'request or access token',
     verifier varchar(255) not null comment 'verification code',
     created datetime not null comment 'date this record was created',
     modified timestamp comment 'date this record was modified',