From 034d6db8c32d6e26e9118cec8683a655de7da953 Mon Sep 17 00:00:00 2001
From: Eldad Fux <eldad.fux@gmail.com>
Date: Mon, 9 Aug 2021 10:08:49 +0300
Subject: [PATCH] UI - work in progress

---
 app/controllers/api/database.php             |  20 +--
 app/views/console/database/collection.phtml  | 165 +++++++++++++------
 public/dist/scripts/app-all.js               |  14 +-
 public/dist/scripts/app.js                   |  14 +-
 public/scripts/views/forms/clone.js          |  12 +-
 public/scripts/views/forms/duplications.js   |  24 ++-
 src/Appwrite/Auth/Auth.php                   |   9 +
 src/Appwrite/Utopia/Response/Model/Index.php |  14 --
 8 files changed, 178 insertions(+), 94 deletions(-)

diff --git a/app/controllers/api/database.php b/app/controllers/api/database.php
index 1ebb857da..afab4065f 100644
--- a/app/controllers/api/database.php
+++ b/app/controllers/api/database.php
@@ -6,7 +6,6 @@ use Utopia\Exception;
 use Utopia\Validator\Boolean;
 use Utopia\Validator\FloatValidator;
 use Utopia\Validator\Integer;
-use Utopia\Validator\Numeric;
 use Utopia\Validator\Range;
 use Utopia\Validator\WhiteList;
 use Utopia\Validator\Text;
@@ -717,21 +716,22 @@ App::delete('/v1/database/collections/:collectionId/attributes/:attributeId')
             throw new Exception('Collection not found', 404);
         }
 
-        $attributes = $collection->getAttributes();
+        // $attributes = $collection->getAttributes();
 
         // Search for attribute
-        $attributeIndex = array_search($attributeId, array_column($attributes, '$id'));
+        // $attributeIndex = array_search($attributeId, array_column($attributes, '$id'));
+        $attribute = $collection->find('$id', $attributeId, 'attributes');
 
-        if ($attributeIndex === false) {
+        if (empty($attribute) || !$attribute instanceof Document) {
             throw new Exception('Attribute not found', 404);
         }
 
-        $attribute = new Document([\array_merge($attributes[$attributeIndex], [
-            'collectionId' => $collectionId,
-        ])]);
+        // $attribute = new Document([\array_merge($attributes[$attributeIndex], [
+        //     'collectionId' => $collectionId,
+        // ])]);
 
-        $type = $attribute->getAttribute('type', '');
-        $format = $attribute->getAttribute('format', '');
+        // $type = $attribute->getAttribute('type', '');
+        // $format = $attribute->getAttribute('format', '');
 
         $database
             ->setParam('type', DELETE_TYPE_ATTRIBUTE)
@@ -764,7 +764,7 @@ App::post('/v1/database/collections/:collectionId/indexes')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_INDEX)
     ->param('collectionId', '', new UID(), 'Collection unique ID. You can create a new collection using the Database service [server integration](/docs/server/database#createCollection).')
-    ->param('id', null, new Key(), 'Index ID.')
+    ->param('indexId', null, new Key(), 'Index ID.')
     ->param('type', null, new WhiteList([Database::INDEX_KEY, Database::INDEX_FULLTEXT, Database::INDEX_UNIQUE, Database::INDEX_SPATIAL, Database::INDEX_ARRAY]), 'Index type.')
     ->param('attributes', null, new ArrayList(new Key()), 'Array of attributes to index.')
     ->param('orders', [], new ArrayList(new WhiteList(['ASC', 'DESC'], false, Database::VAR_STRING)), 'Array of index orders.', true)
diff --git a/app/views/console/database/collection.phtml b/app/views/console/database/collection.phtml
index d3848a881..3b37e1a79 100644
--- a/app/views/console/database/collection.phtml
+++ b/app/views/console/database/collection.phtml
@@ -33,28 +33,6 @@
 
                 <h2>Documents</h2>
 
-                <form class="box padding-small margin-bottom search"
-                    data-service="database.listDocuments"
-                    data-event="submit"
-                    data-param-collection-id="{{router.params.id}}"
-                    data-param-search="{{router.params.search}}"
-                    data-param-limit="<?php echo APP_PAGING_LIMIT; ?>"
-                    data-param-offset=""
-                    data-param-order-type="DESC"
-                    data-scope="sdk"
-                    data-name="project-documents"
-                    data-success="state"
-                    data-success-param-state-keys="search,offset">
-                    <div class="row thin responsive">
-                        <div class="col span-10">
-                            <input name="search" id="searchDocuments" type="search" autocomplete="off" placeholder="Search" class="margin-bottom-no" data-ls-bind="{{router.params.search}}">
-                        </div>
-                        <div class="col span-2 desktops-only">
-                            <button class="fill" title="Search" aria-label="Search">Search</button>
-                        </div>
-                    </div>
-                </form>
-
                 <div
                     data-service="database.listDocuments"
                     data-event="load,database.createDocument,database.updateDocument,database.deleteDocument"
@@ -69,7 +47,7 @@
                     <div data-ls-if="0 == {{project-documents.sum}}" class="box margin-bottom">
                         <h3 class="margin-bottom-small text-bold">No Documents Found</h3>
 
-                        <p class="margin-bottom-no">Create your first document to get started</p>
+                        <p class="margin-bottom-no">Add your first document to get started</p>
                     </div>
 
                     <div data-ls-if="({{project-documents.sum}})">
@@ -132,16 +110,16 @@
                 <h2>Attributes</h2>
 
                 <div class="clear box margin-bottom">
-                    <div data-ls-if="0 == {{project-collection.attributes.length}}">
+                    <div data-ls-if="0 == {{project-collection.attributes.length}} && 0 == {{project-collection.attributesInQueue.length}}">
                         <h3 class="margin-bottom-small text-bold">No Attributes Found</h3>
     
-                        <p class="margin-bottom-no">Create your first attribute to get started</p>
+                        <p class="margin-bottom-no">Add your first attribute to get started</p>
                     </div>
 
-                    <table class="vertical" data-ls-if="0 < {{project-collection.attributes.length}}">
+                    <table class="vertical" data-ls-if="0 < {{project-collection.attributes.length}} || 0 < {{project-collection.attributesInQueue.length}}">
                         <thead>
                             <tr>
