X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F07google.t;h=c02faba8bf91d5a5bc1ceab2194c29d88b668f8d;hb=32d07a9852f3d340351f6bf8dcb3202a8b543be6;hp=76ee9ed53267dd9d0ae623d8172a61f151eb65ce;hpb=26c264fd732a43415827984032e37d55b8ffcc7d;p=scpubgit%2Fstemmaweb.git

diff --git a/t/07google.t b/t/07google.t
index 76ee9ed..c02faba 100644
--- a/t/07google.t
+++ b/t/07google.t
@@ -13,6 +13,7 @@ use Test::WWW::Mechanize;
 use Test::More;
 use HTML::TreeBuilder;
 use Data::Dumper;
+use IO::All;
 
 use stemmaweb::Test::DB;
 
@@ -26,7 +27,10 @@ LWP::Protocol::PSGI->register(stemmaweb->psgi_app);
 
 my $ua = Test::WWW::Mechanize->new;
 
+io("$FindBin::Bin/var")->rmtree if io("$FindBin::Bin/var")->exists;
+
 {
+    diag("Create OpenID based Google account");
     my $scope = $dir->new_scope;
 
     $ua->get_ok('http://localhost/login');
@@ -34,15 +38,18 @@ my $ua = Test::WWW::Mechanize->new;
     local *Catalyst::Authentication::Credential::OpenID::authenticate = sub {
         my ( $self, $c, $realm, $authinfo ) = @_;
 
-        return $realm->find_user({ url => 'https://www.google.com/accounts/o8/id' }, $c);
+        return $realm->find_user({
+            url => 'https://www.google.com/accounts/o8/id?id=XYZ',
+            email => 'test@example.com',
+                                 }, $c);
     };
 
-    ok !$dir->find_user({ url => 'https://www.google.com/accounts/o8/id' }), 'No such user, yet.';
+    ok !$dir->find_user({ url => 'https://www.google.com/accounts/o8/id?id=XYZ' }), 'No such user, yet.';
 
     $ua->submit_form(
         form_number => 2,
         fields => {
-            openid_identifier => 'https://www.google.com/accounts/o8/id',
+            openid_identifier => 'https://www.google.com/accounts/o8/id?id=XYZ',
         },
     );
 
@@ -50,19 +57,24 @@ my $ua = Test::WWW::Mechanize->new;
 
     $ua->get('/');
 
-    $ua->content_contains('Hello! https://www.google.com/accounts/o8/id!', 'We are logged in.');
+    $ua->content_contains('Hello! test@example.com!', 'We are logged in.');
 
-    ok $dir->find_user({ url => 'https://www.google.com/accounts/o8/id' }), 'The user is now there.';
+    diag("Verify new OpenID Google account exists");
+    ok $dir->find_user({ url => 'https://www.google.com/accounts/o8/id?id=XYZ',
+                         email => 'test@example.com',
+                       }), 'The user is now there.';
     $ua->get('/logout');
 
     # Converting to Google ID.
 
+    diag("Login/Convert to new Google+ account");
     local *stemmaweb::Authentication::Credential::Google::authenticate = sub {
         my ( $self, $c, $realm, $authinfo ) = @_;
 
         return $realm->find_user({
-                openid_id => 'https://www.google.com/accounts/o8/id',
+                openid_id => 'https://www.google.com/accounts/o8/id?id=XYZ',
                 sub        => 42,
+                email => $authinfo->{email},
             }, $c);
     };
     $ua->get_ok('http://localhost/login');
@@ -71,7 +83,7 @@ my $ua = Test::WWW::Mechanize->new;
         form_number => 1,
         fields => {
             id_token => 'something',
-            email    => 'email@example.org',
+            email    => 'test@example.com',
         },
     );
 
@@ -79,26 +91,146 @@ my $ua = Test::WWW::Mechanize->new;
 
     $ua->get('/');
 
