From 95d5f7a6592c150eed7df30d3fcb6e8385db1a66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Wed, 23 Mar 2022 08:23:27 +0000
Subject: [PATCH 1/5] Added veritifcation status modal

---
 app/views/console/users/user.phtml | 35 ++++++++++++++++++++++++++++++
 composer.lock                      | 28 ++++++++++++------------
 2 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/app/views/console/users/user.phtml b/app/views/console/users/user.phtml
index e769ef4bb1..689ae9146c 100644
--- a/app/views/console/users/user.phtml
+++ b/app/views/console/users/user.phtml
@@ -119,6 +119,40 @@
         </form>
     </div>
 
+    <div data-ui-modal class="modal width-medium box close" data-button-hide="on" data-open-event="open-update-verification">
+        <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>    
+        
+        <h2>Update Verification Status</h2>
+
+        <form name="users.updateVerification"
+            data-analytics
+            data-analytics-activity
+            data-analytics-event="submit"
+            data-analytics-category="console"
+            data-analytics-label="Update Verification Status"
+            data-service="users.updateVerification"
+            data-scope="sdk"
+            data-event="submit"
+            data-success="trigger,alert"
+            data-success-param-alert-text="User verification status was updated successfully"
+            data-success-param-trigger-events="users.update"
+            data-failure="alert"
+            data-failure-param-alert-text="Failed to update user verification status"
+            data-failure-param-alert-classname="error"
+            data-ls-attrs="x-init=verificationStatus = {{user.emailVerification}}" x-data="{verificationStatus: false}">
+            
+            <input type="hidden" disabled name="userId" data-ls-bind="{{user.$id}}">
+
+            <input x-bind:checked="verificationStatus" name="emailVerification" id="emailVerification" class="button switch" type="checkbox" /> &nbsp; Verification status <span class="tooltip" data-tooltip="Mark whether this user is verified or not."><i class="icon-info-circled"></i></span>
+
+            <hr />
+
+            <footer>
+                <button type="submit" class="">Update</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
+            </footer>
+        </form>
+    </div>
+
     <div data-ui-modal class="modal width-large box close" data-button-hide="on" data-open-event="open-json">
         <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>    
         
@@ -236,6 +270,7 @@
                         </div>
 
                         <ul class="margin-bottom-large text-fade text-size-small">
+                            <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> <button data-ls-ui-trigger="open-update-verification" class="link text-size-small">Update Verification Status</button></li>
                             <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> <button data-ls-ui-trigger="open-update-name" class="link text-size-small">Update name</button></li>
                             <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> <button data-ls-ui-trigger="open-update-email" class="link text-size-small">Update Email</button></li>
                             <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> <button data-ls-ui-trigger="open-update-password" class="link text-size-small">Update Password</button></li>
