- ADD: OpenID creation for existing users

digitarald · Oct 1, 2008 · 9546a66 · 9546a66
1 parent c1fdabd
commit 9546a66
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 5 deletions.
diff --git a/www/app/lib/user/OurUser.class.php b/www/app/lib/user/OurUser.class.php
@@ -156,7 +156,7 @@ public function login(UserModel $user)
 		$this->setAttribute('login_at', new DateTime($this->user['login_at']), 'our.user');
 
 		$this->user['login_at'] = date('Y-m-d H:i:s');
-		$this->user->save();
+		$this->user->trySave();
 
 		$this->setAttribute('id', $this->user['id'], 'our.user');
 

diff --git a/www/app/models/UserModelTable.class.php b/www/app/models/UserModelTable.class.php
@@ -16,6 +16,18 @@ public function findOneByOpenId($url)
 		return $q->fetchOne();
 	}
 
+	public function findOneEmail($email)
+	{
+		$q = new Doctrine_Query();
+
+		$q->from('UserModel u')
+			->select('u.*, i.*')
+			->innerJoin('u.user_ids i')
+			->where('u.email = ?', array($email) );
+
+		return $q->fetchOne();
+	}
+
 	public function findOneByToken($token)
 	{
 		$q = new Doctrine_Query();

diff --git a/www/app/modules/Account/actions/LoginResponseAction.class.php b/www/app/modules/Account/actions/LoginResponseAction.class.php
@@ -36,10 +36,17 @@ public function executeRead(AgaviRequestDataHolder $rd)
 
 		if (!$user)
 		{
-			$user = $this->context->getModel('User');
-
-			$user_id = new UserIdModel();
-			$user_id['url'] = $url;
+			if (isset($params['openid_sreg_email']) )
+			{
+				$user = $table->findOneEmail($params['openid_sreg_email']);
+			}
+			if (!$user)
+			{
+				$user = $this->context->getModel('User');
+			}
+
+			$user_id = new UserIdModel();
+			$user_id['url'] = $url;
 
 			$user['user_ids'][0] = $user_id;
 		}
@@ -75,6 +82,13 @@ public function executeRead(AgaviRequestDataHolder $rd)
 		if (isset($params['openid_sreg_timezone']) )
 		{
 			$user['timezone'] = $params['openid_sreg_timezone'];
+		}
+
+		if (!$user->isValid() )
+		{
+			$this->us->addFlash('Could not update the user. If you are already registered, use your original OpenID or contact a moderator.', 'error');
+
+			return $this->handleError($rd);
 		}
 
 		if (!$user->exists() )