-                                <th width="100"></th>
+                                <th width="120"></th>
                                 <th width="140">Attribute ID</th>
                                 <th width="100">Type</th>
                                 <th width="180">Default</th>
@@ -152,11 +130,11 @@
                         <tbody data-ls-loop="project-collection.attributes" data-ls-as="attribute">
                             <tr>
                                 <td data-title="Status">
-                                    <span class="text-size-small text-success"><i class="icon-ok-circled"></i> Ready&nbsp;</span>
+                                    <span class="text-size-small text-success"><i class="icon-ok-circled"></i> Available&nbsp;</span>
                                 </td>
 
                                 <td data-title="Attribute ID: ">
-                                    <span class="text-size-small" data-ls-bind="{{attribute.$id}}"></span><span class="text-size-small" data-ls-if="{{attribute.size}}" data-ls-bind="({{attribute.size}})"></span>
+                                    <span class="text-size-small" data-ls-bind="{{attribute.$id}}"></span><span class="text-size-small" data-ls-if="{{attribute.size}}" data-ls-bind=" ({{attribute.size}})"></span>
                                 </td>
 
                                 <td data-title="Type:">
@@ -207,12 +185,12 @@
                     <table class="vertical" data-ls-if="0 < {{project-collection.attributesInQueue.length}}">
                         <tbody data-ls-loop="project-collection.attributesInQueue" data-ls-as="attribute">
                             <tr>
-                                <td width="100" data-title="Status">
-                                    <span class="text-size-small text-info"><i class="icon-cog"></i> Creating&nbsp;</span>
+                                <td width="120" data-title="Status">
+                                    <span class="text-size-small text-info"><i class="icon-dot-circled"></i> Creating&nbsp;</span>
                                 </td>
 
                                 <td width="140" data-title="Attribute ID: ">
-                                    <span class="text-size-small" data-ls-bind="{{attribute.$id}}"></span><span class="text-size-small" data-ls-if="{{attribute.size}}" data-ls-bind="({{attribute.size}})"></span>
+                                    <span class="text-size-small" data-ls-bind="{{attribute.$id}}"></span><span class="text-size-small" data-ls-if="{{attribute.size}}" data-ls-bind=" ({{attribute.size}})"></span>
                                 </td>
 
                                 <td width="100" data-title="Type:">
@@ -233,7 +211,7 @@
                     </table>
                 </div>
 
-                <div class="drop-list pull-start" data-ls-ui-open="" data-button-aria="Choose Platform" data-button-text="Create Attribute" data-button-class="button" data-blur="1">
+                <div class="drop-list pull-start" data-ls-ui-open="" data-button-aria="Choose Platform" data-button-text="Add Attribute" data-button-class="button" data-blur="1">
                     <ul>
                         <li>
                             <div class="link new-attribute-string"><img src="/images/clients/web.png?v=<?php echo APP_CACHE_BUSTER; ?>" alt="String Attribute Logo" class="avatar xxs margin-end-small" loading="lazy" /> New String Attribute</div>
@@ -254,19 +232,19 @@
                 <h2>Indexes</h2>
 
                 <div class="clear box margin-bottom">
-                    <div data-ls-if="0 == {{project-collection.indexes.length}}">
+                    <div data-ls-if="0 == {{project-collection.indexes.length}} && 0 == {{project-collection.indexesInQueue.length}}">
                         <h3 class="margin-bottom-small text-bold">No Indexes Found</h3>
     
-                        <p class="margin-bottom-no">Create your first index to get started</p>
+                        <p class="margin-bottom-no">Add your first index to get started</p>
                     </div>
 
-                    <table class="vertical" data-ls-if="0 < {{project-collection.indexes.length}}">
+                    <table class="vertical" data-ls-if="0 < {{project-collection.indexes.length}} || 0 < {{project-collection.indexesInQueue.length}}">
                         <thead>
                             <tr>
-                                <th width="100"></th>
+                                <th width="120"></th>
                                 <th width="140">Index ID</th>
                                 <th width="100">Type</th>
-                                <th width="180">Default</th>
+                                <th width="180">Attributes</th>
                                 <th></th>
                                 <th width="80"></th>
                             </tr>
@@ -274,7 +252,7 @@
                         <tbody data-ls-loop="project-collection.indexes" data-ls-as="index">
                             <tr>
                                 <td data-title="Status">
-                                    <span class="text-size-small text-success"><i class="icon-ok-circled"></i> Ready&nbsp;</span>
+                                    <span class="text-size-small text-success"><i class="icon-ok-circled"></i> Available&nbsp;</span>
                                 </td>
 
                                 <td data-title="Index ID: ">
@@ -286,9 +264,8 @@
                                     <span class="text-size-small" data-ls-if="{{index.array}}">[]</span>
                                 </td>
 
-                                <td data-title="Default:">
-                                    <span class="text-size-small" data-ls-bind="{{index.default}}" data-ls-attr="title={{index.default}}"></span>
-                                    <span class="text-fade text-size-small" data-ls-if="!({{index.default}})">n/a</span>
+                                <td data-title="Attributes:">
+                                    <span class="text-size-small" data-ls-bind="{{index.attributes}}"></span>
                                 </td>
 
                                 <td data-title="">
@@ -329,13 +306,36 @@
                     <table class="vertical" data-ls-if="0 < {{project-collection.indexesInQueue.length}}">
                         <tbody data-ls-loop="project-collection.indexesInQueue" data-ls-as="index">
                             <tr>
-                                
+                                <td width="120" data-title="Status">
+                                    <span class="text-size-small text-info"><i class="icon-dot-circled"></i> Creating&nbsp;</span>
+                                </td>
+
+                                <td width="140" data-title="Index ID: ">
+                                    <span class="text-size-small" data-ls-bind="{{index.$id}}"></span><span class="text-size-small" data-ls-if="{{index.size}}" data-ls-bind="({{index.size}})"></span>
+                                </td>
+
+                                <td width="100" data-title="Type:">
+                                    <span class="text-size-small" data-ls-bind="{{index.type}}"></span>
+                                    <span class="text-size-small" data-ls-if="{{index.array}}">[]</span>
+                                </td>
+
+                                <td width="180" data-title="Attributes:">
+                                    <span class="text-size-small" data-ls-bind="{{index.attributes}}"></span>
+                                </td>
+
+                                <td data-title="">
+                                    <span class="text-size-small text-danger" data-ls-if="{{index.required}}">Required *</span>
+                                </td>
+
+                                <td width="80" data-title="">
+                                    
+                                </td>
                             </tr>
                         </tbody>
                     </table>
                 </div>
 