diff --git a/composer.lock b/composer.lock
index 291b391b3e..4a9b786b33 100644
--- a/composer.lock
+++ b/composer.lock
@@ -478,16 +478,16 @@
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "7.4.1",
+            "version": "7.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "ee0a041b1760e6a53d2a39c8c34115adc2af2c79"
+                "reference": "ac1ec1cd9b5624694c3a40be801d94137afb12b4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/ee0a041b1760e6a53d2a39c8c34115adc2af2c79",
-                "reference": "ee0a041b1760e6a53d2a39c8c34115adc2af2c79",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/ac1ec1cd9b5624694c3a40be801d94137afb12b4",
+                "reference": "ac1ec1cd9b5624694c3a40be801d94137afb12b4",
                 "shasum": ""
             },
             "require": {
@@ -582,7 +582,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/7.4.1"
+                "source": "https://github.com/guzzle/guzzle/tree/7.4.2"
             },
             "funding": [
                 {
@@ -598,7 +598,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-12-06T18:43:05+00:00"
+            "time": "2022-03-20T14:16:28+00:00"
         },
         {
             "name": "guzzlehttp/promises",
@@ -686,16 +686,16 @@
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "2.1.0",
+            "version": "2.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "089edd38f5b8abba6cb01567c2a8aaa47cec4c72"
+                "reference": "c94a94f120803a18554c1805ef2e539f8285f9a2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/089edd38f5b8abba6cb01567c2a8aaa47cec4c72",
-                "reference": "089edd38f5b8abba6cb01567c2a8aaa47cec4c72",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/c94a94f120803a18554c1805ef2e539f8285f9a2",
+                "reference": "c94a94f120803a18554c1805ef2e539f8285f9a2",
                 "shasum": ""
             },
             "require": {
@@ -719,7 +719,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev"
+                    "dev-master": "2.2-dev"
                 }
             },
             "autoload": {
@@ -781,7 +781,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/2.1.0"
+                "source": "https://github.com/guzzle/psr7/tree/2.2.1"
             },
             "funding": [
                 {
@@ -797,7 +797,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-10-06T17:43:30+00:00"
+            "time": "2022-03-20T21:55:58+00:00"
         },
         {
             "name": "influxdb/influxdb-php",
@@ -6580,5 +6580,5 @@
     "platform-overrides": {
         "php": "8.0"
     },
-    "plugin-api-version": "2.1.0"
+    "plugin-api-version": "2.2.0"
 }

From 6f90d644b2e2897497ff95940f5bcac39eea4e71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Wed, 23 Mar 2022 08:50:21 +0000
Subject: [PATCH 2/5] Forced commit

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index b3fd3d83cd..81ae69fc3c 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+.
 <br />
 <p align="center">
     <a href="https://appwrite.io" target="_blank"><img width="260" height="39" src="https://appwrite.io/images/appwrite.svg" alt="Appwrite Logo"></a>

From ead6e3baaab6722cb0761ff5d80b0233233e3cf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Wed, 23 Mar 2022 08:50:30 +0000
Subject: [PATCH 3/5] Forced commit reverted

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 81ae69fc3c..b3fd3d83cd 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-.
 <br />
 <p align="center">
     <a href="https://appwrite.io" target="_blank"><img width="260" height="39" src="https://appwrite.io/images/appwrite.svg" alt="Appwrite Logo"></a>

From 25fbac8f0354f5b986807bf0dd12ca9d198d8c62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Wed, 20 Apr 2022 08:16:01 +0000
Subject: [PATCH 4/5] Fix lockfile after merge

---
 composer.lock | 34 +++++++++++++---------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/composer.lock b/composer.lock
index e908e573c5..3084527702 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2250,16 +2250,16 @@
         },
         {
             "name": "utopia-php/framework",
-            "version": "0.19.8",
+            "version": "0.19.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/framework.git",
-                "reference": "8c3b3e330546fd6cd65bd1f8d8d08882ff3abb7d"
+                "reference": "4af9fc866edce1b8cff94731fb26c27599118e87"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/framework/zipball/8c3b3e330546fd6cd65bd1f8d8d08882ff3abb7d",
-                "reference": "8c3b3e330546fd6cd65bd1f8d8d08882ff3abb7d",
+                "url": "https://api.github.com/repos/utopia-php/framework/zipball/4af9fc866edce1b8cff94731fb26c27599118e87",
+                "reference": "4af9fc866edce1b8cff94731fb26c27599118e87",
                 "shasum": ""
             },
             "require": {
@@ -2293,9 +2293,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/framework/issues",
-                "source": "https://github.com/utopia-php/framework/tree/0.19.8"
+                "source": "https://github.com/utopia-php/framework/tree/0.19.9"
             },
-            "time": "2022-04-12T00:28:15+00:00"
+            "time": "2022-04-14T15:39:47+00:00"
         },
         {
             "name": "utopia-php/image",
@@ -3551,16 +3551,16 @@
         },
         {
             "name": "matthiasmullie/minify",
-            "version": "1.3.66",
+            "version": "1.3.67",
             "source": {
                 "type": "git",
                 "url": "https://github.com/matthiasmullie/minify.git",
-                "reference": "45fd3b0f1dfa2c965857c6d4a470bea52adc31a6"
+                "reference": "acaee1b7ca3cd67a39d7f98673cacd7e4739a8d9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/matthiasmullie/minify/zipball/45fd3b0f1dfa2c965857c6d4a470bea52adc31a6",
-                "reference": "45fd3b0f1dfa2c965857c6d4a470bea52adc31a6",
+                "url": "https://api.github.com/repos/matthiasmullie/minify/zipball/acaee1b7ca3cd67a39d7f98673cacd7e4739a8d9",
+                "reference": "acaee1b7ca3cd67a39d7f98673cacd7e4739a8d9",
                 "shasum": ""
             },
             "require": {
@@ -3609,23 +3609,15 @@
             ],
             "support": {
                 "issues": "https://github.com/matthiasmullie/minify/issues",
-                "source": "https://github.com/matthiasmullie/minify/tree/1.3.66"
+                "source": "https://github.com/matthiasmullie/minify/tree/1.3.67"
             },
             "funding": [
                 {
-                    "url": "https://github.com/[user1",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/matthiasmullie] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g.",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/user2",
+                    "url": "https://github.com/matthiasmullie",
                     "type": "github"
                 }
             ],
