Elgato_dark/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite synced 2026-05-24 09:28:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'feat-prepare-0-15' of https://github.com/appwrite/appwrite into ui-webhook-signature

Browse source
This commit is contained in:
Torsten Dittmann 2022-06-20 23:39:23 +02:00
commit d97698f2f8
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.github/workflows/tests.yml vendored
View file

@ -41,7 +41,6 @@ jobs:
- name: Teardown - name: Teardown
if: always() if: always()
run: | run: |
docker compose down -v docker ps -aq | xargs docker rm --force || true
docker ps -aq | xargs docker rm --force docker volume prune --force || true
docker volume prune --force docker network prune --force || true
docker network prune --force

3
app/controllers/api/account.php
View file

@ -909,6 +909,7 @@ App::post('/v1/account/sessions/phone')
$token = new Document([ $token = new Document([
'$id' => $dbForProject->getId(), '$id' => $dbForProject->getId(),
'userId' => $user->getId(), 'userId' => $user->getId(),
'userInternalId' => $user->getInternalId(),
'type' => Auth::TOKEN_TYPE_PHONE, 'type' => Auth::TOKEN_TYPE_PHONE,
'secret' => $secret, 'secret' => $secret,
'expire' => $expire, 'expire' => $expire,
@ -995,6 +996,7 @@ App::put('/v1/account/sessions/phone')
[ [
'$id' => $dbForProject->getId(), '$id' => $dbForProject->getId(),
'userId' => $user->getId(), 'userId' => $user->getId(),
'userInternalId' => $user->getInternalId(),
'provider' => Auth::SESSION_PROVIDER_PHONE, 'provider' => Auth::SESSION_PROVIDER_PHONE,
'secret' => Auth::hash($secret), // One way hash encryption to protect DB leak 'secret' => Auth::hash($secret), // One way hash encryption to protect DB leak
'expire' => $expiry, 'expire' => $expiry,
@ -2281,6 +2283,7 @@ App::post('/v1/account/verification/phone')
$verification = new Document([ $verification = new Document([
'$id' => $dbForProject->getId(), '$id' => $dbForProject->getId(),
'userId' => $user->getId(), 'userId' => $user->getId(),
'userInternalId' => $user->getInternalId(),
'type' => Auth::TOKEN_TYPE_PHONE, 'type' => Auth::TOKEN_TYPE_PHONE,
'secret' => $secret, 'secret' => $secret,
'expire' => $expire, 'expire' => $expire,