From bd468e4e6a6703ca225055f86e25e6531969a7d2 Mon Sep 17 00:00:00 2001
From: Martijn Hanegraaf <36103454+TheMardy@users.noreply.github.com>
Date: Fri, 14 Jan 2022 09:30:01 +0100
Subject: [PATCH 01/10] Add important detail

Update Team Membership automatically creates a session
---
 docs/references/teams/update-team-membership-status.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/references/teams/update-team-membership-status.md b/docs/references/teams/update-team-membership-status.md
index ab8f4ca36a..2788448e51 100644
--- a/docs/references/teams/update-team-membership-status.md
+++ b/docs/references/teams/update-team-membership-status.md
@@ -1 +1,3 @@
-Use this endpoint to allow a user to accept an invitation to join a team after being redirected back to your app from the invitation email received by the user.
\ No newline at end of file
+Use this endpoint to allow a user to accept an invitation to join a team after being redirected back to your app from the invitation email received by the user.
+
+If the request is successful, a session for the user is automatically created.

From ebcdfaabfb8d7d9352070f5b4d8731443f0c79d2 Mon Sep 17 00:00:00 2001
From: Eldad Fux <eldad.fux@gmail.com>
Date: Sat, 15 Jan 2022 16:50:49 +0200
Subject: [PATCH 02/10] Deny last user from leaving a project, redirect to home
 if current user leaves

---
 app/views/console/settings/index.phtml | 30 ++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/app/views/console/settings/index.phtml b/app/views/console/settings/index.phtml
index 8ea42f2f6a..7aec7036a6 100644
--- a/app/views/console/settings/index.phtml
+++ b/app/views/console/settings/index.phtml
@@ -453,7 +453,7 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
                     <div class="box margin-bottom">
                         <ul data-ls-loop="members.memberships" data-ls-as="member" class="list">
                             <li class="clear">
-                                <form class="pull-end"
+                                <form class="pull-end" data-ls-if="{{account.$id}} !== {{member.userId}}"
                                     data-analytics
                                     data-analytics-activity
                                     data-analytics-event="submit"
@@ -473,7 +473,33 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
                                     <input name="teamId" data-ls-attrs="id=leave-teamId-{{member.$id}}" type="hidden" data-ls-bind="{{console-project.teamId}}">
                                     <input name="membershipId" data-ls-attrs="id=leave-membershipId-{{member.$id}}" type="hidden" data-ls-bind="{{member.$id}}">
 
-                                    <button class="danger">Leave</button>
+                                    <button data-ls-if="1 === {{members.memberships.length}}" class="danger" disabled>Leave</button>
+                                    <button data-ls-if="1 < {{members.memberships.length}}" class="danger">Leave</button>
+                                </form>
+
+                                <form class="pull-end" data-ls-if="{{account.$id}} === {{member.userId}}"
+                                    data-analytics
+                                    data-analytics-activity
+                                    data-analytics-event="submit"
+                                    data-analytics-category="console"
+                                    data-analytics-label="Delete Project Membership"
+                                    data-service="teams.deleteMembership"
+                                    data-scope="console"
+                                    data-event="submit"
+                                    data-success="alert,trigger,redirect"
+                                    data-confirm="Are you sure you want to remove that user from the team?"
+                                    data-success-param-alert-text="Member Removed Successfully"
+                                    data-success-param-trigger-events="teams.deleteMembership"
+                                    data-success-param-redirect-url="/console"
+                                    data-failure="alert"
+                                    data-failure-param-alert-text="Failed to Remove Member"
+                                    data-failure-param-alert-classname="error">
+
+                                    <input name="teamId" data-ls-attrs="id=leave-teamId-{{member.$id}}" type="hidden" data-ls-bind="{{console-project.teamId}}">
+                                    <input name="membershipId" data-ls-attrs="id=leave-membershipId-{{member.$id}}" type="hidden" data-ls-bind="{{member.$id}}">
+
+                                    <button data-ls-if="1 === {{members.memberships.length}}" class="danger" disabled>Leave</button>
+                                    <button data-ls-if="1 < {{members.memberships.length}}" class="danger">Leave</button>
                                 </form>
 
                                 <div data-ls-if="false === {{member.confirm}}" class="pull-end margin-end">