-    $ua->content_contains('Hello! 42!', 'We are logged in.');
+    $ua->content_contains('Hello! test@example.com!', 'We are logged in.');
+
+    $ua->get_ok('/logout', 'Logged out');
 }
 
 {
+    diag("Create OpenID based Google account for email match");
     my $scope = $dir->new_scope;
 
-    ok !$dir->find_user({ url => 'https://www.google.com/accounts/o8/id' }), 'Old google-openid is gone.';
+    $ua->get_ok('http://localhost/login');
+
+    local *Catalyst::Authentication::Credential::OpenID::authenticate = sub {
+        my ( $self, $c, $realm, $authinfo ) = @_;
+
+        return $realm->find_user({
+            url => 'https://www.google.com/accounts/o8/id?id=42XYZ',
+            email => 'test42@example.com',
+                                 }, $c);
+    };
 
-    ok $dir->find_user({ sub => 42, openid_id => 'https://www.google.com/accounts/o8/id' }), 'The G+ user is there.';
+    ok !$dir->find_user({ url => 'https://www.google.com/accounts/o8/id?id=42XYZ' }), 'No such user, yet.';
 
+    $ua->submit_form(
+        form_number => 2,
+        fields => {
+            openid_identifier => 'https://www.google.com/accounts/o8/id?id=42XYZ',
+        },
+    );
+
+    $ua->content_contains('You have logged in.', 'Openid login works');
+
+    $ua->get('/');
+
+    $ua->content_contains('Hello! test42@example.com!', 'We are logged in.');
+
+    diag("Verify new OpenID Google account for email match exists");
+    ok $dir->find_user({ url => 'https://www.google.com/accounts/o8/id?id=42XYZ',
+                         email => 'test42@example.com',
+                       }), 'The user is now there.';
     $ua->get('/logout');
 
+    # Converting to Google ID.
+
+    diag("Login/Convert to new Google+ account matching only on email");
+    local *stemmaweb::Authentication::Credential::Google::authenticate = sub {
+        my ( $self, $c, $realm, $authinfo ) = @_;
+
+        return $realm->find_user({
+                openid_id => 'https://www.google.com/accounts/o8/id?id=45XYZ',
+                sub        => 45,
+                email => $authinfo->{email},
+            }, $c);
+    };
     $ua->get_ok('http://localhost/login');
 
+    $ua->submit_form(
+        form_number => 1,
+        fields => {
+            id_token => 'something',
+            email    => 'test42@example.com',
+        },
+    );
+
+    $ua->content_contains('You have logged in.', 'G+ login works');
+
+    $ua->get('/');
+
+    $ua->content_contains('Hello! test42@example.com!', 'We are logged in.');
+
+    $ua->get('/logout');
+}
+
+{
+    diag("Test converting OpenID based Google account with traditions");
+    my $scope = $dir->new_scope;
+
+    my $openid_u = $dir->find_user({ url => 'https://www.google.com/accounts/o8/id?id=AItOawlFTlpuHGcI67tqahtw7xOod9VNWffB-Qg',
+                         email => 'openid@example.org',
+                       });
+    ok($openid_u, 'The user is there.');
+
+    diag("Login/Convert to new Google+ account");
     local *stemmaweb::Authentication::Credential::Google::authenticate = sub {
         my ( $self, $c, $realm, $authinfo ) = @_;
 
         return $realm->find_user({
-                openid_id => 'https://www.google.com/accounts/o8/id',
+                openid_id => 'https://www.google.com/accounts/o8/id?id=AItOawlFTlpuHGcI67tqahtw7xOod9VNWffB-Qg',
+                sub        => 450,
+                email => $authinfo->{email},
+            }, $c);
+    };
+    $ua->get_ok('http://localhost/login');
+
+    $ua->submit_form(
+        form_number => 1,
+        fields => {
+            id_token => 'something',
+            email    => 'openid@example.org',
+        },
+    );
+
+    $ua->content_contains('You have logged in.', 'G+ login works');
+    $ua->get('/');
+    $ua->content_contains('Hello! openid@example.org!', 'We are logged in.');
+
+    my $gplus_u = $dir->find_user({
+        openid_id => 'https://www.google.com/accounts/o8/id?id=AItOawlFTlpuHGcI67tqahtw7xOod9VNWffB-Qg',
+        sub        => 450,
+        email => 'openid@example.org'
+    });
+
+    foreach my $trad_id (0..$#{ $openid_u->traditions }) {
+        is($gplus_u->traditions->[$trad_id]->name, $openid_u->traditions->[$trad_id]->name, 'Traditions were copied over to G+ user');
+    }
+
+    $ua->get('/logout');
+}
+
+{
+    diag("Verify we can login the new Google+ account again");
+    my $scope = $dir->new_scope;
+#    ok !$dir->find_user({ url => 'https://www.google.com/accounts/o8/id?id=XYZ' }), 'Old google-openid is gone.';
+
+    ok $dir->find_user({
+        sub => 42,
+        openid_id => 'https://www.google.com/accounts/o8/id?id=XYZ',
+        email    => 'test@example.com',
+    }), 'The G+ user is there.';
+
+    $ua->get('/logout');
+
+    $ua->get_ok('http://localhost/login');
+
+    local *stemmaweb::Authentication::Credential::Google::authenticate = sub {
+        my ( $self, $c, $realm, $authinfo ) = @_;
+
+        return $realm->find_user({
+                openid_id => 'https://www.google.com/accounts/o8/id?id=XYZ',
                 sub        => 42,
+                email      => $authinfo->{email},
             }, $c);
     };
 
@@ -106,7 +238,7 @@ my $ua = Test::WWW::Mechanize->new;
         form_number => 1,
         fields => {
             id_token => 'something',
-            email   => 'email@example.org',
+            email   => 'test@example.com',
         },
     );
 