-            "time": "2021-01-06T15:18:10+00:00"
+            "time": "2022-03-24T08:54:59+00:00"
         },
         {
             "name": "matthiasmullie/path-converter",

From ab6c1ea4c757ed4741d30848489b44b4d98fb0a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Wed, 20 Apr 2022 08:39:45 +0000
Subject: [PATCH 5/5] New button placement

---
 app/views/console/users/user.phtml | 81 +++++++++++++++++-------------
 1 file changed, 46 insertions(+), 35 deletions(-)

diff --git a/app/views/console/users/user.phtml b/app/views/console/users/user.phtml
index 689ae9146c..7c12e1b75e 100644
--- a/app/views/console/users/user.phtml
+++ b/app/views/console/users/user.phtml
@@ -119,40 +119,6 @@
         </form>
     </div>
 
-    <div data-ui-modal class="modal width-medium box close" data-button-hide="on" data-open-event="open-update-verification">
-        <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>    
-        
-        <h2>Update Verification Status</h2>
-
-        <form name="users.updateVerification"
-            data-analytics
-            data-analytics-activity
-            data-analytics-event="submit"
-            data-analytics-category="console"
-            data-analytics-label="Update Verification Status"
-            data-service="users.updateVerification"
-            data-scope="sdk"
-            data-event="submit"
-            data-success="trigger,alert"
-            data-success-param-alert-text="User verification status was updated successfully"
-            data-success-param-trigger-events="users.update"
-            data-failure="alert"
-            data-failure-param-alert-text="Failed to update user verification status"
-            data-failure-param-alert-classname="error"
-            data-ls-attrs="x-init=verificationStatus = {{user.emailVerification}}" x-data="{verificationStatus: false}">
-            
-            <input type="hidden" disabled name="userId" data-ls-bind="{{user.$id}}">
-
-            <input x-bind:checked="verificationStatus" name="emailVerification" id="emailVerification" class="button switch" type="checkbox" /> &nbsp; Verification status <span class="tooltip" data-tooltip="Mark whether this user is verified or not."><i class="icon-info-circled"></i></span>
-
-            <hr />
-
-            <footer>
-                <button type="submit" class="">Update</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
-            </footer>
-        </form>
-    </div>
-
     <div data-ui-modal class="modal width-large box close" data-button-hide="on" data-open-event="open-json">
         <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>    
         
@@ -270,13 +236,58 @@
                         </div>
 
                         <ul class="margin-bottom-large text-fade text-size-small">
-                            <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> <button data-ls-ui-trigger="open-update-verification" class="link text-size-small">Update Verification Status</button></li>
                             <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> <button data-ls-ui-trigger="open-update-name" class="link text-size-small">Update name</button></li>
                             <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> <button data-ls-ui-trigger="open-update-email" class="link text-size-small">Update Email</button></li>
                             <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> <button data-ls-ui-trigger="open-update-password" class="link text-size-small">Update Password</button></li>
                             <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> <button data-ls-ui-trigger="open-json" class="link text-size-small">View as JSON</button></li>
                         </ul>
 
+                        <div data-ls-if="{{user.emailVerification}} === false" style="display: none">
+                            <form name="users.updateVerification"  class="margin-bottom"
+                                data-analytics
+                                data-analytics-activity
+                                data-analytics-event="submit"
+                                data-analytics-category="console"
+                                data-analytics-label="Update Verification Status"
+                                data-service="users.updateVerification"
+                                data-scope="sdk"
+                                data-event="submit"
+                                data-success="trigger,alert"
+                                data-success-param-alert-text="User verification status was updated successfully"
+                                data-success-param-trigger-events="users.update"
+                                data-failure="alert"
+                                data-failure-param-alert-text="Failed to update user verification status"
+                                data-failure-param-alert-classname="error"
+                            >
+                                <input type="hidden" disabled name="userId" data-ls-bind="{{user.$id}}">
+                                <input type="hidden" disabled name="emailVerification" value="true" data-cast-to="boolean">
+                                <button type="submit" class="dark fill">Verify Account</button>
+                            </form>
+                        </div>
+
+                        <div data-ls-if="{{user.emailVerification}} === true" style="display: none">
+                            <form name="users.updateVerification" class="margin-bottom"
+                                data-analytics
+                                data-analytics-activity
+                                data-analytics-event="submit"
+                                data-analytics-category="console"
+                                data-analytics-label="Update Verification Status"
+                                data-service="users.updateVerification"
+                                data-scope="sdk"
+                                data-event="submit"
+                                data-success="trigger,alert"
+                                data-success-param-alert-text="User verification status was updated successfully"
+                                data-success-param-trigger-events="users.update"
+                                data-failure="alert"
+                                data-failure-param-alert-text="Failed to update user verification status"
+                                data-failure-param-alert-classname="error"
+                            >
+                                <input type="hidden" disabled name="userId" data-ls-bind="{{user.$id}}">
+                                <input type="hidden" disabled name="emailVerification" value="false" data-cast-to="boolean">
+                                <button type="submit" class="dark fill">Unverify Account</button>
+                            </form>
+                        </div>
+
                         <div data-ls-if="{{user.status}} === true" style="display: none">
                             <form name="users.updateStatus" class="margin-bottom"
                                 data-analytics