Changeset 336

Timestamp:

08/18/06 11:24:05 (2 years ago)

Author:

ogawa

Message:

- Now can check properly whether ClientLogin? is succeeded or not.
- Drop "auth_token" if users change the service name, because auth_tokens are not compatible between different services.

Files:

• XML-Atom-GDataClient/trunk/lib/XML/Atom/GDataClient.pm (modified) (2 diffs)

XML-Atom-GDataClient/trunk/lib/XML/Atom/GDataClient.pm

@@ -12 +12 @@
 sub service {
     my $client = shift;
-    $client->{service} = shift if @_;
+    if (@_) {
+        $client->{service} = shift;
+        delete $client->{auth_token}; # drop auth_token if changing "service"
+    }
     $client->{service};
+}
+
+sub login {
+    my $client = shift;
+    return $client->{auth_token} if $client->{auth_token};
+    my $r = $client->{ua}->post($GOOGLE_AUTH_URL, {
+        Email => $client->username,
+        Passwd => $client->password,
+        source => __PACKAGE__ . '-' . $VERSION,
+        service => $client->service,
+    });
+    return $client->error("Error on GData ClientLogin: " . $r->status_line)
+        unless $r->code == 200;
+    my($token) = $r->content =~ m/Auth=(.+)/;
+    $client->{auth_token} = $token;
+}
+
+sub make_request {
+    my $client = shift;
+    my($req) = @_;
+    $client->login or return; # do Google ClientLogin
+    $client->munge_request($req);
+    my $res = $client->{ua}->request($req);
+    $client->munge_response($res);
+    $client->{response} = $res;
+    $res;
 }
 
@@ -19 +48 @@
     my $client = shift;
     my($req) = @_;
-    unless ($client->{gdata_auth_token}) {
-        my $r = $client->{ua}->post($GOOGLE_AUTH_URL, {
-            Email => $client->username,
-            Passwd => $client->password,
-            source => __PACKAGE__ . '-' . $VERSION,
-            service => $client->service,
-        });
-        return $client->error("Error on GData ClientLogin: " . $r->status_line)
-            unless $r->code == 200;
-        my($token) = $r->content =~ m/Auth=(.+)/;
-        $client->{gdata_auth_token} = $token;
-    }
-    $req->header('Authorization', 'GoogleLogin auth=' . $client->{gdata_auth_token});
+    $req->header('Authorization', 'GoogleLogin auth=' . $client->{auth_token});
     $req->content_type('application/atom+xml');
 }
+
+sub munge_responce { }
 
 1;