@@ -114,16 +246,16 @@ my $ua = Test::WWW::Mechanize->new;
 
     $ua->get('/');
 
-    $ua->content_contains('Hello! 42!', 'We are logged in.');
+    $ua->content_contains('Hello! test@example.com!', 'We are logged in.');
 }
 
 # Brand new user just from open id.
 
 {
+    diag("Create a fresh Google+ user");
     my $scope = $dir->new_scope;
 
-
-    ok !$dir->find_user({ sub => 2, openid_id => 'https://www.google.com/accounts/o8/id2' }), 'The G+ user is not yet there.';
+    ok !$dir->find_user({ sub => 2, openid_id => 'https://www.google.com/accounts/o8/id2?id=XYZ', email => 'test2@exmple.com' }), 'The G+ user is not yet there.';
 
     $ua->get('/logout');
 
@@ -133,8 +265,9 @@ my $ua = Test::WWW::Mechanize->new;
         my ( $self, $c, $realm, $authinfo ) = @_;
 
         return $realm->find_user({
-                openid_id => 'https://www.google.com/accounts/o8/id2',
+                openid_id => 'https://www.google.com/accounts/o8/id2?id=XYZ',
                 sub        => 2,
+                email      => $authinfo->{email},
             }, $c);
     };
 
@@ -142,7 +275,7 @@ my $ua = Test::WWW::Mechanize->new;
         form_number => 1,
         fields => {
             id_token => 'something',
-            email   => 'email@example.org',
+            email    => 'test2@example.com',
         },
     );
 
@@ -150,9 +283,9 @@ my $ua = Test::WWW::Mechanize->new;
 
     $ua->get('/');
 
-    $ua->content_contains('Hello! 2!', 'We are logged in.');
+    $ua->content_contains('Hello! test2@example.com!', 'We are logged in.');
 
-    ok $dir->find_user({ sub => 2, openid_id => 'https://www.google.com/accounts/o8/id2' }), 'The G+ user is there.';
+    ok $dir->find_user({ sub => 2, openid_id => 'https://www.google.com/accounts/o8/id2?id=XYZ', email => 'test2@example.com' }), 'The G+ user is there.';
 
     $ua->get('/logout');
 
