[haver-commits] r863 - in trunk: . perl/server/lib/Haver/Server/Entity perl/server/lib/Haver/Server/Wheel

[haver]

Author: dylan
Date: 2005-07-17 19:11:50 -0400 (Sun, 17 Jul 2005)
New Revision: 863

Modified:
   trunk/
   trunk/perl/server/lib/Haver/Server/Entity/Avatar.pm
   trunk/perl/server/lib/Haver/Server/Wheel/Auth.pm
   trunk/perl/server/lib/Haver/Server/Wheel/AuthReg.pm
Log:
 [EMAIL PROTECTED]:  dylan | 2005-07-17 19:11:44 -0400
 Improved AUTH:REGISTER support. Email addresses are now saved in the entity 
dump file.
 



Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/havercurs-objc:43089
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk:11166
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk-merge-10131:11178
27e50396-46e3-0310-8b22-ae223a1f35ce:/local:212
e9404bb1-7af0-0310-a7ff-e22194cd388b:/haver/local:1258
edfcd8bd-4ce7-0310-a97e-bb1efd40edf3:/local:238
   + 1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/havercurs-objc:43089
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk:11166
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk-merge-10131:11178
27e50396-46e3-0310-8b22-ae223a1f35ce:/local:212
e9404bb1-7af0-0310-a7ff-e22194cd388b:/haver/local:1259
edfcd8bd-4ce7-0310-a97e-bb1efd40edf3:/local:238

Modified: trunk/perl/server/lib/Haver/Server/Entity/Avatar.pm
===================================================================
--- trunk/perl/server/lib/Haver/Server/Entity/Avatar.pm 2005-07-17 23:11:48 UTC 
(rev 862)
+++ trunk/perl/server/lib/Haver/Server/Entity/Avatar.pm 2005-07-17 23:11:50 UTC 
(rev 863)
@@ -14,6 +14,7 @@
 field keep     => 0;
 field address  => '0.0.0.*';
 field version  => 'unknown';
+field email    => '';
 
 sub put {
        my ($self, $msg) = @_;
@@ -31,6 +32,7 @@
        return (
                address => $self->address,
                version => $self->version,
+               $self->email ? (email => $self->email) : (),
        );
 }
 
@@ -39,6 +41,7 @@
        my $data = super;
        $data->{access}   = $self->_access;
        $data->{passcode} = $self->passcode;
+       $data->{email}    = $self->email;
        return $data;
 }
 
@@ -47,6 +50,7 @@
        my $self = super($data);
        $self->_access($data->{access});
        $self->passcode($data->{passcode});
+       $self->email($data->{email});
        $self->keep(1);
 
        return $self;

Modified: trunk/perl/server/lib/Haver/Server/Wheel/Auth.pm
===================================================================
--- trunk/perl/server/lib/Haver/Server/Wheel/Auth.pm    2005-07-17 23:11:48 UTC 
(rev 862)
+++ trunk/perl/server/lib/Haver/Server/Wheel/Auth.pm    2005-07-17 23:11:50 UTC 
(rev 863)
@@ -58,6 +58,7 @@
        $hasher->add($user->passcode);
        my $need = $hasher->b64digest;
 
+       Log('debug', "'$need' == '$resp'");
        if ($need eq $resp) {
                $kernel->yield('auth_ok', $user);
        } else {

Modified: trunk/perl/server/lib/Haver/Server/Wheel/AuthReg.pm
===================================================================
--- trunk/perl/server/lib/Haver/Server/Wheel/AuthReg.pm 2005-07-17 23:11:48 UTC 
(rev 862)
+++ trunk/perl/server/lib/Haver/Server/Wheel/AuthReg.pm 2005-07-17 23:11:50 UTC 
(rev 863)
@@ -26,9 +26,14 @@
                $kernel->yield('fail', 'invalid.email', $email);
                return;
        }
+       if ($store->exists('user', $user->name)) {
+               $kernel->yield('fail', 'registered.user', $user->name);
+               return;
+       }
 
        $user->keep(1);
        $user->passcode($passcode);
+       $user->email($email);
        $store->insert($user);
        $heap->{client}->put(['AUTH:REGISTER', $user->name, $email]);
 }