Changeset 1207 for trunk

Timestamp:

12/28/12 15:05:24 (11 years ago)

Author:

nanardon

Message:

back to application side authentication to allow a working logout

Location:

trunk/LATMOS-Accounts-Web/lib

Files:

• Catalyst/Authentication/Credential/La.pm (modified) (1 diff)
• LATMOS/Accounts/Web/Controller/Root.pm (modified) (2 diffs)

trunk/LATMOS-Accounts-Web/lib/Catalyst/Authentication/Credential/La.pm

@@ -99 +99 @@
 sub _login_auth {
     my ($self, $c, $realm, $authinfo) = @_;
-    my $authheader = $c->req->headers->header('Authorization')
-        or do {
-        $c->log->debug('No Authorization header found');   
-        return;
-    };
-    # TODO check auth type
-    my ($type, $base64) = $authheader =~ /(\w+) (\S+)/;
-    ($authinfo->{username}, $authinfo->{password})
-        = decode_base64($base64) =~ /^([^:]+):(.*)/;
+    if (!$authinfo) {
+        my $authheader = $c->req->headers->header('Authorization')
+            or do {
+            $c->log->debug('No Authorization header found');   
+            return;
+        };
+        # TODO check auth type
+        my ($type, $base64) = $authheader =~ /(\w+) (\S+)/;
+        ($authinfo->{username}, $authinfo->{password})
+            = decode_base64($base64) =~ /^([^:]+):(.*)/;
+    }
     
     if($c->model('Accounts')->db->connect(

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Root.pm

@@ -25 +25 @@
 sub auth_required : Private {
     my ( $self, $c ) = @_;
-    $c->res->status(401);
-    $c->res->content_type('text/plain');
-    $c->res->body('Authorization required.');
-    $c->res->headers->push_header(
-        'WWW-Authenticate' => 'Basic realm="Link::Accounts"'
-    );
+    $c->forward('login');
 }
 
@@ -47 +42 @@
     } else {
         # No need to login for About section
-        if (!$c->authenticate({}, 'la')) {
+        if (!$c->authenticate({ username => $c->req->param('login'), password =>
+                    $c->req->param('password') }, 'la')) {
             $c->forward('auth_required');
             return;