@@ -162,6 +295,52 @@ my $ua = Test::WWW::Mechanize->new;
         form_number => 1,
         fields => {
             id_token => 'something',
+            email    => 'test2@example.com',
+        },
+    );
+
+    $ua->content_contains('You have logged in.', 'We can login again');
+
+    $ua->get('/');
+
+    $ua->content_contains('Hello! test2@example.com!', 'We are logged in.');
+}
+
+# Decoding token
+
+{
+    my $scope = $dir->new_scope;
+
+    ok !$dir->find_user({ sub => 4242, openid_id => 'https://www.google.com/accounts/o8/id3', email => 'email@example.org' }), 'The G+ user is not yet there.';
+
+    $ua->get('/logout');
+
+    $ua->get_ok('http://localhost/login');
+
+    $ua->submit_form(
+        form_number => 1,
+        fields => {
+            id_token => 'eyJraWQiOiJhIiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiI0MjQyIiwib3BlbmlkX2lkIjoiaHR0cHM6Ly93d3cuZ29vZ2xlLmNvbS9hY2NvdW50cy9vOC9pZDMifQ.moNERe3UHCY4xGMPxdCqmbg2JKW5feVnYlA8jeB4CdE4c_KL3YHvICQeql-S486HT-AlWBeDJWMr6wWH1kkwz11a2D1oyJ8qCWBssHIkhfv8dm3dphmRbtzYssAOFdGsmnPH1oXolCnl-Qu9WgHkhYYnRJWHr3CkeNA6Yh1xOV3nkaa8REtJckuzh3jyKQgx_rjIFsWBPDmT1rqa_Q0XOGVK34N5tADwpcWmkb3fFnbddzd9L6MnybbFzF_S238Bpr5vNa9doXRBwvJ85AdSn1AWX8R6qVpDbbaiGL2RCahuZYF9XECYm6anee-KTKvxh02KXkG2zniKVvweaMlcbQ',
+            email    => 'email@example.org',
+        },
+    );
+
+    $ua->content_contains('You have logged in.', 'We can now log in to our created user - the token was decoded');
+
+    $ua->get('/');
+
+    $ua->content_contains('Hello! email@example.org!', 'We are logged in.');
+
+    ok $dir->find_user({ sub => 4242, openid_id => 'https://www.google.com/accounts/o8/id3', email => 'email@example.org' }), 'The G+ user is there.';
+
+    $ua->get('/logout');
+
+    $ua->get_ok('http://localhost/login');
+
+    $ua->submit_form(
+        form_number => 1,
+        fields => {
+            id_token => 'eyJraWQiOiJhIiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiI0MjQyIiwib3BlbmlkX2lkIjoiaHR0cHM6Ly93d3cuZ29vZ2xlLmNvbS9hY2NvdW50cy9vOC9pZDMifQ.moNERe3UHCY4xGMPxdCqmbg2JKW5feVnYlA8jeB4CdE4c_KL3YHvICQeql-S486HT-AlWBeDJWMr6wWH1kkwz11a2D1oyJ8qCWBssHIkhfv8dm3dphmRbtzYssAOFdGsmnPH1oXolCnl-Qu9WgHkhYYnRJWHr3CkeNA6Yh1xOV3nkaa8REtJckuzh3jyKQgx_rjIFsWBPDmT1rqa_Q0XOGVK34N5tADwpcWmkb3fFnbddzd9L6MnybbFzF_S238Bpr5vNa9doXRBwvJ85AdSn1AWX8R6qVpDbbaiGL2RCahuZYF9XECYm6anee-KTKvxh02KXkG2zniKVvweaMlcbQ',
             email   => 'email@example.org',
         },
     );
@@ -170,7 +349,9 @@ my $ua = Test::WWW::Mechanize->new;
 
     $ua->get('/');
 
-    $ua->content_contains('Hello! 2!', 'We are logged in.');
+    $ua->content_contains('Hello! email@example.org!', 'We are logged in.');
 }
 
+io("$FindBin::Bin/var")->rmtree if io("$FindBin::Bin/var")->exists;
+
 done_testing;