From e691e75712bd47ab94c1c058d723db68aa0afa75 Mon Sep 17 00:00:00 2001
From: Eldad Fux <eldad.fux@gmail.com>
Date: Sat, 15 Jan 2022 20:34:01 +0200
Subject: [PATCH 03/10] Changed button name

---
 app/views/console/settings/index.phtml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/console/settings/index.phtml b/app/views/console/settings/index.phtml
index 7aec7036a6..e4ad543b2b 100644
--- a/app/views/console/settings/index.phtml
+++ b/app/views/console/settings/index.phtml
@@ -473,8 +473,8 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
                                     <input name="teamId" data-ls-attrs="id=leave-teamId-{{member.$id}}" type="hidden" data-ls-bind="{{console-project.teamId}}">
                                     <input name="membershipId" data-ls-attrs="id=leave-membershipId-{{member.$id}}" type="hidden" data-ls-bind="{{member.$id}}">
 
-                                    <button data-ls-if="1 === {{members.memberships.length}}" class="danger" disabled>Leave</button>
-                                    <button data-ls-if="1 < {{members.memberships.length}}" class="danger">Leave</button>
+                                    <button data-ls-if="1 === {{members.memberships.length}}" class="danger" disabled>Remove</button>
+                                    <button data-ls-if="1 < {{members.memberships.length}}" class="danger">Remove</button>
                                 </form>
 
                                 <form class="pull-end" data-ls-if="{{account.$id}} === {{member.userId}}"
@@ -498,8 +498,8 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
                                     <input name="teamId" data-ls-attrs="id=leave-teamId-{{member.$id}}" type="hidden" data-ls-bind="{{console-project.teamId}}">
                                     <input name="membershipId" data-ls-attrs="id=leave-membershipId-{{member.$id}}" type="hidden" data-ls-bind="{{member.$id}}">
 
-                                    <button data-ls-if="1 === {{members.memberships.length}}" class="danger" disabled>Leave</button>
-                                    <button data-ls-if="1 < {{members.memberships.length}}" class="danger">Leave</button>
+                                    <button data-ls-if="1 === {{members.memberships.length}}" class="danger" disabled>Remove</button>
+                                    <button data-ls-if="1 < {{members.memberships.length}}" class="danger">Remove</button>
                                 </form>
 
                                 <div data-ls-if="false === {{member.confirm}}" class="pull-end margin-end">

From 0722f34347ff0151419d19749493be86b1e59f2a Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Sun, 16 Jan 2022 02:47:49 +0400
Subject: [PATCH 04/10] feat: add notion oauth provider

---
 app/config/providers.php            |  10 ++
 public/images/users/notion.png      | Bin 0 -> 1919 bytes
 src/Appwrite/Auth/OAuth2/Notion.php | 148 ++++++++++++++++++++++++++++
 3 files changed, 158 insertions(+)
 create mode 100644 public/images/users/notion.png
 create mode 100644 src/Appwrite/Auth/OAuth2/Notion.php

diff --git a/app/config/providers.php b/app/config/providers.php
index bb823c9ab0..3aabbf60c2 100644
--- a/app/config/providers.php
+++ b/app/config/providers.php
@@ -131,6 +131,16 @@ return [ // Ordered by ABC.
         'beta' => false,
         'mock' => false,
     ],
