Merge pull request #539 from owncloud/stable8.1-insertid

Zero as a last inserted memberId

lib/db.php

@@ -43,7 +43,7 @@ public function insert(){
 	 * @return mixed
 	 */
 	public function getLastInsertId(){
-		return \OCP\DB::insertid($this->tableName);
+		return \OC::$server->getDatabaseConnection()->lastInsertId($this->tableName);
 	}
 
 	/**

lib/db/session.php

@@ -12,6 +12,8 @@
 
 namespace OCA\Documents\Db;
 
+use OCP\Security\ISecureRandom;
+
 use OCA\Documents\Filter;
 
 /**
@@ -88,6 +90,7 @@ public static function start($uid, $file){
 		if (!$member->insert()){
 			throw new \Exception('Failed to add member into database');
 		}
+		$sessionData['member_id'] = (string) $member->getLastInsertId();
 
 		// Do we have OC_Avatar in out disposal?
 		if (\OC_Config::getValue('enable_avatars', true) !== true){
@@ -98,8 +101,6 @@ public static function start($uid, $file){
 
 		$displayName = $file->isPublicShare() ? $uid . ' ' . \OCA\Documents\Db\Member::getGuestPostfix() : \OCP\User::getDisplayName($uid);
 		$userId = $file->isPublicShare() ? $displayName : \OCP\User::getUser();
-
-		$sessionData['member_id'] = (string) $member->getLastInsertId();
 		$op = new \OCA\Documents\Db\Op();
 		$op->addMember(
 					$sessionData['es_id'],
@@ -204,7 +205,9 @@ public function getInfo($esId){
 	protected function getUniqueSessionId(){
 		$testSession = new Session();
 		do{
-			$id = \OC_Util::generateRandomBytes(30);
+			$id = \OC::$server->getSecureRandom()
+				->getMediumStrengthGenerator()
+				->generate(30, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS);
 		} while ($testSession->load($id)->hasData());
 
 		return $id;