From: Errietta Kostala <errietta@errietta.me>
Date: Wed, 21 Jan 2015 16:47:19 +0000 (+0000)
Subject: Pass google+ data to create
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=26c6f68ff32801bfe75b2b5452a84d9e9a5c4d8b;p=scpubgit%2Fstemmaweb.git

Pass google+ data to create
---

diff --git a/lib/Text/Tradition/Directory.pm b/lib/Text/Tradition/Directory.pm
index a6101e3..078127c 100644
--- a/lib/Text/Tradition/Directory.pm
+++ b/lib/Text/Tradition/Directory.pm
@@ -443,7 +443,7 @@ sub add_user {
 	throw( "No username given" ) unless $username;
 	throw( "Invalid password - must be at least " . $self->MIN_PASS_LEN 
 		. " characters long" )
-		unless ( $self->validate_password($password) || $username =~ /^https?:/ );
+		unless ( $self->validate_password($password) || $username =~ /^https?:/  || exists ($userinfo->{openid_id}) || exists ($userinfo->{sub}));
 
     my $user = Text::Tradition::User->new(
         id => $username,
@@ -567,6 +567,8 @@ sub _find_gplus {
             password => $user->password,
             role     => $user->role,
             active   => $user->active,
+            sub      => $sub,
+            openid_id => $openid,
         });
 
     foreach my $t (@{ $user->traditions }) {