From 95d02ed13356fd03929fc68fb1a435999c41708b Mon Sep 17 00:00:00 2001
From: Torsten Dittmann <torsten.dittmann@googlemail.com>
Date: Mon, 20 Jun 2022 23:21:06 +0200
Subject: [PATCH 1/2] tests: allow teardown to fail

---
 .github/workflows/tests.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 72abd5b5ec..2ed2b65ff7 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -41,7 +41,6 @@ jobs:
     - name: Teardown
       if: always()
       run: |
-        docker compose down -v
-        docker ps -aq | xargs docker rm --force
-        docker volume prune --force
-        docker network prune --force
\ No newline at end of file
+        docker ps -aq | xargs docker rm --force || true
+        docker volume prune --force || true
+        docker network prune --force || true
\ No newline at end of file

From e553ba2d07ff1b184760db13d638c679b4eadf04 Mon Sep 17 00:00:00 2001
From: Torsten Dittmann <torsten.dittmann@googlemail.com>
Date: Mon, 20 Jun 2022 23:38:45 +0200
Subject: [PATCH 2/2] fix: account phone internal ids

---
 app/controllers/api/account.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php
index a9932c1f01..2711b5339e 100644
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@@ -909,6 +909,7 @@ App::post('/v1/account/sessions/phone')
         $token = new Document([
             '$id' => $dbForProject->getId(),
             'userId' => $user->getId(),
+            'userInternalId' => $user->getInternalId(),
             'type' => Auth::TOKEN_TYPE_PHONE,
             'secret' => $secret,
             'expire' => $expire,
@@ -995,6 +996,7 @@ App::put('/v1/account/sessions/phone')
             [
                 '$id' => $dbForProject->getId(),
                 'userId' => $user->getId(),
+                'userInternalId' => $user->getInternalId(),
                 'provider' => Auth::SESSION_PROVIDER_PHONE,
                 'secret' => Auth::hash($secret), // One way hash encryption to protect DB leak
                 'expire' => $expiry,
@@ -2281,6 +2283,7 @@ App::post('/v1/account/verification/phone')
         $verification = new Document([
             '$id' => $dbForProject->getId(),
             'userId' => $user->getId(),
+            'userInternalId' => $user->getInternalId(),
             'type' => Auth::TOKEN_TYPE_PHONE,
             'secret' => $secret,
             'expire' => $expire,