-                <button class="new-index">New Index</button>
+                <button class="new-index">Add Index</button>
             </li>
             <li data-state="/console/database/collection/settings?id={{router.params.id}}&project={{router.params.project}}">
                 <h2>Settings</h2>
@@ -426,7 +426,7 @@
     <div data-ui-modal class="modal box close sticky-footer" data-button-alias=".new-attribute-string">
         <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>
 
-        <h1>Create a String Attribute</h1>
+        <h1>Add String Attribute</h1>
 
         <form
             data-analytics
@@ -462,7 +462,62 @@
             </div>
 
             <label for="string-default">Default Value</label>
-            <input id="string-default" name="default" type="number" class="margin-bottom-large" autocomplete="off">
+            <input id="string-default" name="default" type="text" class="margin-bottom-large" autocomplete="off">
+
+            <footer>
+                <button type="submit">Create</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Back</button>
+            </footer>
+        </form>
+    </div>
+
+    <div data-ui-modal class="modal box close sticky-footer" data-button-alias=".new-attribute-integer">
+        <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>
+
+        <h1>Add Integer Attribute</h1>
+
+        <form
+            data-analytics
+            data-analytics-activity
+            data-analytics-event="submit"
+            data-analytics-category="console"
+            data-analytics-label="Create Collection Attribute (integer)"
+            data-service="database.createIntegerAttribute"
+            data-scope="sdk"
+            data-event="submit"
+            data-success="alert,trigger,reset"
+            data-success-param-alert-text="Created new attribute successfully"
+            data-success-param-trigger-events="database.createAttribute"
+            data-failure="alert"
+            data-failure-param-alert-text="Failed to create attribute"
+            data-failure-param-alert-classname="error">
+
+            <input type="hidden" name="projectId" data-ls-bind="{{router.params.project}}" />
+            <input type="hidden" name="collectionId" data-ls-bind="{{router.params.id}}" />
+
+            <label for="integer-attributeId">Attribute ID</label>
+            <input type="text" class="full-width" name="attributeId" required autocomplete="off" maxlength="128" />
+
+            <div class="margin-bottom">
+                <input name="required" type="hidden" data-forms-switch data-cast-to="boolean" /> &nbsp; Required <span class="tooltip" data-tooltip="Mark whether this is a required attribute"><i class="icon-info-circled"></i></span>
+            </div>
+                                                                
+            <div class="margin-bottom">
+                <input name="array" type="hidden" data-forms-switch data-cast-to="boolean" />  &nbsp; Array <span class="tooltip" data-tooltip="Mark whether this attribute should act as an array"><i class="icon-info-circled"></i></span>
+            </div>
+
+            <div class="row responsive thin">
+                <div class="col span-6 margin-bottom-small">
+                    <label for="integer-min">Min</label>
+                    <input type="text" class="full-width" name="number" value="0" required autocomplete="off" />
+                </div>
+                <div class="col span-6 margin-bottom-small">
+                    <label for="integer-min">Max</label>
+                    <input type="text" class="full-width" name="number" value="0" required autocomplete="off" />
+                </div>
+            </div>
+
+            <label for="integer-default">Default Value</label>
+            <input id="integer-default" name="default" type="number" value="0" class="margin-bottom-large" autocomplete="off">
 
             <footer>
                 <button type="submit">Create</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Back</button>
@@ -473,9 +528,19 @@
     <div data-ui-modal class="modal box close sticky-footer" data-button-alias=".new-index">
         <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>
 
-        <h1>Create Index</h1>
+        <h1>Add Index</h1>
 
-        <form
+        <div data-ls-if="0 == {{project-collection.attributes.length}}">
+            <div class="info margin-top margin-bottom">
+                <h2>No Attributes Found</h2>
+    
+                <p>Please add your first attribute before adding your first index.</p>
+            </div>
+
+            <button data-ui-modal-close="" type="button" class="reverse">Back</button>
+        </div>
+
+        <form data-ls-if="0 < {{project-collection.attributes.length}}"
             data-analytics
             data-analytics-activity
             data-analytics-event="submit"
@@ -506,8 +571,10 @@
 
             <label>Attributes</label>
 
+            <div id="attributes-section"></div>
+
             <div class="margin-bottom">
-                <div data-forms-clone="" data-label="Add Attribute" data-first="1">
+                <div data-forms-clone="" data-label="Add Attribute" data-target="attributes-section" data-first="1">
                     <div class="row responsive thin margin-bottom-tiny">
                         <div class="col span-7 margin-bottom-small">
                             <select data-duplications data-ls-attrs="name=attributes" data-ls-loop="project-collection.attributes" data-ls-as="option" data-cast-to="array" class="margin-bottom-no">
