Aaron Schulz has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/71156


Change subject: [WIP] Added consumer request controllers.
......................................................................

[WIP] Added consumer request controllers.

Change-Id: If6c944f00217d8bd5d3caa394e37398e18fe4e6e
---
M OAuth.setup.php
M backend/schema/mysql/OAuth.sql
2 files changed, 11 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OAuth 
refs/changes/56/71156/1

diff --git a/OAuth.setup.php b/OAuth.setup.php
index 52d15ac..bf6fa88 100644
--- a/OAuth.setup.php
+++ b/OAuth.setup.php
@@ -17,7 +17,7 @@
                # Basic directory layout
                $backendDir       = "$dir/backend";
                $schemaDir        = "$dir/backend/schema";
-               $businessDir      = "$dir/business";
+               $controllerDir    = "$dir/controller";
                $apiDir           = "$dir/api";
                $frontendDir      = "$dir/frontend";
                $langDir          = "$dir/frontend/language/";
diff --git a/backend/schema/mysql/OAuth.sql b/backend/schema/mysql/OAuth.sql
index e634310..08a05dd 100644
--- a/backend/schema/mysql/OAuth.sql
+++ b/backend/schema/mysql/OAuth.sql
@@ -11,29 +11,30 @@
     oarc_id integer unsigned NOT NULL auto_increment PRIMARY KEY,
     -- OAuth consumer key and secret (or RSA key)
     oarc_consumer_key varbinary(32) NOT NULL,
-    oarc_secret_key varbinary(32) NULL,
-    oarc_rsa_key blob NULL,
-    -- Callback URL
-    oarc_callback_url blob NOT NULL,
     -- Name of the application
     oarc_name varchar(255) binary NOT NULL,
     -- Key to the user who proposed the application
     oarc_user_id integer unsigned NOT NULL,
     -- Version of the application
     oarc_version varbinary(32) NOT NULL,
+    -- Callback URL
+    oarc_callback_url blob NOT NULL,
     -- Application description
     oarc_description blob NOT NULL,
     -- Confirmed contact email address
     oarc_email varchar(255) binary NOT NULL,
     -- What wiki this is allowed on (a single wiki or '*' for all)
     oarc_wiki varbinary(32) NOT NULL,
-    -- JSON blob of allowed IP ranges
-    oarc_origin_restrictions blob NOT NULL,
     -- Timestamp of consumer proposal
     oarc_registration varbinary(14) NOT NULL,
 
     -- Mutable fields below:
-    -- Stage in registration pipeline (0=new, 1=held, 2=approved, 3=rejected, 
4=expired, 5=disabled)
+    oarc_secret_key varbinary(32) NULL,
+    oarc_rsa_key blob NULL,
+    -- JSON blob of allowed IP ranges
+    oarc_restrictions blob NOT NULL,
+    -- Stage in registration pipeline:
+    -- (0=proposed, 1=held, 2=approved, 3=rejected, 4=expired, 5=disabled)
     oarc_stage tinyint unsigned NOT NULL DEFAULT 0,
     -- Timestamp of the last stage change
     oarc_stage_timestamp varbinary(14) NOT NULL,
@@ -41,7 +42,8 @@
     oarc_deleted tinyint unsigned NOT NULL DEFAULT 0
 ) /*$wgDBTableOptions*/;
 
-CREATE UNIQUE INDEX /*i*/oarc_consumer_key ON /*_*/oauth_registered_consumer 
(oarc_consumer_key);
+CREATE UNIQUE INDEX /*i*/oarc_consumer_key
+       ON /*_*/oauth_registered_consumer (oarc_consumer_key);
 CREATE UNIQUE INDEX /*i*/oarc_name_version_user
     ON /*_*/oauth_registered_consumer (oarc_name,oarc_user_id,oarc_version);
 CREATE INDEX /*i*/oarc_user_id ON /*_*/oauth_registered_consumer 
(oarc_user_id);

-- 
To view, visit https://gerrit.wikimedia.org/r/71156
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If6c944f00217d8bd5d3caa394e37398e18fe4e6e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to