Changeset 65

Timestamp:

12/03/10 13:24:17 (14 years ago)

Author:

nanardon

Message:

• manage user role

Location:

server/trunk/web

Files:

• Makefile.PL (modified) (1 diff)
• Sophie.spec.in (modified) (2 diffs)
• lib/Sophie.pm (modified) (2 diffs)
• lib/Sophie/Controller/Root.pm (modified) (1 diff)
• lib/Sophie/Controller/User.pm (modified) (2 diffs)

server/trunk/web/Makefile.PL

@@ -20 +20 @@
 requires 'namespace::autoclean';
 requires 'Catalyst::Plugin::Authentication' => '0';
+requires 'Catalyst::Plugin::Authorization::Roles' => '0';
 requires 'Catalyst::Plugin::Session' => '0';
 requires 'Catalyst::Plugin::Session::Store::DBI' => '0';

server/trunk/web/Sophie.spec.in

@@ -21 +21 @@
 BuildRequires: perl(YAML)
 BuildRequires: perl(Catalyst::Plugin::Authentication)
+BuildRequires: perl(Catalyst::Plugin::Authorization::Roles)
 BuildRequires: perl(Catalyst::Plugin::Session)
 BuildRequires: perl(Catalyst::Plugin::Session::State::Cookie)
@@ -41 +42 @@
 Requires: perl(YAML)
 Requires: perl(Catalyst::Plugin::Authentication)
+Requires: perl(Catalyst::Plugin::Authorization::Roles)
 Requires: perl(Catalyst::Plugin::Session)
 Requires: perl(Catalyst::Plugin::Session::State::Cookie)

server/trunk/web/lib/Sophie.pm

@@ -23 +23 @@
     Server::XMLRPC
     Authentication
+    Authorization::Roles
 /;
 
@@ -63 +64 @@
                     class => 'DBIx::Class',
                     user_model => 'Base::Users',
-                    role_relation => 'UsersRoles',
+                    role_relation => 'Roles',
                     role_field => 'rolename',
                     id_field => 'mail',
+                    # use_userdata_from_session => 1,
                 },
             },

server/trunk/web/lib/Sophie/Controller/Root.pm

@@ -53 +53 @@
 
     if ($c->action =~ m/^admin\//) {
-        if (!$c->user_exists) {
+        if (!($c->user_exists && $c->check_user_roles($c->user, 'Admin'))) {
             $c->res->redirect($c->uri_for('/login'));
         }

server/trunk/web/lib/Sophie/Controller/User.pm

@@ -50 +50 @@
     my ( $self, $c, $dataname ) = @_;
 
-    return $c->forward('fetch_user_data', [ $c->user || '', $dataname ]);
+    return $c->forward('fetch_user_data', [ $c->user->mail || '', $dataname ]);
 }
 
@@ -70 +70 @@
     my ( $self, $c, $dataname, $data ) = @_;
 
-    return $c->forward('set_user_data', [ $c->user, $dataname, $data ]);
+    return $c->forward('set_user_data', [ $c->user->mail, $dataname, $data ]);
 }