use internal ids
This commit is contained in:
parent
72e00d4b43
commit
62b2dc0801
|
@ -1244,7 +1244,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
|
||||||
|
|
||||||
$identityWithMatchingEmail = $dbForProject->findOne('identities', [
|
$identityWithMatchingEmail = $dbForProject->findOne('identities', [
|
||||||
Query::equal('providerEmail', [$email]),
|
Query::equal('providerEmail', [$email]),
|
||||||
Query::notEqual('userId', $userId),
|
Query::notEqual('userInternalId', $user->getInternalId()),
|
||||||
]);
|
]);
|
||||||
if (!empty($identityWithMatchingEmail)) {
|
if (!empty($identityWithMatchingEmail)) {
|
||||||
throw new Exception(Exception::USER_ALREADY_EXISTS);
|
throw new Exception(Exception::USER_ALREADY_EXISTS);
|
||||||
|
@ -1395,7 +1395,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
|
||||||
|
|
||||||
$identitiesWithMatchingEmail = $dbForProject->find('identities', [
|
$identitiesWithMatchingEmail = $dbForProject->find('identities', [
|
||||||
Query::equal('providerEmail', [$email]),
|
Query::equal('providerEmail', [$email]),
|
||||||
Query::notEqual('userId', $user->getId()),
|
Query::notEqual('userInternalId', $user->getInternalId()),
|
||||||
]);
|
]);
|
||||||
if (!empty($identitiesWithMatchingEmail)) {
|
if (!empty($identitiesWithMatchingEmail)) {
|
||||||
throw new Exception(Exception::GENERAL_BAD_REQUEST); /** Return a generic bad request to prevent exposing existing accounts */
|
throw new Exception(Exception::GENERAL_BAD_REQUEST); /** Return a generic bad request to prevent exposing existing accounts */
|
||||||
|
|
|
@ -969,7 +969,7 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
|
||||||
$user->setAttributes($dbForProject->getDocument('users', $userId)->getArrayCopy()); // Get user
|
$user->setAttributes($dbForProject->getDocument('users', $userId)->getArrayCopy()); // Get user
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($membership->getAttribute('userId') !== $user->getId()) {
|
if ($membership->getAttribute('userInternalId') !== $user->getInternalId()) {
|
||||||
throw new Exception(Exception::TEAM_INVITE_MISMATCH, 'Invite does not belong to current user (' . $user->getAttribute('email') . ')');
|
throw new Exception(Exception::TEAM_INVITE_MISMATCH, 'Invite does not belong to current user (' . $user->getAttribute('email') . ')');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1206,7 +1206,7 @@ App::patch('/v1/users/:userId/email')
|
||||||
// Makes sure this email is not already used in another identity
|
// Makes sure this email is not already used in another identity
|
||||||
$identityWithMatchingEmail = $dbForProject->findOne('identities', [
|
$identityWithMatchingEmail = $dbForProject->findOne('identities', [
|
||||||
Query::equal('providerEmail', [$email]),
|
Query::equal('providerEmail', [$email]),
|
||||||
Query::notEqual('userId', $user->getId()),
|
Query::notEqual('userInternalId', $user->getInternalId()),
|
||||||
]);
|
]);
|
||||||
if ($identityWithMatchingEmail !== false && !$identityWithMatchingEmail->isEmpty()) {
|
if ($identityWithMatchingEmail !== false && !$identityWithMatchingEmail->isEmpty()) {
|
||||||
throw new Exception(Exception::USER_EMAIL_ALREADY_EXISTS);
|
throw new Exception(Exception::USER_EMAIL_ALREADY_EXISTS);
|
||||||
|
|
Loading…
Reference in a new issue