diff --git a/public/dist/scripts/app-all.js b/public/dist/scripts/app-all.js
index e12e68d00..ebc19211d 100644
--- a/public/dist/scripts/app-all.js
+++ b/public/dist/scripts/app-all.js
@@ -2344,7 +2344,7 @@ running=false;element.style.backgroud='transparent';element.classList.add("load-
 container.set("serviceData",data,true,true);container.set("serviceForm",formData,true,true);for(let i=0;i<parsedSuccess.length;i++){container.resolve(resolve(callbacks[parsedSuccess[i]],"successParam"+
 parsedSuccess[i].charAt(0).toUpperCase()+
 parsedSuccess[i].slice(1),{}));}
-container.set("serviceData",null,true,true);container.set("serviceForm",null,true,true);element.$lsSkip=false;view.render(element);},function(exception){console.log(exception);console.log('------');if(loaderId!==null){alerts.remove(loaderId);}
+container.set("serviceData",null,true,true);container.set("serviceForm",null,true,true);element.$lsSkip=false;view.render(element);},function(exception){console.error(exception);if(loaderId!==null){alerts.remove(loaderId);}
 if(!element){return;}
 running=false;element.style.backgroud='transparent';element.classList.add("load-service-end");for(let i=0;i<parsedFailure.length;i++){container.resolve(resolve(callbacks[parsedFailure[i]],"failureParam"+
 parsedFailure[i].charAt(0).toUpperCase()+
@@ -2357,10 +2357,10 @@ element.addEventListener(action,function(){let account=container.get('account');
 let doNotTrack=window.navigator.doNotTrack;if(doNotTrack=='1'){return;}
 let project=router.params["project"]||'None';ga("set","page",window.location.pathname);ga("set","dimension1",project);ga('set','dimension2',env.VERSION);ga('set','dimension3',env.SETUP);ga("send","pageview");}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-clone",controller:function(element,document,view){var template=element.innerHTML.toString();var label=element.dataset["label"]||"Add";var icon=element.dataset["icon"]||null;var target=element.dataset["target"]||null;var first=parseInt(element.dataset["first"]||1);var button=document.createElement("button");button.type="button";button.innerText=" "+label+" ";button.classList.add("margin-end");button.classList.add("margin-bottom-small");button.classList.add("reverse");if(icon){var iconElement=document.createElement("i");iconElement.className=icon;button.insertBefore(iconElement,button.firstChild);}
 if(target){target=document.getElementById(target);}
-button.addEventListener("click",function(){var clone=document.createElement(element.tagName);var input=clone.querySelector("input");if(element.name){clone.name=element.name;}
-clone.innerHTML=template;clone.className=element.className;view.render(clone);if(target){target.appendChild(clone);}else{button.parentNode.insertBefore(clone,button);}
+button.addEventListener("click",function(){var clone=document.createElement(element.tagName);if(element.name){clone.name=element.name;}
+clone.innerHTML=template;clone.className=element.className;var input=clone.querySelector("input, select, textarea");view.render(clone);if(target){target.appendChild(clone);}else{button.parentNode.insertBefore(clone,button);}
 if(input){input.focus();}
-Array.prototype.slice.call(clone.querySelectorAll("[data-remove]")).map(function(obj){obj.addEventListener("click",function(){clone.parentNode.removeChild(clone);obj.scrollIntoView({behavior:"smooth"});});});Array.prototype.slice.call(clone.querySelectorAll("[data-up]")).map(function(obj){obj.addEventListener("click",function(){if(clone.previousElementSibling){clone.parentNode.insertBefore(clone,clone.previousElementSibling);obj.scrollIntoView({behavior:"smooth"});}});});Array.prototype.slice.call(clone.querySelectorAll("[data-down]")).map(function(obj){obj.addEventListener("click",function(){if(clone.nextElementSibling){clone.parentNode.insertBefore(clone.nextElementSibling,clone);obj.scrollIntoView({behavior:"smooth"});}});});});element.parentNode.insertBefore(button,element.nextSibling);element.parentNode.removeChild(element);if(first){button.click();}}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-add",repeat:false,controller:function(element,view,container,document){for(var i=0;i<element.children.length;i++){let button=document.createElement("button");let template=element.children[i].cloneNode(true);let as=element.getAttribute('data-ls-as');let counter=0;button.type="button";button.innerText="Add";button.classList.add("reverse");button.classList.add("margin-end-small");button.addEventListener('click',function(){container.addNamespace(as,'new-'+counter++);console.log(container.namespaces,container.get(as),as);container.set(as,null,true,true);let child=template.cloneNode(true);view.render(child);element.appendChild(child);element.style.visibility='visible';let inputs=child.querySelectorAll('input,textarea');for(let index=0;index<inputs.length;++index){if(inputs[index].type!=='hidden'){inputs[index].focus();break;}}});element.after(button);}}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-chart",controller:function(element,container,date,document){let wrapper=document.createElement("div");let child=document.createElement("canvas");let sources=element.getAttribute('data-forms-chart');let width=element.getAttribute('data-width')||500;let height=element.getAttribute('data-height')||175;let colors=(element.getAttribute('data-colors')||'blue,green,orange,red').split(',');let themes={'blue':'#29b5d9','green':'#4eb55b','orange':'#fba233','red':'#dc3232',};let range={'24h':'H:i','7d':'d F Y','30d':'d F Y','90d':'d F Y'}
+Array.prototype.slice.call(clone.querySelectorAll("[data-remove]")).map(function(obj){obj.addEventListener("click",function(){clone.parentNode.removeChild(clone);obj.scrollIntoView({behavior:"smooth"});});});Array.prototype.slice.call(clone.querySelectorAll("[data-up]")).map(function(obj){obj.addEventListener("click",function(){if(clone.previousElementSibling){clone.parentNode.insertBefore(clone,clone.previousElementSibling);obj.scrollIntoView({behavior:"smooth"});}});});Array.prototype.slice.call(clone.querySelectorAll("[data-down]")).map(function(obj){obj.addEventListener("click",function(){if(clone.nextElementSibling){clone.parentNode.insertBefore(clone.nextElementSibling,clone);obj.scrollIntoView({behavior:"smooth"});}});});});element.parentNode.insertBefore(button,element.nextSibling);element.parentNode.removeChild(element);button.form.addEventListener('reset',function(event){target.innerHTML='';if(first){button.click();}});if(first){button.click();}}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-add",repeat:false,controller:function(element,view,container,document){for(var i=0;i<element.children.length;i++){let button=document.createElement("button");let template=element.children[i].cloneNode(true);let as=element.getAttribute('data-ls-as');let counter=0;button.type="button";button.innerText="Add";button.classList.add("reverse");button.classList.add("margin-end-small");button.addEventListener('click',function(){container.addNamespace(as,'new-'+counter++);console.log(container.namespaces,container.get(as),as);container.set(as,null,true,true);let child=template.cloneNode(true);view.render(child);element.appendChild(child);element.style.visibility='visible';let inputs=child.querySelectorAll('input,textarea');for(let index=0;index<inputs.length;++index){if(inputs[index].type!=='hidden'){inputs[index].focus();break;}}});element.after(button);}}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-chart",controller:function(element,container,date,document){let wrapper=document.createElement("div");let child=document.createElement("canvas");let sources=element.getAttribute('data-forms-chart');let width=element.getAttribute('data-width')||500;let height=element.getAttribute('data-height')||175;let colors=(element.getAttribute('data-colors')||'blue,green,orange,red').split(',');let themes={'blue':'#29b5d9','green':'#4eb55b','orange':'#fba233','red':'#dc3232',};let range={'24h':'H:i','7d':'d F Y','30d':'d F Y','90d':'d F Y'}
 element.parentNode.insertBefore(wrapper,element.nextSibling);wrapper.classList.add('content');child.width=width;child.height=height;sources=sources.split(',');wrapper.appendChild(child);let chart=null;let check=function(){let config={type:"line",data:{labels:[],datasets:[]},options:{responsive:true,title:{display:false,text:"Stats"},legend:{display:false},tooltips:{mode:"index",intersect:false,caretPadding:0},hover:{mode:"nearest",intersect:true},scales:{xAxes:[{display:false}],yAxes:[{display:false}]}}};for(let i=0;i<sources.length;i++){let label=sources[i].substring(0,sources[i].indexOf('='));let path=sources[i].substring(sources[i].indexOf('=')+1);let data=container.path(path);let value=JSON.parse(element.value);config.data.labels[i]=label;config.data.datasets[i]={};config.data.datasets[i].label=label;config.data.datasets[i].borderColor=themes[colors[i]];config.data.datasets[i].backgroundColor=themes[colors[i]]+'36';config.data.datasets[i].borderWidth=2;config.data.datasets[i].data=[0,0,0,0,0,0,0];config.data.datasets[i].fill=true;if(!data){return;}
 let dateFormat=(value.range&&range[value.range])?range[value.range]:'d F Y';for(let x=0;x<data.length;x++){config.data.datasets[i].data[x]=data[x].value;config.data.labels[x]=date.format(dateFormat,data[x].date);}}
 if(chart){chart.destroy();}
@@ -2385,9 +2385,9 @@ const syncEditorWithID=function(event){if(element.value!=='unique()'||idType!='a
 if(idType=='auto'){element.value='unique()';}}
 const keypress=function(e){const key=e.which||e.keyCode;const ZERO=48;const NINE=57;const SMALL_A=97;const SMALL_Z=122;const CAPITAL_A=65;const CAPITAL_Z=90;const UNDERSCORE=95;const isNotValidDigit=key<ZERO||key>NINE;const isNotValidSmallAlphabet=key<SMALL_A||key>SMALL_Z;const isNotValidCapitalAlphabet=key<CAPITAL_A||key>CAPITAL_Z;if(key==UNDERSCORE&&e.target.value.length==0){e.preventDefault();}
 if(key!=UNDERSCORE&&isNotValidDigit&&isNotValidSmallAlphabet&&isNotValidCapitalAlphabet){e.preventDefault();}}
-syncEditorWithID();setIdType(idType);writer.addEventListener("change",function(event){element.value=writer.value;});writer.form.addEventListener('reset',function(event){const resetEvent=new Event('reset');element.dispatchEvent(resetEvent);});element.addEventListener('reset',function(event){idType=element.getAttribute('data-id-type');setIdType(idType);});writer.addEventListener('keypress',keypress);button.addEventListener("click",switchType);}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-document",controller:function(element,container,search){var formsDocument=(element.dataset["formsDocument"]||'');var searchButton=(element.dataset["search"]||0);let path=container.scope(searchButton);element.addEventListener('click',function(){search.selected=element.value;search.path=path;document.dispatchEvent(new CustomEvent(formsDocument,{bubbles:false,cancelable:true}));});}});})(window);console.log('dup0');(function(window){"use strict";window.ls.container.get("view").add({selector:"data-duplications",controller:function(element,sdk,console,window){element.addEventListener('change',function(event){let duplication=0;let form=event.target.form;for(let i=0;i<form.elements.length;i++){let field=form.elements[i];window.console.log(field.name);window.console.log(event.target.name);window.console.log('-------');if(field.name===event.target.name&&field.value===event.target.value){duplication++;}}
-if(duplication>1){event.target.setCustomValidity("Duplicated value");}
-else{event.target.setCustomValidity("");}});}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-document-preview",controller:function(element,container,search){element.addEventListener('change',function(){console.log(element.value);});}});})(window);(function(window){window.ls.container.get("view").add({selector:"data-forms-filter",controller:function(document,container,expression,element,form,di){let name=element.dataset["formsFilter"]||"";let events=element.dataset["event"]||"";let serialize=function(obj,prefix){let str=[],p;for(p in obj){if(obj.hasOwnProperty(p)){let k=prefix?prefix+"["+p+"]":p,v=obj[p];if(v===""){continue;}
+syncEditorWithID();setIdType(idType);writer.addEventListener("change",function(event){element.value=writer.value;});writer.form.addEventListener('reset',function(event){const resetEvent=new Event('reset');element.dispatchEvent(resetEvent);});element.addEventListener('reset',function(event){idType=element.getAttribute('data-id-type');setIdType(idType);});writer.addEventListener('keypress',keypress);button.addEventListener("click",switchType);}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-document",controller:function(element,container,search){var formsDocument=(element.dataset["formsDocument"]||'');var searchButton=(element.dataset["search"]||0);let path=container.scope(searchButton);element.addEventListener('click',function(){search.selected=element.value;search.path=path;document.dispatchEvent(new CustomEvent(formsDocument,{bubbles:false,cancelable:true}));});}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-duplications",controller:function(element){let validate=function(element){let duplication=0;let form=element.form;for(let i=0;i<form.elements.length;i++){let field=form.elements[i];if(field.name===element.name&&field.value===element.value){duplication++;}}
+if(duplication>1){element.setCustomValidity("Duplicated value");}
+else{element.setCustomValidity("");}};element.addEventListener('change',function(event){validate(event.target)});element.addEventListener('focus',function(event){validate(event.target)});element.addEventListener('blur',function(event){validate(event.target)});}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-document-preview",controller:function(element,container,search){element.addEventListener('change',function(){console.log(element.value);});}});})(window);(function(window){window.ls.container.get("view").add({selector:"data-forms-filter",controller:function(document,container,expression,element,form,di){let name=element.dataset["formsFilter"]||"";let events=element.dataset["event"]||"";let serialize=function(obj,prefix){let str=[],p;for(p in obj){if(obj.hasOwnProperty(p)){let k=prefix?prefix+"["+p+"]":p,v=obj[p];if(v===""){continue;}
 str.push(v!==null&&typeof v==="object"?serialize(v,k):encodeURIComponent(k)+"="+encodeURIComponent(v));}}
 return str.join("&");};let parse=function(filter){if(filter===""){return null;}
 let operatorsMap=["!=",">=","<=","=",">","<"];let operator=null;for(let key=0;key<operatorsMap.length;key++){if(filter.indexOf(operatorsMap[key])>-1){operator=operatorsMap[key];}}
diff --git a/public/dist/scripts/app.js b/public/dist/scripts/app.js
index d15709117..fadea3e2f 100644
--- a/public/dist/scripts/app.js
+++ b/public/dist/scripts/app.js
@@ -328,7 +328,7 @@ running=false;element.style.backgroud='transparent';element.classList.add("load-
 container.set("serviceData",data,true,true);container.set("serviceForm",formData,true,true);for(let i=0;i<parsedSuccess.length;i++){container.resolve(resolve(callbacks[parsedSuccess[i]],"successParam"+
 parsedSuccess[i].charAt(0).toUpperCase()+
 parsedSuccess[i].slice(1),{}));}
-container.set("serviceData",null,true,true);container.set("serviceForm",null,true,true);element.$lsSkip=false;view.render(element);},function(exception){console.log(exception);console.log('------');if(loaderId!==null){alerts.remove(loaderId);}
+container.set("serviceData",null,true,true);container.set("serviceForm",null,true,true);element.$lsSkip=false;view.render(element);},function(exception){console.error(exception);if(loaderId!==null){alerts.remove(loaderId);}
 if(!element){return;}
 running=false;element.style.backgroud='transparent';element.classList.add("load-service-end");for(let i=0;i<parsedFailure.length;i++){container.resolve(resolve(callbacks[parsedFailure[i]],"failureParam"+
 parsedFailure[i].charAt(0).toUpperCase()+
@@ -341,10 +341,10 @@ element.addEventListener(action,function(){let account=container.get('account');
 let doNotTrack=window.navigator.doNotTrack;if(doNotTrack=='1'){return;}
 let project=router.params["project"]||'None';ga("set","page",window.location.pathname);ga("set","dimension1",project);ga('set','dimension2',env.VERSION);ga('set','dimension3',env.SETUP);ga("send","pageview");}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-clone",controller:function(element,document,view){var template=element.innerHTML.toString();var label=element.dataset["label"]||"Add";var icon=element.dataset["icon"]||null;var target=element.dataset["target"]||null;var first=parseInt(element.dataset["first"]||1);var button=document.createElement("button");button.type="button";button.innerText=" "+label+" ";button.classList.add("margin-end");button.classList.add("margin-bottom-small");button.classList.add("reverse");if(icon){var iconElement=document.createElement("i");iconElement.className=icon;button.insertBefore(iconElement,button.firstChild);}
 if(target){target=document.getElementById(target);}
-button.addEventListener("click",function(){var clone=document.createElement(element.tagName);var input=clone.querySelector("input");if(element.name){clone.name=element.name;}
-clone.innerHTML=template;clone.className=element.className;view.render(clone);if(target){target.appendChild(clone);}else{button.parentNode.insertBefore(clone,button);}
+button.addEventListener("click",function(){var clone=document.createElement(element.tagName);if(element.name){clone.name=element.name;}
+clone.innerHTML=template;clone.className=element.className;var input=clone.querySelector("input, select, textarea");view.render(clone);if(target){target.appendChild(clone);}else{button.parentNode.insertBefore(clone,button);}
 if(input){input.focus();}
-Array.prototype.slice.call(clone.querySelectorAll("[data-remove]")).map(function(obj){obj.addEventListener("click",function(){clone.parentNode.removeChild(clone);obj.scrollIntoView({behavior:"smooth"});});});Array.prototype.slice.call(clone.querySelectorAll("[data-up]")).map(function(obj){obj.addEventListener("click",function(){if(clone.previousElementSibling){clone.parentNode.insertBefore(clone,clone.previousElementSibling);obj.scrollIntoView({behavior:"smooth"});}});});Array.prototype.slice.call(clone.querySelectorAll("[data-down]")).map(function(obj){obj.addEventListener("click",function(){if(clone.nextElementSibling){clone.parentNode.insertBefore(clone.nextElementSibling,clone);obj.scrollIntoView({behavior:"smooth"});}});});});element.parentNode.insertBefore(button,element.nextSibling);element.parentNode.removeChild(element);if(first){button.click();}}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-add",repeat:false,controller:function(element,view,container,document){for(var i=0;i<element.children.length;i++){let button=document.createElement("button");let template=element.children[i].cloneNode(true);let as=element.getAttribute('data-ls-as');let counter=0;button.type="button";button.innerText="Add";button.classList.add("reverse");button.classList.add("margin-end-small");button.addEventListener('click',function(){container.addNamespace(as,'new-'+counter++);console.log(container.namespaces,container.get(as),as);container.set(as,null,true,true);let child=template.cloneNode(true);view.render(child);element.appendChild(child);element.style.visibility='visible';let inputs=child.querySelectorAll('input,textarea');for(let index=0;index<inputs.length;++index){if(inputs[index].type!=='hidden'){inputs[index].focus();break;}}});element.after(button);}}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-chart",controller:function(element,container,date,document){let wrapper=document.createElement("div");let child=document.createElement("canvas");let sources=element.getAttribute('data-forms-chart');let width=element.getAttribute('data-width')||500;let height=element.getAttribute('data-height')||175;let colors=(element.getAttribute('data-colors')||'blue,green,orange,red').split(',');let themes={'blue':'#29b5d9','green':'#4eb55b','orange':'#fba233','red':'#dc3232',};let range={'24h':'H:i','7d':'d F Y','30d':'d F Y','90d':'d F Y'}
+Array.prototype.slice.call(clone.querySelectorAll("[data-remove]")).map(function(obj){obj.addEventListener("click",function(){clone.parentNode.removeChild(clone);obj.scrollIntoView({behavior:"smooth"});});});Array.prototype.slice.call(clone.querySelectorAll("[data-up]")).map(function(obj){obj.addEventListener("click",function(){if(clone.previousElementSibling){clone.parentNode.insertBefore(clone,clone.previousElementSibling);obj.scrollIntoView({behavior:"smooth"});}});});Array.prototype.slice.call(clone.querySelectorAll("[data-down]")).map(function(obj){obj.addEventListener("click",function(){if(clone.nextElementSibling){clone.parentNode.insertBefore(clone.nextElementSibling,clone);obj.scrollIntoView({behavior:"smooth"});}});});});element.parentNode.insertBefore(button,element.nextSibling);element.parentNode.removeChild(element);button.form.addEventListener('reset',function(event){target.innerHTML='';if(first){button.click();}});if(first){button.click();}}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-add",repeat:false,controller:function(element,view,container,document){for(var i=0;i<element.children.length;i++){let button=document.createElement("button");let template=element.children[i].cloneNode(true);let as=element.getAttribute('data-ls-as');let counter=0;button.type="button";button.innerText="Add";button.classList.add("reverse");button.classList.add("margin-end-small");button.addEventListener('click',function(){container.addNamespace(as,'new-'+counter++);console.log(container.namespaces,container.get(as),as);container.set(as,null,true,true);let child=template.cloneNode(true);view.render(child);element.appendChild(child);element.style.visibility='visible';let inputs=child.querySelectorAll('input,textarea');for(let index=0;index<inputs.length;++index){if(inputs[index].type!=='hidden'){inputs[index].focus();break;}}});element.after(button);}}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-chart",controller:function(element,container,date,document){let wrapper=document.createElement("div");let child=document.createElement("canvas");let sources=element.getAttribute('data-forms-chart');let width=element.getAttribute('data-width')||500;let height=element.getAttribute('data-height')||175;let colors=(element.getAttribute('data-colors')||'blue,green,orange,red').split(',');let themes={'blue':'#29b5d9','green':'#4eb55b','orange':'#fba233','red':'#dc3232',};let range={'24h':'H:i','7d':'d F Y','30d':'d F Y','90d':'d F Y'}
 element.parentNode.insertBefore(wrapper,element.nextSibling);wrapper.classList.add('content');child.width=width;child.height=height;sources=sources.split(',');wrapper.appendChild(child);let chart=null;let check=function(){let config={type:"line",data:{labels:[],datasets:[]},options:{responsive:true,title:{display:false,text:"Stats"},legend:{display:false},tooltips:{mode:"index",intersect:false,caretPadding:0},hover:{mode:"nearest",intersect:true},scales:{xAxes:[{display:false}],yAxes:[{display:false}]}}};for(let i=0;i<sources.length;i++){let label=sources[i].substring(0,sources[i].indexOf('='));let path=sources[i].substring(sources[i].indexOf('=')+1);let data=container.path(path);let value=JSON.parse(element.value);config.data.labels[i]=label;config.data.datasets[i]={};config.data.datasets[i].label=label;config.data.datasets[i].borderColor=themes[colors[i]];config.data.datasets[i].backgroundColor=themes[colors[i]]+'36';config.data.datasets[i].borderWidth=2;config.data.datasets[i].data=[0,0,0,0,0,0,0];config.data.datasets[i].fill=true;if(!data){return;}
 let dateFormat=(value.range&&range[value.range])?range[value.range]:'d F Y';for(let x=0;x<data.length;x++){config.data.datasets[i].data[x]=data[x].value;config.data.labels[x]=date.format(dateFormat,data[x].date);}}
 if(chart){chart.destroy();}
@@ -369,9 +369,9 @@ const syncEditorWithID=function(event){if(element.value!=='unique()'||idType!='a
 if(idType=='auto'){element.value='unique()';}}
 const keypress=function(e){const key=e.which||e.keyCode;const ZERO=48;const NINE=57;const SMALL_A=97;const SMALL_Z=122;const CAPITAL_A=65;const CAPITAL_Z=90;const UNDERSCORE=95;const isNotValidDigit=key<ZERO||key>NINE;const isNotValidSmallAlphabet=key<SMALL_A||key>SMALL_Z;const isNotValidCapitalAlphabet=key<CAPITAL_A||key>CAPITAL_Z;if(key==UNDERSCORE&&e.target.value.length==0){e.preventDefault();}
 if(key!=UNDERSCORE&&isNotValidDigit&&isNotValidSmallAlphabet&&isNotValidCapitalAlphabet){e.preventDefault();}}
-syncEditorWithID();setIdType(idType);writer.addEventListener("change",function(event){element.value=writer.value;});writer.form.addEventListener('reset',function(event){const resetEvent=new Event('reset');element.dispatchEvent(resetEvent);});element.addEventListener('reset',function(event){idType=element.getAttribute('data-id-type');setIdType(idType);});writer.addEventListener('keypress',keypress);button.addEventListener("click",switchType);}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-document",controller:function(element,container,search){var formsDocument=(element.dataset["formsDocument"]||'');var searchButton=(element.dataset["search"]||0);let path=container.scope(searchButton);element.addEventListener('click',function(){search.selected=element.value;search.path=path;document.dispatchEvent(new CustomEvent(formsDocument,{bubbles:false,cancelable:true}));});}});})(window);console.log('dup0');(function(window){"use strict";window.ls.container.get("view").add({selector:"data-duplications",controller:function(element,sdk,console,window){element.addEventListener('change',function(event){let duplication=0;let form=event.target.form;for(let i=0;i<form.elements.length;i++){let field=form.elements[i];window.console.log(field.name);window.console.log(event.target.name);window.console.log('-------');if(field.name===event.target.name&&field.value===event.target.value){duplication++;}}
-if(duplication>1){event.target.setCustomValidity("Duplicated value");}
-else{event.target.setCustomValidity("");}});}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-document-preview",controller:function(element,container,search){element.addEventListener('change',function(){console.log(element.value);});}});})(window);(function(window){window.ls.container.get("view").add({selector:"data-forms-filter",controller:function(document,container,expression,element,form,di){let name=element.dataset["formsFilter"]||"";let events=element.dataset["event"]||"";let serialize=function(obj,prefix){let str=[],p;for(p in obj){if(obj.hasOwnProperty(p)){let k=prefix?prefix+"["+p+"]":p,v=obj[p];if(v===""){continue;}
+syncEditorWithID();setIdType(idType);writer.addEventListener("change",function(event){element.value=writer.value;});writer.form.addEventListener('reset',function(event){const resetEvent=new Event('reset');element.dispatchEvent(resetEvent);});element.addEventListener('reset',function(event){idType=element.getAttribute('data-id-type');setIdType(idType);});writer.addEventListener('keypress',keypress);button.addEventListener("click",switchType);}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-document",controller:function(element,container,search){var formsDocument=(element.dataset["formsDocument"]||'');var searchButton=(element.dataset["search"]||0);let path=container.scope(searchButton);element.addEventListener('click',function(){search.selected=element.value;search.path=path;document.dispatchEvent(new CustomEvent(formsDocument,{bubbles:false,cancelable:true}));});}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-duplications",controller:function(element){let validate=function(element){let duplication=0;let form=element.form;for(let i=0;i<form.elements.length;i++){let field=form.elements[i];if(field.name===element.name&&field.value===element.value){duplication++;}}
+if(duplication>1){element.setCustomValidity("Duplicated value");}
+else{element.setCustomValidity("");}};element.addEventListener('change',function(event){validate(event.target)});element.addEventListener('focus',function(event){validate(event.target)});element.addEventListener('blur',function(event){validate(event.target)});}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-document-preview",controller:function(element,container,search){element.addEventListener('change',function(){console.log(element.value);});}});})(window);(function(window){window.ls.container.get("view").add({selector:"data-forms-filter",controller:function(document,container,expression,element,form,di){let name=element.dataset["formsFilter"]||"";let events=element.dataset["event"]||"";let serialize=function(obj,prefix){let str=[],p;for(p in obj){if(obj.hasOwnProperty(p)){let k=prefix?prefix+"["+p+"]":p,v=obj[p];if(v===""){continue;}
 str.push(v!==null&&typeof v==="object"?serialize(v,k):encodeURIComponent(k)+"="+encodeURIComponent(v));}}
 return str.join("&");};let parse=function(filter){if(filter===""){return null;}
 let operatorsMap=["!=",">=","<=","=",">","<"];let operator=null;for(let key=0;key<operatorsMap.length;key++){if(filter.indexOf(operatorsMap[key])>-1){operator=operatorsMap[key];}}
diff --git a/public/scripts/views/forms/clone.js b/public/scripts/views/forms/clone.js
index 34124d63b..976a2a98d 100644
--- a/public/scripts/views/forms/clone.js
+++ b/public/scripts/views/forms/clone.js
@@ -30,7 +30,6 @@
 
       button.addEventListener("click", function() {
         var clone = document.createElement(element.tagName);
-        var input = clone.querySelector("input");
 
         if (element.name) {
           clone.name = element.name;
@@ -39,6 +38,8 @@
         clone.innerHTML = template;
         clone.className = element.className;
 
+        var input = clone.querySelector("input, select, textarea");
+
         view.render(clone);
 
         if (target) {
@@ -90,6 +91,15 @@
 
       element.parentNode.removeChild(element);
 
+
+      button.form.addEventListener('reset', function (event) {
+        target.innerHTML = '';
+
+        if (first) {
+          button.click();
+        }
+      });
+
       if (first) {
         button.click();
       }
diff --git a/public/scripts/views/forms/duplications.js b/public/scripts/views/forms/duplications.js
index e66e561e1..6dbd3da8f 100644
--- a/public/scripts/views/forms/duplications.js
+++ b/public/scripts/views/forms/duplications.js
@@ -2,25 +2,37 @@
   "use strict";
   window.ls.container.get("view").add({
     selector: "data-duplications",
-    controller: function (element, sdk, console, window) {
-      element.addEventListener('change', function (event) {
+    controller: function (element) {
+      let validate = function (element) {
         let duplication = 0;
-        let form = event.target.form;
+        let form = element.form;
 
         for (let i = 0; i < form.elements.length; i++) {
           let field = form.elements[i];
 
-          if(field.name === event.target.name && field.value === event.target.value) {
+          if(field.name === element.name && field.value === element.value) {
             duplication++;
           }
         }
 
         if(duplication > 1) { // self + another element with same name and value
-          event.target.setCustomValidity("Duplicated value");
+          element.setCustomValidity("Duplicated value");
         }
         else {
-          event.target.setCustomValidity("");
+          element.setCustomValidity("");
         }
+      };
+
+      element.addEventListener('change', function(event) {
+        validate(event.target)
+      });
+
+      element.addEventListener('focus', function(event) {
+        validate(event.target)
+      });
+
+      element.addEventListener('blur', function(event) {
+        validate(event.target)
       });
     }
   });
diff --git a/src/Appwrite/Auth/Auth.php b/src/Appwrite/Auth/Auth.php
index 56f708493..2665d2cc4 100644
--- a/src/Appwrite/Auth/Auth.php
+++ b/src/Appwrite/Auth/Auth.php
@@ -193,6 +193,11 @@ class Auth
     public static function tokenVerify(array $tokens, int $type, string $secret)
     {
         foreach ($tokens as $token) { /** @var Document $token */
+            if(!$token instanceof Document) {
+                var_dump('passed1');
+                continue;
+            }
+
             if ($token->isSet('type') &&
                 $token->isSet('secret') &&
                 $token->isSet('expire') &&
@@ -217,6 +222,10 @@ class Auth
     public static function sessionVerify(array $sessions, string $secret)
     {
         foreach ($sessions as $session) { /** @var Document $session */
+            if(!$session instanceof Document) {
+                var_dump('passed2');
+                continue;
+            }
             if ($session->isSet('secret') &&
                 $session->isSet('expire') &&
                 $session->isSet('provider') &&
diff --git a/src/Appwrite/Utopia/Response/Model/Index.php b/src/Appwrite/Utopia/Response/Model/Index.php
index 3ae1536aa..23b46ebeb 100644
--- a/src/Appwrite/Utopia/Response/Model/Index.php
+++ b/src/Appwrite/Utopia/Response/Model/Index.php
@@ -10,12 +10,6 @@ class Index extends Model
     public function __construct()
     {
         $this
-            ->addRule('$collection', [
-                'type' => self::TYPE_STRING,
-                'description' => 'Collection ID.',
-                'default' => '',
-                'example' => '5e5ea5c16d55',
-            ])
             ->addRule('$id', [
                 'type' => self::TYPE_STRING,
                 'description' => 'Index ID.',
@@ -35,14 +29,6 @@ class Index extends Model
                 'example' => [],
                 'array' => true,
             ])
-            ->addRule('lengths', [
-                'type' => self::TYPE_STRING,
-                'description' => 'Index lengths.',
-                'default' => [],
-                'example' => [],
-                'array' => true,
-                'required' => false,
-            ])
             ->addRule('orders', [
                 'type' => self::TYPE_STRING,
                 'description' => 'Index orders.',