+    'notion' => [
+        'name' => 'Notion',
+        'developers' => 'https://developers.notion.com/docs',
+        'icon' => 'icon-notion',
+        'enabled' => true,
+        'sandbox' => false,
+        'form' => false,
+        'beta' => false,
+        'mock' => false,
+    ],
     'paypal' => [
         'name' => 'PayPal',
         'developers' => 'https://developer.paypal.com/docs/api/overview/',
diff --git a/public/images/users/notion.png b/public/images/users/notion.png
new file mode 100644
index 0000000000000000000000000000000000000000..4eff411a429ef2362ff3116b06360de2c56c6561
GIT binary patch
literal 1919
zcmV-_2Y~pAP)<h;3K|Lk000e1NJLTq003kF003kN0{{R3M?7U_00001b5ch_0olnc
ze*gdg32;bRa{vGjVE_ORVF9Q=r)dBH0=`g8R7L;)|NQ*?_4W1b?d|2|<=oud&d$!h
zzP_%muA`%)prD|utE<Py$Mf^^<KyGh)YQer#kRJ#rlzKsmzRi$h;(#xU0q#AM@KL)
zFdZEo78Vu`4h{we1^@s60RaJ(m6iGV`TP6(?Ck8#&CR>JyO5BOcXxMTVPR2GQ9?pO
zGBPqGBqSOd8WIu`3JMAX0|P%lKi}Wqo}QkEhlhB0cxY&7R#sL%K0YZaDG(443kwUG
znVI<b_*q$51qB5S4Gk0&6dW8JDk>^iSXggwZ-aw_k&%&(j*f6}a3Ufi0s;bVZf*nw
z1QQbzF)=YfKtNDXP+wnPetv$Flas2ds=>j**VotN<mB}9^dlo9{{H^%?(RWBL1}4e
zdU|@;*x2#$@mE(@Vq#+V_xH%i$Qc<Ky1KgE-Q6fCD9OpmzrVj58ynNp(+39!7Z(?H
zc6K~GJdBKt{r&yK#Ka{fB}+?7>FMeA_V)1b@W#f*Qc_YUCnwU<($LV*!^6Y4xVVy%
zl7)qZ5fKr~%ggKQ>)F}av$M0Ip`nzNlzV%7RaI3<Nl73eARZnbPft&Cb907<hM1U`
zr>CdAy}g!}mIw$44-XF^At6IULrzXkT3T9WW@dkXe~XKYrKP2}x3|j5%J1**CMG63
zJ3Eh$kDQ#GsHmv4w6ws$z|73do12?sV`Jgr;nmgEwY9Y~Gc)@7`f_q|WMpJWNJu(5
zIxH+KU|?WnWo4|atl;3_A0Hn#H#cWzXDux)E-o&BfPi&%b<fYwadB~deSL(4gy`t#
zii(QX*4Bc8g7Wh6FE1}jN=n<?+dVx!I5;>J6%~Pjf#&AsL_|dD>guqtuv1f0(b3V~
z-rinbUPeYnIXO8A2?;bbG`YFC;^N|KYimqQOc)p#H8nM_udmwL+BP;eY;0`j=jVBO
zd77G<2_=)H000D9Nkl<Zc${Nk7zLwX6pVsVFbc2$MkZz!RyKAHPA+a9CTbeY%f~Mu
zC?qT*Dkd%=DJ3l<3juPH@(L80tEj}PtRkeUrmmr>rLCi@r!R{Q$Qc-tVK$$Uv5Bdf
zxrL=1Rzop?m9-6tRxsJh5Hi%x-oepH)7iz<&E3P(3n<{Fp+uS`-dN4`@%8lc4+wM#
z3JwVk3s;IzgekXCi3G_@az~M1N3<i%TrUTw80XkH5n-Xw_-H&vBqV}kCMlVCOHzD5
zT2j-}qZx_TV`K@^laWcZXR^S)$j%|&SwIl43DT4s7eSIGvUwaN*}{|$3IMr+bdoHQ
zl`AYF$(rI4kS_aR1yU@Ll`AbH&UnW1iZZ_V$~cIwDi%^Kk(I5k!LFpdEWNg_p4+IQ
zF+VAwz)3Q%NzVtNOR||HOJsFjE5J@|X{~H)?-1$qR`2RAkgy|=RePdIvP4!^rZ-Z@
zp4id_3cTt_w1g~>MQuyG>{Cnp%=^^)Crq5wHhIcas#qd7ZTgIvvu5|tnLBab`~|EF
z(bBmIS(Z#)w0Nd^zw45v%a*TL86RFjpscYb$CA{Qq!g|U46DeoWHm`vkZFm@NU}tM
zdCl5Pm336LB#K!9!Esyfs0UFfX+yas8zybsl(>1z)?Q0}*=_K=u@sSg%&6d#?MPyF
zJ78*E^Sr<!k#5S#lv}d130ZI#to@_V!m0ui2!QLR#1g*1&AX)$qI(d^7gEm>5C}ks
z`b?&SC9=B`=wONLc6wMM0}C)(S|YobnRb@!gUf8Boh7QJFc~iu+F2521(RCOOEXIt
z_QM)TatCN<N%?M=oQwd?EMYhZZ<6{c(99BsLvY!{w6mlo1138)hh~;AWWl?~5(zZ3
zBx(;#TJ8wVEMYk60F!U3qnRZP%is#CX=e$;OcYf#vSf`V9V}ruCPzI>L~&VS6GMq5
z#a={N!f<>l1(u*Tv2a_$aDoC$q6&z#<m4&xEn%21hsTm7ND4!9$+x8FG#*PVyp0x=
z!~E<aN46ylXHqdOQ7Aqj1r^Gj15<eNEcuo&tg}P6WWzaxz2{ru3d45;lcJoC`dTt9
zVYuLhX30fght%m3m%8@EO_+BXNnr%H$lNO}NCG5SqIea}k|Jha8>0H!Bv`_5R1!1d
zi2|x5Si+#JOO_=?GfA<8As8}b-cO|RD5f&jYsFU}y*{EXVT7nJ#U)>U`Fc&|{CU9_
zTyALGytU6W`~0-q(Bz^oK&&MU$#=k+;x3fSd#{$Ad#S3c+Wo)>i!C1F8@==8Bia%M
zLtl^%x$4D_EF7B%4GAIxoW92f9+P4+0ysS(#gZr!(gq*pnj)W;KHIT@6gz-<au#j_
zbEO@0rtjNw^Xj(#2@|;|H^+x35I?q$0wSE@A?9^^+WG87=N{ZRbYjV>W$QxOo;;5r
zZM+R9DB@Rr5hwC8YeCq(qtS>tlTk1VM!_f;1)~5B008X2D^0-mgvtN_002ovPDHLk
FV1hRVcJ=@O

literal 0
HcmV?d00001

diff --git a/src/Appwrite/Auth/OAuth2/Notion.php b/src/Appwrite/Auth/OAuth2/Notion.php
new file mode 100644
index 0000000000..748e7958ed
--- /dev/null
+++ b/src/Appwrite/Auth/OAuth2/Notion.php
@@ -0,0 +1,148 @@
+<?php
+
+namespace Appwrite\Auth\OAuth2;
+
+use Appwrite\Auth\OAuth2;
+
+class Notion extends OAuth2
+{
+    /**
+     * @var string
+     */
+    private $endpoint = 'https://api.notion.com/v1';
+
+    /**
+     * @var string
+     */
+    private $version = '2021-08-16';
+
+    /**
+     * @var array
+     */
+    protected $user = [];
+
+    /**
+     * @var array
+     */
+    protected $scopes = [];
+
+    /**
+     * @return string
+     */
+    public function getName():string
+    {
+        return 'notion';
+    }
+
+    /**
+     * @return string
+     */
+    public function getLoginURL():string
+    {
+        return $this->endpoint . '/oauth/authorize?'. \http_build_query([
+            'client_id' => $this->appID,
+            'redirect_uri' => $this->callback,
+            'response_type' => 'code',
+            'state' => \json_encode($this->state),
+            'owner' => 'user'
+        ]);
+    }
+
+    /**
+     * @param string $code
+     *
+     * @return string
+     */
+    public function getAccessToken(string $code):string
+    {
+        $headers = [
+            "Authorization: Basic " . \base64_encode($this->appID . ":" . $this->appSecret),
+        ];
+
+        $response = $this->request(
+            'POST',
+            $this->endpoint . '/oauth/token',
+            $headers,
+            \http_build_query([
+                'grant_type' => 'authorization_code',
+                'redirect_uri' => $this->callback,
+                'code' => $code
+            ])
+        );
+
+        $response = \json_decode($response, true);
+
+        if (isset($response['access_token'])) {
+            return $response['access_token'];
+        }
+
+        return '';
+    }
+
+    /**
+     * @param $accessToken
+     *
+     * @return string
+     */
+    public function getUserID(string $accessToken):string
+    {
+        $response = $this->getUser($accessToken);
+
+        if (isset($response['bot']['owner']['user']['id'])) {
+            return $response['bot']['owner']['user']['id'];
+        }
+
+        return '';
+    }
+
+    /**
+     * @param $accessToken
+     *
+     * @return string
+     */
+    public function getUserEmail(string $accessToken):string
+    {
+        $response = $this->getUser($accessToken);
+
+        if(isset($response['bot']['owner']['user']['person']['email'])){
+            return $response['bot']['owner']['user']['person']['email'];
+        }
+
+        return '';
+    }
+
+    /**
+     * @param $accessToken
+     *
+     * @return string
+     */
+    public function getUserName(string $accessToken):string
+    {
+        $response = $this->getUser($accessToken);
+
+        if (isset($response['bot']['owner']['user']['name'])) {
+            return $response['bot']['owner']['user']['name'];
+        }
+
+        return '';
+    }
+
+    /**
+     * @param string $accessToken
+     *
+     * @return array
+     */
+    protected function getUser(string $accessToken)
+    {
+        $headers = [
+            'Notion-Version: ' . $this->version,
+            'Authorization: Bearer '.\urlencode($accessToken)
+        ];
+
+        if (empty($this->user)) {
+            $this->user = \json_decode($this->request('GET', $this->endpoint . '/users/me', $headers), true);
+        }
+
+        return $this->user;
+    }
+}

From 161bb1ec75e725a3d6055dddc32a2074dec6f909 Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Sun, 16 Jan 2022 03:24:38 +0400
Subject: [PATCH 05/10] fix: delete user and sessions when deleting a user

---
 app/workers/deletes.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/workers/deletes.php b/app/workers/deletes.php
index f4fd667d2a..2dacff626b 100644
--- a/app/workers/deletes.php
+++ b/app/workers/deletes.php
@@ -190,7 +190,14 @@ class DeletesV1 extends Worker
     {
         $userId = $document->getId();
 
-        // Tokens and Sessions removed with user document
+        // Delete all sessions of this user
+        $this->deleteByGroup('sessions', [
+            new Query('userId', Query::TYPE_EQUAL, [$userId])
+        ], $this->getProjectDB($projectId));
+
+        // Delete user ( tokens are deleted as part of the user object )
+        $this->deleteById($document, $this->getProjectDB($projectId));
+
         // Delete Memberships and decrement team membership counts
         $this->deleteByGroup('memberships', [
             new Query('userId', Query::TYPE_EQUAL, [$userId])

From 8dc7d24d5ac6bf8f81c726b6887260198f609ee1 Mon Sep 17 00:00:00 2001
From: Eldad Fux <eldad.fux@gmail.com>
Date: Sun, 16 Jan 2022 01:25:00 +0200
Subject: [PATCH 06/10] Fixed missing validation

---
 app/controllers/api/account.php     | 6 +++---
 app/controllers/api/projects.php    | 2 +-
 app/views/console/users/index.phtml | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php
index 5316ba6ef1..2ff087b725 100644
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@@ -479,7 +479,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
                 $limit = $project->getAttribute('auths', [])['limit'] ?? 0;
 
                 if ($limit !== 0) {
-                    $sum = $dbForProject->count('users', [ new Query('deleted', Query::TYPE_EQUAL, [false]),], APP_LIMIT_COUNT);
+                    $sum = $dbForProject->count('users', [ new Query('deleted', Query::TYPE_EQUAL, [false]),], APP_LIMIT_USERS);
 
                     if ($sum >= $limit) {
                         throw new Exception('Project registration is restricted. Contact your administrator for more information.', 501);
@@ -652,7 +652,7 @@ App::post('/v1/account/sessions/magic-url')
             if ($limit !== 0) {
                 $sum = $dbForProject->count('users', [
                     new Query('deleted', Query::TYPE_EQUAL, [false]),
-                ], APP_LIMIT_COUNT);
+                ], APP_LIMIT_USERS);
 
                 if ($sum >= $limit) {
                     throw new Exception('Project registration is restricted. Contact your administrator for more information.', 501);
@@ -924,7 +924,7 @@ App::post('/v1/account/sessions/anonymous')
         if ($limit !== 0) {
             $sum = $dbForProject->count('users', [
                 new Query('deleted', Query::TYPE_EQUAL, [false]),
-            ], APP_LIMIT_COUNT);
+            ], APP_LIMIT_USERS);
 
             if ($sum >= $limit) {
                 throw new Exception('Project registration is restricted. Contact your administrator for more information.', 501);
diff --git a/app/controllers/api/projects.php b/app/controllers/api/projects.php
index 9c4f9bc9bf..1ef711e6fe 100644
--- a/app/controllers/api/projects.php
+++ b/app/controllers/api/projects.php
@@ -461,7 +461,7 @@ App::patch('/v1/projects/:projectId/auth/limit')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_PROJECT)
     ->param('projectId', '', new UID(), 'Project unique ID.')
-    ->param('limit', false, new Integer(true), 'Set the max number of users allowed in this project. Use 0 for unlimited.')
+    ->param('limit', false, new Range(0, APP_LIMIT_USERS), 'Set the max number of users allowed in this project. Use 0 for unlimited.')
     ->inject('response')
     ->inject('dbForConsole')
     ->action(function ($projectId, $limit, $response, $dbForConsole) {
diff --git a/app/views/console/users/index.phtml b/app/views/console/users/index.phtml
index a290b6d68a..b55917eb5c 100644
--- a/app/views/console/users/index.phtml
+++ b/app/views/console/users/index.phtml
@@ -353,13 +353,13 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
                     data-failure-param-alert-text="Failed to update project users limit"
                     data-failure-param-alert-classname="error">
 
-                    <input name="limit" id="users-limit" type="number" data-ls-bind="{{console-project.authLimit}}" data-cast-to="numeric" min="0" />
+                    <input name="limit" id="users-limit" type="number" data-ls-bind="{{console-project.authLimit}}" data-cast-to="numeric" min="0" max="<?php echo APP_LIMIT_USERS; ?>" />
 
                     <div class="info row thin margin-bottom margin-top">
                         <div class="col span-1">
                             <i class="icon-info-circled text-sign"></i>
                         </div>
-                        <div class="col span-11">This limit will prevent new users from signing up for your project, no matter what auth method has been used. You will still be able to create users and team memberships from your Appwrite console. For an unlimited amount of users, set the limit to 0.</div>
+                        <div class="col span-11">This limit will prevent new users from signing up for your project, no matter what auth method has been used. You will still be able to create users and team memberships from your Appwrite console. For an unlimited amount of users, set the limit to 0. Max limit is <?php echo number_format(APP_LIMIT_USERS); ?>.</div>
                     </div>
 
                     <button>Update</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>

From 6238fcc46a57552699c5dbf4f49dc1d714f28778 Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Sun, 16 Jan 2022 05:02:13 +0400
Subject: [PATCH 07/10] fix: reset user attrbites and do not delete user

---
 app/controllers/api/users.php |  7 +++++++
 app/workers/deletes.php       | 14 ++++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/app/controllers/api/users.php b/app/controllers/api/users.php
index 61a9e24a41..ff64259409 100644
--- a/app/controllers/api/users.php
+++ b/app/controllers/api/users.php
@@ -725,6 +725,11 @@ App::delete('/v1/users/:userId')
             throw new Exception('User not found', 404);
         }
 
+        /**
+         * DO NOT DELETE THE USER RECORD ITSELF. 
+         * WE RETAIN THE USER RECORD TO RESERVE THE USER ID AND ENSURE THAT THE USER ID IS NOT REUSED.
+         */
+        
         // clone user object to send to workers
         $clone = clone $user;
 
@@ -733,6 +738,8 @@ App::delete('/v1/users/:userId')
             ->setAttribute("email", null)
             ->setAttribute("password", null)
             ->setAttribute("deleted", true)
+            ->setAttribute("tokens", [])
+            ->setAttribute("search", null)
         ;
 
         $dbForProject->updateDocument('users', $userId, $user);
diff --git a/app/workers/deletes.php b/app/workers/deletes.php
index 2dacff626b..8caf7ddb23 100644
--- a/app/workers/deletes.php
+++ b/app/workers/deletes.php
@@ -188,15 +188,21 @@ class DeletesV1 extends Worker
      */
     protected function deleteUser(Document $document, string $projectId): void
     {
+        /**
+         * DO NOT DELETE THE USER RECORD ITSELF. 
+         * WE RETAIN THE USER RECORD TO RESERVE THE USER ID AND ENSURE THAT THE USER ID IS NOT REUSED.
+         */
+        
         $userId = $document->getId();
+        $user = $this->getProjectDB($projectId)->getDocument('users', $userId);
 
-        // Delete all sessions of this user
+        // Delete all sessions of this user from the sessions table and update the sessions field of the user record
         $this->deleteByGroup('sessions', [
             new Query('userId', Query::TYPE_EQUAL, [$userId])
         ], $this->getProjectDB($projectId));
-
-        // Delete user ( tokens are deleted as part of the user object )
-        $this->deleteById($document, $this->getProjectDB($projectId));
+        
+        $user->setAttribute('sessions', []);
+        $updated = Authorization::skip(fn() => $this->getProjectDB($projectId)->updateDocument('users', $userId, $user));
 
         // Delete Memberships and decrement team membership counts
         $this->deleteByGroup('memberships', [

From 9650f37dc9f31eec95f7ae651e2f69da8af6d38a Mon Sep 17 00:00:00 2001
From: Eldad Fux <eldad.fux@gmail.com>
Date: Sun, 16 Jan 2022 08:33:47 +0200
Subject: [PATCH 08/10] Update image magick version

---
 Dockerfile                 | 2 +-
 app/config/collections.php | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index e6f1334206..4f8192427d 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,7 +32,7 @@ ENV DEBUG=$DEBUG
 ENV PHP_REDIS_VERSION=5.3.5 \
     PHP_MONGODB_VERSION=1.9.1 \
     PHP_SWOOLE_VERSION=v4.8.5 \
-    PHP_IMAGICK_VERSION=3.5.1 \
+    PHP_IMAGICK_VERSION=3.7.0 \
     PHP_YAML_VERSION=2.2.2 \
     PHP_MAXMINDDB_VERSION=v1.11.0
 
diff --git a/app/config/collections.php b/app/config/collections.php
index c0a5b476e5..abcdec9c1d 100644
--- a/app/config/collections.php
+++ b/app/config/collections.php
@@ -2209,6 +2209,7 @@ $collections = [
             ],
         ],
     ],
+
     'stats' => [
         '$collection' => Database::METADATA,
         '$id' => 'stats',
@@ -2294,6 +2295,7 @@ $collections = [
             ],
         ],
     ],
+    
     'realtime' => [
         '$collection' => Database::METADATA,
         '$id' => 'realtime',

From f6b6673bc98b6feac6f99766bff9731c8295b2cc Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Sun, 16 Jan 2022 16:03:29 +0400
Subject: [PATCH 09/10] feat: update notion image

---
 public/images/users/notion.png | Bin 1919 -> 1834 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/images/users/notion.png b/public/images/users/notion.png
index 4eff411a429ef2362ff3116b06360de2c56c6561..a8694653ca070a5a48f8fd801fb7ec9a00a6afbc 100644
GIT binary patch
delta 1798
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

delta 1884
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
Wzbj3^_Jqm+0000<MNUMnLSTYlb9SNt


From 4e44b3e1afad3683b254c2ad43a3a3074373bea3 Mon Sep 17 00:00:00 2001
From: Eldad Fux <eldad.fux@gmail.com>
Date: Sun, 16 Jan 2022 18:37:32 +0200
Subject: [PATCH 10/10] Fixed usage entrypoint in dev mode

---
 docker-compose.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index c90b38fc5f..1ac7e1b0b0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -412,11 +412,7 @@ services:
       - _APP_MAINTENANCE_RETENTION_AUDIT
 
   appwrite-usage:
-    entrypoint:
-     - php
-     - -e
-     - /usr/src/code/app/cli.php
-     - usage
+    entrypoint: usage
     container_name: appwrite-usage
     build:
       context: .