YakumoLabs/nextcloud-user_external
4
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use the querybuilder instead

Browse Source 
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling
2019-01-11 14:50:01 +01:00
parent 3011974beb
commit b3565eda6c
2 changed files with 89 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
lib/base.php
View File

@@ -39,10 +39,11 @@ abstract class Base extends \OC\User\Backend{
* @return bool * @return bool
*/ */
public function deleteUser($uid) { public function deleteUser($uid) {
\OC::$server->getDatabaseConnection()->executeQuery( $query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
'DELETE FROM `*PREFIX*users_external` WHERE `uid` = ? AND `backend` = ?', $query->delete('users_external')
array($uid, $this->backend) ->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
); ->andWhere($query->expr()->eq('backend', $query->createNamedParameter($this->backend)));
$query->execute();
return true; return true;
} }
@@ -54,11 +55,15 @@ abstract class Base extends \OC\User\Backend{
* @return string display name * @return string display name
*/ */
public function getDisplayName($uid) { public function getDisplayName($uid) {
$user = \OC::$server->getDatabaseConnection()->executeQuery( $query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
'SELECT `displayname` FROM `*PREFIX*users_external`' $query->select('displayname')
. ' WHERE `uid` = ? AND `backend` = ?', ->from('users_external')
array($uid, $this->backend) ->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
)->fetch(); ->andWhere($query->expr()->eq('backend', $query->createNamedParameter($this->backend)));
$result = $query->execute();
$user = $result->fetch();
$result->closeCursor();
$displayName = trim($user['displayname'], ' '); $displayName = trim($user['displayname'], ' ');
if (!empty($displayName)) { if (!empty($displayName)) {
return $displayName; return $displayName;
@@ -73,19 +78,27 @@ abstract class Base extends \OC\User\Backend{
* @return array with all displayNames (value) and the corresponding uids (key) * @return array with all displayNames (value) and the corresponding uids (key)
*/ */
public function getDisplayNames($search = '', $limit = null, $offset = null) { public function getDisplayNames($search = '', $limit = null, $offset = null) {
$stmt = \OC::$server->getDatabaseConnection()->prepare(
'SELECT `uid`, `displayname` FROM `*PREFIX*users_external`'
. ' WHERE (LOWER(`displayname`) LIKE LOWER(?) '
. ' OR LOWER(`uid`) LIKE LOWER(?)) AND `backend` = ?',
$limit, $offset
);
$stmt->execute(['%' . $search . '%', '%' . $search . '%', $this->backend]); $connection = \OC::$server->getDatabaseConnection();
$query = $connection->getQueryBuilder();
$query->select('uid', 'displayname')
->from('users_external')
->where($query->expr()->iLike('displayname', $query->createNamedParameter('%' . $connection->escapeLikeParameter($search) . '%')))
->andWhere($query->expr()->iLike('uid', $query->createNamedParameter('%' . $connection->escapeLikeParameter($search) . '%')))
->andWhere($query->expr()->eq('backend', $query->createNamedParameter($this->backend)));
if ($limit) {
$query->setMaxResults($limit);
}
if ($offset) {
$query->setFirstResult($offset);
}
$result = $query->execute();
$displayNames = array(); $displayNames = [];
while ($row = $stmt->fetch()) { while ($row = $result->fetch()) {
$displayNames[$row['uid']] = $row['displayname']; $displayNames[$row['uid']] = $row['displayname'];
} }
$result->closeCursor();
return $displayNames; return $displayNames;
} }
@@ -96,18 +109,26 @@ abstract class Base extends \OC\User\Backend{
* @return array with all uids * @return array with all uids
*/ */
public function getUsers($search = '', $limit = null, $offset = null) { public function getUsers($search = '', $limit = null, $offset = null) {
$stmt = \OC::$server->getDatabaseConnection()->prepare( $connection = \OC::$server->getDatabaseConnection();
'SELECT `uid` FROM `*PREFIX*users_external`' $query = $connection->getQueryBuilder();
. ' WHERE LOWER(`uid`) LIKE LOWER(?) AND `backend` = ?', $query->select('uid')
$limit, $offset ->from('users_external')
); ->where($query->expr()->iLike('uid', $query->createNamedParameter($connection->escapeLikeParameter($search) . '%')))
->andWhere($query->expr()->eq('backend', $query->createNamedParameter($this->backend)));
if ($limit) {
$query->setMaxResults($limit);
}
if ($offset) {
$query->setFirstResult($offset);
}
$result = $query->execute();
$stmt->execute([$search . '%', $this->backend]); $users = [];
while ($row = $result->fetch()) {
$users = array();
while ($row = $stmt->fetch()) {
$users[] = $row['uid']; $users[] = $row['uid'];
} }
$result->closeCursor();
return $users; return $users;
} }
@@ -132,11 +153,14 @@ abstract class Base extends \OC\User\Backend{
if (!$this->userExists($uid)) { if (!$this->userExists($uid)) {
return false; return false;
} }
\OC::$server->getDatabaseConnection()->executeQuery(
'UPDATE `*PREFIX*users_external` SET `displayname` = ?' $query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
. ' WHERE LOWER(`uid`) = ? AND `backend` = ?', $query->update('users_external')
array($displayName, $uid, $this->backend) ->set('displayname', $query->createNamedParameter($displayName))
); ->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
->andWhere($query->expr()->eq('backend', $query->createNamedParameter($this->backend)));
$query->execute();
return true; return true;
} }
@@ -150,11 +174,14 @@ abstract class Base extends \OC\User\Backend{
protected function storeUser($uid) protected function storeUser($uid)
{ {
if (!$this->userExists($uid)) { if (!$this->userExists($uid)) {
\OC::$server->getDatabaseConnection()->executeQuery(
'INSERT INTO `*PREFIX*users_external` ( `uid`, `backend` )' $query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
. ' VALUES( ?, ? )', $query->insert('users_external')
array($uid, $this->backend) ->values([
); 'uid' => $query->createNamedParameter($uid),
'backend' => $query->createNamedParameter($this->backend),
]);
$query->execute();
} }
} }
@@ -166,11 +193,16 @@ abstract class Base extends \OC\User\Backend{
* @return boolean * @return boolean
*/ */
public function userExists($uid) { public function userExists($uid) {
$result = \OC::$server->getDatabaseConnection()->executeQuery( $connection = \OC::$server->getDatabaseConnection();
'SELECT COUNT(*) FROM `*PREFIX*users_external`' $query = $connection->getQueryBuilder();
. ' WHERE LOWER(`uid`) = LOWER(?) AND `backend` = ?', $query->select($query->func()->count('*', 'num_users'))
array($uid, $this->backend) ->from('users_external')
); ->where($query->expr()->iLike('uid', $query->createNamedParameter($connection->escapeLikeParameter($uid))))
return $result->fetch() > 0; ->andWhere($query->expr()->eq('backend', $query->createNamedParameter($this->backend)));
$result = $query->execute();
$users = $result->fetchColumn();
$result->closeCursor();
return $users > 0;
} }
} }

24
lib/imap.php
View File

@@ -52,25 +52,29 @@ class OC_User_IMAP extends \OCA\user_external\Base {
$uid = str_replace("%40","@",$uid); $uid = str_replace("%40","@",$uid);
} }
$result = \OC::$server->getDatabaseConnection()->executeQuery( $query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
'SELECT `userid` FROM `*PREFIX*preferences` WHERE `appid`=? AND `configkey`=? AND `configvalue`=?', $query->select('userid')
array('settings','email',$uid) ->from('preferences')
); ->where($query->expr()->eq('appid', $query->createNamedParameter('settings')))
->andWhere($query->expr()->eq('configkey', $query->createNamedParameter('email')))
->andWhere($query->expr()->eq('configvalue', $query->createNamedParameter($uid)));
$result = $query->execute();
$users = array(); $users = [];
while ($row = $result->fetch()) { while ($row = $result->fetch()) {
$users[] = $row['userid']; $users[] = $row['userid'];
} }
$result->closeCursor();
if(count($users) === 1) { if(count($users) === 1) {
$username = $uid; $username = $uid;
$uid = $users[0]; $uid = $users[0];
// Check if we only want logins from ONE domain and strip the domain part from UID // Check if we only want logins from ONE domain and strip the domain part from UID
}elseif($this->domain !== '') { }elseif($this->domain !== '') {
$pieces = explode('@', $uid); $pieces = explode('@', $uid);
if(count($pieces) === 1) { if(count($pieces) === 1) {
$username = $uid . "@" . $this->domain; $username = $uid . "@" . $this->domain;
}elseif((count($pieces) === 2) and ($pieces[1] === $this->domain)) { }elseif((count($pieces) === 2) && ($pieces[1] === $this->domain)) {
$username = $uid; $username = $uid;
$uid = $pieces[0]; $uid = $pieces[0];
}else{ }else{
@@ -83,13 +87,13 @@ class OC_User_IMAP extends \OCA\user_external\Base {
$mbox = @imap_open($this->mailbox, $username, $password, OP_HALFOPEN, 1); $mbox = @imap_open($this->mailbox, $username, $password, OP_HALFOPEN, 1);
imap_errors(); imap_errors();
imap_alerts(); imap_alerts();
if($mbox !== FALSE) { if($mbox !== false) {
imap_close($mbox); imap_close($mbox);
$uid = mb_strtolower($uid); $uid = mb_strtolower($uid);
$this->storeUser($uid); $this->storeUser($uid);
return $uid; return $uid;
}else{
return false;
} }
return false;
} }
} }