no bug - cleanup oauth2 code and make a better mechanism for splitting routes out...

diff --git a/Bugzilla/Quantum.pm b/Bugzilla/Quantum.pm
index 6d9b08df9edcde2b43793d786b717de97a829b23..b41d6dec20ef4a4bcb922cd11b612fca55784d98 100644 (file)
--- a/Bugzilla/Quantum.pm
+++ b/Bugzilla/Quantum.pm
@@ -21,7 +21,7 @@ use Bugzilla::Extension             ();
 use Bugzilla::Install::Requirements ();
 use Bugzilla::Logging;
 use Bugzilla::Quantum::CGI;
-use Bugzilla::Quantum::OAuth2 qw(oauth2);
+use Bugzilla::Quantum::OAuth2::Clients;
 use Bugzilla::Quantum::SES;
 use Bugzilla::Quantum::Home;
 use Bugzilla::Quantum::API;
@@ -47,9 +47,7 @@ sub startup {
     unless $ENV{BUGZILLA_DISABLE_SIZELIMIT};
   $self->plugin('ForwardedFor') if Bugzilla->has_feature('better_xff');
   $self->plugin('Bugzilla::Quantum::Plugin::Helpers');
-
-  # OAuth2 Support
-  oauth2($self);
+  $self->plugin('Bugzilla::Quantum::Plugin::OAuth2');
 
   # hypnotoad is weird and doesn't look for MOJO_LISTEN itself.
   $self->config(
@@ -103,7 +101,7 @@ sub setup_routes {
   my ($self) = @_;
 
   my $r = $self->routes;
-  Bugzilla::Quantum::CGI->load_all($r);
+  Bugzilla::Quantum::CGI->setup_routes($r);
   Bugzilla::Quantum::CGI->load_one('bzapi_cgi',
     'extensions/BzAPI/bin/rest.cgi');
 
@@ -140,17 +138,9 @@ sub setup_routes {
   $r->any('/login')->to('CGI#index_cgi' => {'GoAheadAndLogIn' => '1'});
   $r->any('/:new_bug' => [new_bug => qr{new[-_]bug}])->to('CGI#new_bug_cgi');
 
-  $r->get('/api/user/profile')->to('API#user_profile');
-
-  my $ses_auth = $r->under(
-    '/ses' => sub {
-      my ($c) = @_;
-      my $lc = Bugzilla->localconfig;
-
-      return $c->basic_auth('SES', $lc->{ses_username}, $lc->{ses_password});
-    }
-  );
-  $ses_auth->any('/index.cgi')->to('SES#main');
+  Bugzilla::Quantum::API->setup_routes($r);
+  Bugzilla::Quantum::SES->setup_routes($r);
+  Bugzilla::Quantum::OAuth2::Clients->setup_routes($r);
 }
 
 1;

diff --git a/Bugzilla/Quantum/API.pm b/Bugzilla/Quantum/API.pm
index 320e966047e1d93dccb84b27d6357569991df8d7..02f277f1eec1e801da761e7d50ad3d9718c2cfff 100644 (file)
--- a/Bugzilla/Quantum/API.pm
+++ b/Bugzilla/Quantum/API.pm
@@ -9,6 +9,11 @@ package Bugzilla::Quantum::API;
 use 5.10.1;
 use Mojo::Base qw( Mojolicious::Controller );
 
+sub setup_routes {
+  my ($class, $r) = @_;
+  $r->get('/api/user/profile')->to('API#user_profile');
+}
+
 sub user_profile {
   my ($self) = @_;
 

diff --git a/Bugzilla/Quantum/CGI.pm b/Bugzilla/Quantum/CGI.pm
index 41d6af16b02a1e984411eb3a6f317e2d58908cac..f8f179c18e919c61ceeae5ead00e4df3426d2f6d 100644 (file)
--- a/Bugzilla/Quantum/CGI.pm
+++ b/Bugzilla/Quantum/CGI.pm
@@ -23,7 +23,7 @@ use Bugzilla::Constants qw(bz_locations USAGE_MODE_BROWSER);
 our $C;
 my %SEEN;
 
-sub load_all {
+sub setup_routes {
   my ($class, $r) = @_;
 
   foreach my $file (glob '*.cgi') {

diff --git a/Bugzilla/Quantum/OAuth2/Clients.pm b/Bugzilla/Quantum/OAuth2/Clients.pm
index 9a81f821d0c04d1607c79637f841dfca16b6e812..06963ad37e438e309c38f29a7e1738bb83a96b32 100644 (file)
--- a/Bugzilla/Quantum/OAuth2/Clients.pm
+++ b/Bugzilla/Quantum/OAuth2/Clients.pm
@@ -6,17 +6,37 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Quantum::OAuth2::Clients;
+use 5.10.1;
 use Mojo::Base 'Mojolicious::Controller';
 
-use 5.10.1;
 use List::Util qw(first);
-use Moo;
-
-use Bugzilla;
+use Bugzilla::Constants;
 use Bugzilla::Error;
 use Bugzilla::Token;
 use Bugzilla::Util qw(generate_random_password);
 
+sub setup_routes {
+  my ($class, $r) = @_;
+
+  # Manage the client list
+  my $client_route = $r->under(
+    '/admin/oauth' => sub {
+      my ($c) = @_;
+      my $user = $c->bugzilla->login(LOGIN_REQUIRED) || return undef;
+      $user->in_group('admin')
+        || ThrowUserError('auth_failure',
+        {group => 'admin', action => 'edit', object => 'oauth_clients'});
+      return 1;
+    }
+  );
+  $client_route->any('/list')->to('OAuth2::Clients#list')->name('list_clients');
+  $client_route->any('/create')->to('OAuth2::Clients#create')
+    ->name('create_client');
+  $client_route->any('/delete')->to('OAuth2::Clients#delete')
+    ->name('delete_client');
+  $client_route->any('/edit')->to('OAuth2::Clients#edit')->name('edit_client');
+}
+
 # Show list of clients
 sub list {
   my ($self) = @_;

diff --git a/Bugzilla/Quantum/OAuth2.pm b/Bugzilla/Quantum/Plugin/OAuth2.pm
similarity index 89%
rename from Bugzilla/Quantum/OAuth2.pm
rename to Bugzilla/Quantum/Plugin/OAuth2.pm
index d13678eb9d11aba4a422f27b297179c152b7e54f..d28479681fa1817e55c2b1d497d3fd675d882e9d 100644 (file)
--- a/Bugzilla/Quantum/OAuth2.pm
+++ b/Bugzilla/Quantum/Plugin/OAuth2.pm
@@ -5,61 +5,30 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-package Bugzilla::Quantum::OAuth2;
-
+package Bugzilla::Quantum::Plugin::OAuth2;
 use 5.10.1;
-use strict;
-use warnings;
+use Mojo::Base 'Mojolicious::Plugin::OAuth2::Server';
 
-use Bugzilla;
 use Bugzilla::Constants;
 use Bugzilla::Error;
 use Bugzilla::Logging;
 use Bugzilla::Util;
 use Bugzilla::Token;
-
 use DateTime;
-
 use Mojo::Util qw(secure_compare);
 
-use base qw(Exporter);
-our @EXPORT_OK = qw(oauth2);
-
-sub oauth2 {
-  my ($self) = @_;
-
-  $self->plugin(
-    'OAuth2::Server' => {
-      login_resource_owner      => \&_resource_owner_logged_in,
-      confirm_by_resource_owner => \&_resource_owner_confirm_scopes,
-      verify_client             => \&_verify_client,
-      store_auth_code           => \&_store_auth_code,
-      verify_auth_code          => \&_verify_auth_code,
-      store_access_token        => \&_store_access_token,
-      verify_access_token       => \&_verify_access_token,
-    }
-  );
+sub register {
+  my ($self, $app, $conf) = @_;
 
-  # Manage the client list
-  my $r            = $self->routes;
-  my $client_route = $r->under(
-    '/admin/oauth' => sub {
-      my ($c) = @_;
-      my $user = $c->bugzilla->login(LOGIN_REQUIRED) || return undef;
-      $user->in_group('admin')
-        || ThrowUserError('auth_failure',
-        {group => 'admin', action => 'edit', object => 'oauth_clients'});
-      return 1;
-    }
-  );
-  $client_route->any('/list')->to('OAuth2::Clients#list')->name('list_clients');
-  $client_route->any('/create')->to('OAuth2::Clients#create')
-    ->name('create_client');
-  $client_route->any('/delete')->to('OAuth2::Clients#delete')
-    ->name('delete_client');
-  $client_route->any('/edit')->to('OAuth2::Clients#edit')->name('edit_client');
-
-  $self->helper(
+  $conf->{login_resource_owner}     = \&_resource_owner_logged_in;
+  $conf->{confirm_by_resource_owner}= \&_resource_owner_confirm_scopes;
+  $conf->{verify_client}            = \&_verify_client;
+  $conf->{store_auth_code}          = \&_store_auth_code;
+  $conf->{verify_auth_code}         = \&_verify_auth_code;
+  $conf->{store_access_token}       = \&_store_access_token;
+  $conf->{verify_access_token}      = \&_verify_access_token;
+
+  $app->helper(
     'bugzilla.oauth' => sub {
         my ($c, @scopes) = @_;
 
@@ -75,7 +44,7 @@ sub oauth2 {
     }
   );
 
-  return 1;
+  return $self->SUPER::register($app, $conf);
 }
 
 sub _resource_owner_logged_in {

diff --git a/Bugzilla/Quantum/SES.pm b/Bugzilla/Quantum/SES.pm
index 13d482715e2bb86767b914a60e5dbf9732be1646..c2645e1a7d0102bdf63dd5bd546e9ce6131ff5b5 100644 (file)
--- a/Bugzilla/Quantum/SES.pm
+++ b/Bugzilla/Quantum/SES.pm
@@ -74,6 +74,20 @@ declare Notification,
   slurpy Any,
   ];
 
+sub setup_routes {
+  my ($class, $r) = @_;
+
+  my $ses_auth = $r->under(
+    '/ses' => sub {
+      my ($c) = @_;
+      my $lc = Bugzilla->localconfig;
+
+      return $c->basic_auth('SES', $lc->{ses_username}, $lc->{ses_password});
+    }
+  );
+  $ses_auth->any('/index.cgi')->to('SES#main');
+}
+
 sub main {
   my ($self) = @_;
   try {