From 1c4bdf584d508308ce13e66a403ed214b2d05507 Mon Sep 17 00:00:00 2001
From: Sameer Wagh <snwagh@gmail.com>
Date: Thu, 5 Sep 2024 11:09:54 -0400
Subject: [PATCH 01/11] Fixed linting

---
 .../bigquery/011-users-emails-passwords.ipynb | 89 ++++++++++++++++++-
 .../service/notification/email_templates.py   | 14 ++-
 2 files changed, 98 insertions(+), 5 deletions(-)

diff --git a/notebooks/scenarios/bigquery/011-users-emails-passwords.ipynb b/notebooks/scenarios/bigquery/011-users-emails-passwords.ipynb
index b3ca595d812..682d7d972f4 100644
--- a/notebooks/scenarios/bigquery/011-users-emails-passwords.ipynb
+++ b/notebooks/scenarios/bigquery/011-users-emails-passwords.ipynb
@@ -382,10 +382,86 @@
     "save_users(users)"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "id": "29",
+   "metadata": {},
+   "source": [
+    "## Testing token expiry"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "29",
+   "id": "30",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "high_client.api.services.settings.update(pwd_token_config={\"token_exp_min\": 1})\n",
+    "high_client.refresh()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "31",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "reset_password_user.client.guest().forgot_password(email=reset_password_user.email)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "32",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# Wait one minute\n",
+    "await asyncio.sleep(60)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "33",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "reset_password_user.emails[-1]"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "34",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# This should throw a SyftError because we waited too long\n",
+    "output = reset_password_user.client.guest().reset_password(\n",
+    "    token=reset_password_user.reset_token, new_password=reset_password_user.new_password\n",
+    ")\n",
+    "output"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "35",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# Set things back to the the default settings\n",
+    "high_client.api.services.settings.update(pwd_token_config={\"token_exp_min\": 30})\n",
+    "high_client.refresh()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "36",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -395,7 +471,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "30",
+   "id": "37",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -405,13 +481,18 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "31",
+   "id": "38",
    "metadata": {},
    "outputs": [],
    "source": []
   }
  ],
  "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3 (ipykernel)",
+   "language": "python",
+   "name": "python3"
+  },
   "language_info": {
    "codemirror_mode": {
     "name": "ipython",
@@ -422,7 +503,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.12.5"
+   "version": "3.12.3"
   }
  },
  "nbformat": 4,
diff --git a/packages/syft/src/syft/service/notification/email_templates.py b/packages/syft/src/syft/service/notification/email_templates.py
index 2a17a662086..147b2130d54 100644
--- a/packages/syft/src/syft/service/notification/email_templates.py
+++ b/packages/syft/src/syft/service/notification/email_templates.py
@@ -50,6 +50,18 @@ def email_body(notification: "Notification", context: AuthedServiceContext) -> s
         if result.is_err():
             raise Exception("Couldn't update the user password")
 
+        # Get the token expiry time from settings
+        # relative
+        from ..settings.settings_service import SettingsService
+
+        method = context.server.get_service_method(SettingsService.get)
+        settings = method(context=context)
+        expiry_time = settings.pwd_token_config.token_exp_min
+
+        # settings_service = context.server.get_service("settingsservice")
+        # settings = settings_service.get(context)
+        # expiry_time = settings.pwd_token_config.token_exp_min
+
         head = """<head>
             <style>
                 body {
@@ -103,7 +115,7 @@ def email_body(notification: "Notification", context: AuthedServiceContext) -> s
                     <code style="color: #FF8C00;background-color: #f0f0f0;font-size: 12px;">
                         syft_client.reset_password(token='{user.reset_token}', new_password=*****)
                     </code>.
-                to reset your password.</p>
+                to reset your password. This token is valid for {expiry_time} minutes only.</p>
                 <p>If you didn't request a password reset, please ignore this email.</p>
             </div>
         </body>"""

From a2f479f6395ce75cd78539db5975cab3eb3cb38b Mon Sep 17 00:00:00 2001
From: Sameer Wagh <snwagh@gmail.com>
Date: Thu, 5 Sep 2024 13:05:09 -0400
Subject: [PATCH 02/11] Tried alternative service access methods; changed mins
 to seconds for PWD reset

---
 .../bigquery/011-users-emails-passwords.ipynb | 57 +++++++++++++------
 .../src/syft/protocol/protocol_version.json   | 11 ++++
 .../service/notification/email_templates.py   | 22 +++++--
 .../src/syft/service/settings/settings.py     | 28 ++++++++-
 4 files changed, 95 insertions(+), 23 deletions(-)

diff --git a/notebooks/scenarios/bigquery/011-users-emails-passwords.ipynb b/notebooks/scenarios/bigquery/011-users-emails-passwords.ipynb
index 682d7d972f4..d91dba9c443 100644
--- a/notebooks/scenarios/bigquery/011-users-emails-passwords.ipynb
+++ b/notebooks/scenarios/bigquery/011-users-emails-passwords.ipynb
@@ -312,6 +312,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "# This is necessary as it sets the new token value in user.reset_token\n",
     "token = reset_password_user.get_token()\n",
     "token"
    ]
@@ -323,6 +324,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "# This is necessary as it sets the new password value in user.new_password\n",
     "passw = reset_password_user.make_new_password()\n",
     "passw"
    ]
@@ -387,7 +389,7 @@
    "id": "29",
    "metadata": {},
    "source": [
-    "## Testing token expiry"
+    "## Reset password second time"
    ]
   },
   {
@@ -397,8 +399,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "high_client.api.services.settings.update(pwd_token_config={\"token_exp_min\": 1})\n",
-    "high_client.refresh()"
+    "reset_password_user.client.guest().forgot_password(email=reset_password_user.email)"
    ]
   },
   {
@@ -408,18 +409,19 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "reset_password_user.client.guest().forgot_password(email=reset_password_user.email)"
+    "output = reset_password_user.client.guest().reset_password(\n",
+    "    token=reset_password_user.get_token(),\n",
+    "    new_password=reset_password_user.make_new_password(),\n",
+    ")\n",
+    "output"
    ]
   },
   {
-   "cell_type": "code",
-   "execution_count": null,
+   "cell_type": "markdown",
    "id": "32",
    "metadata": {},
-   "outputs": [],
    "source": [
-    "# Wait one minute\n",
-    "await asyncio.sleep(60)"
+    "## Reduce token expiration and try resetting"
    ]
   },
   {
@@ -429,7 +431,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "reset_password_user.emails[-1]"
+    "high_client.api.services.settings.update(pwd_token_config={\"token_exp_seconds\": 10})\n",
+    "high_client.refresh()"
    ]
   },
   {
@@ -438,10 +441,32 @@
    "id": "34",
    "metadata": {},
    "outputs": [],
+   "source": [
+    "reset_password_user.client.guest().forgot_password(email=reset_password_user.email)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "35",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# Wait 10 seconds\n",
+    "await asyncio.sleep(10)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "36",
+   "metadata": {},
+   "outputs": [],
    "source": [
     "# This should throw a SyftError because we waited too long\n",
     "output = reset_password_user.client.guest().reset_password(\n",
-    "    token=reset_password_user.reset_token, new_password=reset_password_user.new_password\n",
+    "    token=reset_password_user.get_token(),\n",
+    "    new_password=reset_password_user.make_new_password(),\n",
     ")\n",
     "output"
    ]
@@ -449,19 +474,19 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "35",
+   "id": "37",
    "metadata": {},
    "outputs": [],
    "source": [
     "# Set things back to the the default settings\n",
-    "high_client.api.services.settings.update(pwd_token_config={\"token_exp_min\": 30})\n",
+    "high_client.api.services.settings.update(pwd_token_config={\"token_exp_seconds\": 1800})\n",
     "high_client.refresh()"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "36",
+   "id": "38",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -471,7 +496,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "37",
+   "id": "39",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -481,7 +506,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "38",
+   "id": "40",
    "metadata": {},
    "outputs": [],
    "source": []
diff --git a/packages/syft/src/syft/protocol/protocol_version.json b/packages/syft/src/syft/protocol/protocol_version.json
index 5f9f6a8fab1..c37b336c350 100644
--- a/packages/syft/src/syft/protocol/protocol_version.json
+++ b/packages/syft/src/syft/protocol/protocol_version.json
@@ -1,5 +1,16 @@
 {
   "1": {
     "release_name": "0.9.1.json"
+  },
+  "dev": {
+    "object_versions": {
+      "PwdTokenResetConfig": {
+        "2": {
+          "version": 2,
+          "hash": "a2f173778ffd0b01cabababe24713307ac2b3660119dd7944b0ae6c0d6209ffd",
+          "action": "add"
+        }
+      }
+    }
   }
 }
diff --git a/packages/syft/src/syft/service/notification/email_templates.py b/packages/syft/src/syft/service/notification/email_templates.py
index 147b2130d54..08d82a19900 100644
--- a/packages/syft/src/syft/service/notification/email_templates.py
+++ b/packages/syft/src/syft/service/notification/email_templates.py
@@ -51,16 +51,26 @@ def email_body(notification: "Notification", context: AuthedServiceContext) -> s
             raise Exception("Couldn't update the user password")
 
         # Get the token expiry time from settings
+        # Option 1
         # relative
-        from ..settings.settings_service import SettingsService
+        # from ..settings.settings_service import SettingsService
 
-        method = context.server.get_service_method(SettingsService.get)
-        settings = method(context=context)
-        expiry_time = settings.pwd_token_config.token_exp_min
+        # method = context.server.get_service_method(SettingsService.get)
+        # settings = method(context=context)
+        # expiry_time = settings.pwd_token_config.token_exp_seconds
 
+        # Option 2
         # settings_service = context.server.get_service("settingsservice")
         # settings = settings_service.get(context)
-        # expiry_time = settings.pwd_token_config.token_exp_min
+        # expiry_time = settings.pwd_token_config.token_exp_seconds
+
+        # Option 3
+        expiry_time = context.server.settings.pwd_token_config.token_exp_seconds
+
+        # Option 4
+        # from ...server.service_registry import ServiceRegistry
+        # settings = ServiceRegistry.get_service("settings").get(context=context)
+        # expiry_time = settings.pwd_token_config.token_exp_seconds
 
         head = """<head>
             <style>
@@ -115,7 +125,7 @@ def email_body(notification: "Notification", context: AuthedServiceContext) -> s
                     <code style="color: #FF8C00;background-color: #f0f0f0;font-size: 12px;">
                         syft_client.reset_password(token='{user.reset_token}', new_password=*****)
                     </code>.
-                to reset your password. This token is valid for {expiry_time} minutes only.</p>
+                to reset your password. This token is valid for {expiry_time} seconds only.</p>
                 <p>If you didn't request a password reset, please ignore this email.</p>
             </div>
         </body>"""
diff --git a/packages/syft/src/syft/service/settings/settings.py b/packages/syft/src/syft/service/settings/settings.py
index 52177507ab3..a2a903c9744 100644
--- a/packages/syft/src/syft/service/settings/settings.py
+++ b/packages/syft/src/syft/service/settings/settings.py
@@ -36,7 +36,7 @@
 
 
 @serializable()
-class PwdTokenResetConfig(SyftObject):
+class PwdTokenResetConfigV1(SyftObject):
     __canonical_name__ = "PwdTokenResetConfig"
     __version__ = SYFT_OBJECT_VERSION_1
 
@@ -45,6 +45,17 @@ class PwdTokenResetConfig(SyftObject):
     token_len: int = 12
     token_exp_min: int = 30
 
+
+@serializable()
+class PwdTokenResetConfig(SyftObject):
+    __canonical_name__ = "PwdTokenResetConfig"
+    __version__ = SYFT_OBJECT_VERSION_2
+
+    ascii: bool = True
+    numbers: bool = True
+    token_len: int = 12
+    token_exp_seconds: int = 1800
+
     @model_validator(mode="after")
     def validate_char_types(self) -> Self:
         if not self.ascii and not self.numbers:
@@ -390,3 +401,18 @@ def migrate_server_settings_update_current_to_v2() -> list[Callable]:
 @migrate(ServerSettingsUpdate, ServerSettingsUpdateV3)
 def migrate_server_settings_update_current_to_v3() -> list[Callable]:
     return [drop(["allow_guest_sessions"])]
+
+
+# PwdTokenResetConfig Migration
+
+
+# set seconds and drop mins
+@migrate(PwdTokenResetConfigV1, PwdTokenResetConfig)
+def migrate_pwd_token_reset_config_v1_to_current() -> list[Callable]:
+    return [make_set_default("token_exp_seconds", 1800), drop(["token_exp_min"])]
+
+
+# drop seconds and add mins
+@migrate(PwdTokenResetConfigV1, PwdTokenResetConfigV1)
+def migrate_pwd_token_reset_config_current_to_v1() -> list[Callable]:
+    return [drop(["token_exp_seconds"]), make_set_default("token_exp_min", 30)]

From 53805cf10255af809743fd75ad7d688314a689fe Mon Sep 17 00:00:00 2001
From: Sameer Wagh <snwagh@gmail.com>
Date: Thu, 5 Sep 2024 13:10:34 -0400
Subject: [PATCH 03/11] Trying option 2 again

---
 .../syft/src/syft/service/notification/email_templates.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/syft/src/syft/service/notification/email_templates.py b/packages/syft/src/syft/service/notification/email_templates.py
index 08d82a19900..a83d21cfba4 100644
--- a/packages/syft/src/syft/service/notification/email_templates.py
+++ b/packages/syft/src/syft/service/notification/email_templates.py
@@ -60,12 +60,12 @@ def email_body(notification: "Notification", context: AuthedServiceContext) -> s
         # expiry_time = settings.pwd_token_config.token_exp_seconds
 
         # Option 2
-        # settings_service = context.server.get_service("settingsservice")
-        # settings = settings_service.get(context)
-        # expiry_time = settings.pwd_token_config.token_exp_seconds
+        settings_service = context.server.get_service("settingsservice")
+        settings = settings_service.get(context)
+        expiry_time = settings.pwd_token_config.token_exp_seconds
 
         # Option 3
-        expiry_time = context.server.settings.pwd_token_config.token_exp_seconds
+        # expiry_time = context.server.settings.pwd_token_config.token_exp_seconds
 
         # Option 4
         # from ...server.service_registry import ServiceRegistry

From de2e3ea4e31e3989bc8bff391be44c6f27405bb5 Mon Sep 17 00:00:00 2001
From: Sameer Wagh <snwagh@gmail.com>
Date: Thu, 5 Sep 2024 14:08:41 -0400
Subject: [PATCH 04/11] minutes bug fixed

---
 packages/syft/src/syft/service/user/user_service.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/syft/src/syft/service/user/user_service.py b/packages/syft/src/syft/service/user/user_service.py
index c276ea08cb0..34a78a55163 100644
--- a/packages/syft/src/syft/service/user/user_service.py
+++ b/packages/syft/src/syft/service/user/user_service.py
@@ -267,8 +267,10 @@ def reset_password(
             )
 
         # If token expired
-        expiration_time = root_context.server.settings.pwd_token_config.token_exp_min
-        if time_difference > timedelta(minutes=expiration_time):
+        expiration_time = (
+            root_context.server.settings.pwd_token_config.token_exp_seconds
+        )
+        if time_difference > timedelta(seconds=expiration_time):
             raise SyftException(
                 public_message="Failed to reset user password. Token is invalid or expired."
             )

From 7a08831ec7260df42c78d8085653b12001e11f16 Mon Sep 17 00:00:00 2001
From: Sameer Wagh <snwagh@gmail.com>
Date: Thu, 5 Sep 2024 16:04:48 -0400
Subject: [PATCH 05/11] Fixed user password updation issues

---
 .../bigquery/011-users-emails-passwords.ipynb | 132 +++++++++++++++---
 notebooks/scenarios/bigquery/helpers.py       |   4 +
 2 files changed, 114 insertions(+), 22 deletions(-)

diff --git a/notebooks/scenarios/bigquery/011-users-emails-passwords.ipynb b/notebooks/scenarios/bigquery/011-users-emails-passwords.ipynb
index d91dba9c443..27fea6b32aa 100644
--- a/notebooks/scenarios/bigquery/011-users-emails-passwords.ipynb
+++ b/notebooks/scenarios/bigquery/011-users-emails-passwords.ipynb
@@ -371,25 +371,26 @@
    "outputs": [],
    "source": [
     "# relogin\n",
-    "reset_password_user.client = reset_password_user.client"
+    "reset_password_user.relogin()\n",
+    "# reset_password_user.client = reset_password_user.client"
    ]
   },
   {
-   "cell_type": "code",
-   "execution_count": null,
+   "cell_type": "markdown",
    "id": "28",
    "metadata": {},
-   "outputs": [],
    "source": [
-    "save_users(users)"
+    "## Reset password second time"
    ]
   },
   {
-   "cell_type": "markdown",
+   "cell_type": "code",
+   "execution_count": null,
    "id": "29",
    "metadata": {},
+   "outputs": [],
    "source": [
-    "## Reset password second time"
+    "reset_password_user.client.guest().forgot_password(email=reset_password_user.email)"
    ]
   },
   {
@@ -399,7 +400,11 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "reset_password_user.client.guest().forgot_password(email=reset_password_user.email)"
+    "output = reset_password_user.client.guest().reset_password(\n",
+    "    token=reset_password_user.get_token(),\n",
+    "    new_password=reset_password_user.make_new_password(),\n",
+    ")\n",
+    "output"
    ]
   },
   {
@@ -409,19 +414,19 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "output = reset_password_user.client.guest().reset_password(\n",
-    "    token=reset_password_user.get_token(),\n",
-    "    new_password=reset_password_user.make_new_password(),\n",
-    ")\n",
-    "output"
+    "assert isinstance(output, sy.SyftSuccess)"
    ]
   },
   {
-   "cell_type": "markdown",
+   "cell_type": "code",
+   "execution_count": null,
    "id": "32",
    "metadata": {},
+   "outputs": [],
    "source": [
-    "## Reduce token expiration and try resetting"
+    "# print(f\"token:\\t\\t {reset_password_user.reset_token}\\n\\\n",
+    "# password:\\t {reset_password_user.password}\\n\\\n",
+    "# new password:\\t {reset_password_user.new_password}\")"
    ]
   },
   {
@@ -430,6 +435,67 @@
    "id": "33",
    "metadata": {},
    "outputs": [],
+   "source": [
+    "reset_password_user.update_password()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "34",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# print(f\"token:\\t\\t {reset_password_user.reset_token}\\n\\\n",
+    "# password:\\t {reset_password_user.password}\\n\\\n",
+    "# new password:\\t {reset_password_user.new_password}\")"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "35",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# relogin\n",
+    "reset_password_user.relogin()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "36",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "save_users(users)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "37",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "reset_password_user"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "38",
+   "metadata": {},
+   "source": [
+    "## Reduce token expiration and try resetting"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "39",
+   "metadata": {},
+   "outputs": [],
    "source": [
     "high_client.api.services.settings.update(pwd_token_config={\"token_exp_seconds\": 10})\n",
     "high_client.refresh()"
@@ -438,7 +504,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "34",
+   "id": "40",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -448,7 +514,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "35",
+   "id": "41",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -459,7 +525,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "36",
+   "id": "42",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -474,7 +540,29 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "37",
+   "id": "43",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "assert isinstance(output, sy.SyftError)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "44",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# relogin\n",
+    "with sy.raises(sy.SyftException, show=True):\n",
+    "    reset_password_user.relogin()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "45",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -486,7 +574,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "38",
+   "id": "46",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -496,7 +584,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "39",
+   "id": "47",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -506,7 +594,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "40",
+   "id": "48",
    "metadata": {},
    "outputs": [],
    "source": []
diff --git a/notebooks/scenarios/bigquery/helpers.py b/notebooks/scenarios/bigquery/helpers.py
index 233ef73f303..a57bdb1e9d3 100644
--- a/notebooks/scenarios/bigquery/helpers.py
+++ b/notebooks/scenarios/bigquery/helpers.py
@@ -144,6 +144,10 @@ def __getitem__(self, key):
             return None
         return self.to_dict()[key]
 
+    def update_password(self):
+        self.password = self.new_password
+        self.new_password = None
+
     @property
     def emails(self) -> list[Email]:
         if not self._email_server:

From 8e2e660f361fd75a9fa7cfe63632a2df975b3982 Mon Sep 17 00:00:00 2001
From: Sameer Wagh <snwagh@gmail.com>
Date: Fri, 6 Sep 2024 15:26:10 -0400
Subject: [PATCH 06/11] Testing nested migrations

---
 .../src/syft/protocol/protocol_version.json   |  11 --
 .../src/syft/service/settings/settings.py     | 120 +++++++++++++++---
 2 files changed, 105 insertions(+), 26 deletions(-)

diff --git a/packages/syft/src/syft/protocol/protocol_version.json b/packages/syft/src/syft/protocol/protocol_version.json
index c37b336c350..5f9f6a8fab1 100644
--- a/packages/syft/src/syft/protocol/protocol_version.json
+++ b/packages/syft/src/syft/protocol/protocol_version.json
@@ -1,16 +1,5 @@
 {
   "1": {
     "release_name": "0.9.1.json"
-  },
-  "dev": {
-    "object_versions": {
-      "PwdTokenResetConfig": {
-        "2": {
-          "version": 2,
-          "hash": "a2f173778ffd0b01cabababe24713307ac2b3660119dd7944b0ae6c0d6209ffd",
-          "action": "add"
-        }
-      }
-    }
   }
 }
diff --git a/packages/syft/src/syft/service/settings/settings.py b/packages/syft/src/syft/service/settings/settings.py
index a2a903c9744..1c1bbb16ca8 100644
--- a/packages/syft/src/syft/service/settings/settings.py
+++ b/packages/syft/src/syft/service/settings/settings.py
@@ -21,6 +21,7 @@
 from ...types.syft_object import SYFT_OBJECT_VERSION_2
 from ...types.syft_object import SYFT_OBJECT_VERSION_3
 from ...types.syft_object import SYFT_OBJECT_VERSION_4
+from ...types.syft_object import SYFT_OBJECT_VERSION_5
 from ...types.syft_object import SyftObject
 from ...types.transforms import drop
 from ...types.transforms import make_set_default
@@ -121,7 +122,26 @@ class ServerSettingsUpdateV3(PartialSyftObject):
     welcome_markdown: HTMLObject | MarkdownDescription
     eager_execution_enabled: bool
     notifications_enabled: bool
-    pwd_token_config: PwdTokenResetConfig
+    pwd_token_config: PwdTokenResetConfigV1
+
+
+@serializable()
+class ServerSettingsUpdateV4(PartialSyftObject):
+    __canonical_name__ = "ServerSettingsUpdate"
+    __version__ = SYFT_OBJECT_VERSION_4
+    id: UID
+    name: str
+    organization: str
+    description: str
+    on_board: bool
+    signup_enabled: bool
+    admin_email: str
+    association_request_auto_approval: bool
+    welcome_markdown: HTMLObject | MarkdownDescription
+    eager_execution_enabled: bool
+    notifications_enabled: bool
+    pwd_token_config: PwdTokenResetConfigV1
+    allow_guest_sessions: bool
 
 
 @serializable()
@@ -226,11 +246,11 @@ class ServerSettingsV3(SyftObject):
         text=DEFAULT_WELCOME_MSG
     )
     notifications_enabled: bool
-    pwd_token_config: PwdTokenResetConfig = PwdTokenResetConfig()
+    pwd_token_config: PwdTokenResetConfigV1 = PwdTokenResetConfigV1()
 
 
 @serializable()
-class ServerSettings(SyftObject):
+class ServerSettingsV4(SyftObject):
     __canonical_name__ = "ServerSettings"
     __version__ = SYFT_OBJECT_VERSION_4
     __repr_attrs__ = [
@@ -243,6 +263,43 @@ class ServerSettings(SyftObject):
         "allow_guest_sessions",
     ]
 
+    id: UID
+    name: str = "Server"
+    deployed_on: str
+    organization: str = "OpenMined"
+    verify_key: SyftVerifyKey
+    on_board: bool = True
+    description: str = "This is the default description for a Datasite Server."
+    server_type: ServerType = ServerType.DATASITE
+    signup_enabled: bool
+    admin_email: EmailStr
+    server_side_type: ServerSideType = ServerSideType.HIGH_SIDE
+    show_warnings: bool
+    association_request_auto_approval: bool
+    eager_execution_enabled: bool = False
+    default_worker_pool: str = DEFAULT_WORKER_POOL_NAME
+    welcome_markdown: HTMLObject | MarkdownDescription = HTMLObject(
+        text=DEFAULT_WELCOME_MSG
+    )
+    notifications_enabled: bool
+    pwd_token_config: PwdTokenResetConfigV1 = PwdTokenResetConfigV1()
+    allow_guest_sessions: bool = True
+
+
+@serializable()
+class ServerSettings(SyftObject):
+    __canonical_name__ = "ServerSettings"
+    __version__ = SYFT_OBJECT_VERSION_5
+    __repr_attrs__ = [
+        "name",
+        "organization",
+        "description",
+        "deployed_on",
+        "signup_enabled",
+        "admin_email",
+        "allow_guest_sessions",
+    ]
+
     id: UID
     name: str = "Server"
     deployed_on: str
@@ -341,14 +398,22 @@ def migrate_server_settings_v1_to_v2() -> list[Callable]:
 
 @migrate(ServerSettingsV2, ServerSettingsV3)
 def migrate_server_settings_v2_to_v3() -> list[Callable]:
-    return [make_set_default("pwd_token_config", PwdTokenResetConfig())]
+    return [make_set_default("pwd_token_config", PwdTokenResetConfigV1())]
 
 
-@migrate(ServerSettingsV3, ServerSettings)
-def migrate_server_settings_v3_to_current() -> list[Callable]:
+@migrate(ServerSettingsV3, ServerSettingsV4)
+def migrate_server_settings_v3_to_v4() -> list[Callable]:
     return [make_set_default("allow_guest_sessions", False)]
 
 
+@migrate(ServerSettingsV4, ServerSettings)
+def migrate_server_settings_v4_to_current() -> list[Callable]:
+    return [
+        drop(["pwd_token_config"]),
+        make_set_default("pwd_token_config", PwdTokenResetConfigV1()),
+    ]
+
+
 # drop
 @migrate(ServerSettingsV2, ServerSettingsV1)
 def migrate_server_settings_v2_to_v1() -> list[Callable]:
@@ -362,12 +427,21 @@ def migrate_server_settings_v3_to_v2() -> list[Callable]:
     return [drop(["pwd_token_config"])]
 
 
-@migrate(ServerSettings, ServerSettingsV3)
-def migrate_server_settings_current_to_v3() -> list[Callable]:
+@migrate(ServerSettingsV4, ServerSettingsV3)
+def migrate_server_settings_v4_to_v3() -> list[Callable]:
     # Use drop function on "notifications_enabled" attrubute
     return [drop(["allow_guest_sessions"])]
 
 
+@migrate(ServerSettings, ServerSettingsV4)
+def migrate_server_settings_current_to_v4() -> list[Callable]:
+    # Use drop function on "notifications_enabled" attrubute
+    return [
+        drop(["pwd_token_config"]),
+        make_set_default("pwd_token_config", PwdTokenResetConfig()),
+    ]
+
+
 # Server Settings Update Migration
 
 
@@ -379,14 +453,22 @@ def migrate_server_settings_update_v1_to_v2() -> list[Callable]:
 
 @migrate(ServerSettingsUpdateV2, ServerSettingsUpdateV3)
 def migrate_server_settings_update_v2_to_v3() -> list[Callable]:
-    return [make_set_default("pwd_token_config", PwdTokenResetConfig())]
+    return [make_set_default("pwd_token_config", PwdTokenResetConfigV1())]
 
 
-@migrate(ServerSettingsUpdateV3, ServerSettingsUpdate)
-def migrate_server_settings_update_v3_to_current() -> list[Callable]:
+@migrate(ServerSettingsUpdateV3, ServerSettingsUpdateV4)
+def migrate_server_settings_update_v3_to_v4() -> list[Callable]:
     return [make_set_default("allow_guest_sessions", False)]
 
 
+@migrate(ServerSettingsUpdateV4, ServerSettingsUpdate)
+def migrate_server_settings_update_v4_to_current() -> list[Callable]:
+    return [
+        drop(["pwd_token_config"]),
+        make_set_default("pwd_token_config", PwdTokenResetConfigV1()),
+    ]
+
+
 # drop
 @migrate(ServerSettingsUpdateV2, ServerSettingsUpdateV1)
 def migrate_server_settings_update_v2_to_v1() -> list[Callable]:
@@ -394,15 +476,23 @@ def migrate_server_settings_update_v2_to_v1() -> list[Callable]:
 
 
 @migrate(ServerSettingsUpdateV3, ServerSettingsUpdateV2)
-def migrate_server_settings_update_current_to_v2() -> list[Callable]:
+def migrate_server_settings_update_v3_to_v2() -> list[Callable]:
     return [drop(["pwd_token_config"])]
 
 
-@migrate(ServerSettingsUpdate, ServerSettingsUpdateV3)
-def migrate_server_settings_update_current_to_v3() -> list[Callable]:
+@migrate(ServerSettingsUpdateV4, ServerSettingsUpdateV3)
+def migrate_server_settings_update_v4_to_v3() -> list[Callable]:
     return [drop(["allow_guest_sessions"])]
 
 
+@migrate(ServerSettingsUpdate, ServerSettingsUpdateV4)
+def migrate_server_settings_update_current_to_v4() -> list[Callable]:
+    return [
+        drop(["pwd_token_config"]),
+        make_set_default("pwd_token_config", PwdTokenResetConfig()),
+    ]
+
+
 # PwdTokenResetConfig Migration
 
 
@@ -413,6 +503,6 @@ def migrate_pwd_token_reset_config_v1_to_current() -> list[Callable]:
 
 
 # drop seconds and add mins
-@migrate(PwdTokenResetConfigV1, PwdTokenResetConfigV1)
+@migrate(PwdTokenResetConfig, PwdTokenResetConfigV1)
 def migrate_pwd_token_reset_config_current_to_v1() -> list[Callable]:
     return [drop(["token_exp_seconds"]), make_set_default("token_exp_min", 30)]

From 74e61898c4c88b5143566208d8fae1910a06d3b5 Mon Sep 17 00:00:00 2001
From: Sameer Wagh <snwagh@gmail.com>
Date: Mon, 9 Sep 2024 11:26:25 -0400
Subject: [PATCH 07/11] Testing upgradability

---
 .../src/syft/service/settings/settings.py     | 64 +++++++++++++------
 1 file changed, 45 insertions(+), 19 deletions(-)

diff --git a/packages/syft/src/syft/service/settings/settings.py b/packages/syft/src/syft/service/settings/settings.py
index 1c1bbb16ca8..c9c64efe133 100644
--- a/packages/syft/src/syft/service/settings/settings.py
+++ b/packages/syft/src/syft/service/settings/settings.py
@@ -23,8 +23,10 @@
 from ...types.syft_object import SYFT_OBJECT_VERSION_4
 from ...types.syft_object import SYFT_OBJECT_VERSION_5
 from ...types.syft_object import SyftObject
+from ...types.transforms import TransformContext
 from ...types.transforms import drop
 from ...types.transforms import make_set_default
+from ...types.transforms import rename
 from ...types.uid import UID
 from ...util.misc_objs import HTMLObject
 from ...util.misc_objs import MarkdownDescription
@@ -147,7 +149,7 @@ class ServerSettingsUpdateV4(PartialSyftObject):
 @serializable()
 class ServerSettingsUpdate(PartialSyftObject):
     __canonical_name__ = "ServerSettingsUpdate"
-    __version__ = SYFT_OBJECT_VERSION_4
+    __version__ = SYFT_OBJECT_VERSION_5
     id: UID
     name: str
     organization: str
@@ -387,6 +389,39 @@ def _repr_html_(self) -> Any:
             """
 
 
+# Helper functions for nested migrations
+
+
+# Write a transoform function that will take PwdTokenResetConfigV1 and convert it to PwdTokenResetConfig
+# Note that one key will change, token_exp_min to token_exp_seconds
+def convert_pwdv1_to_pwd(context: TransformContext) -> TransformContext:
+    if context.output and "pwd_token_config" in context.output:
+        pwd_token_config = context.output["pwd_token_config"]
+        if isinstance(pwd_token_config, PwdTokenResetConfigV1):
+            context.output["pwd_token_config"] = PwdTokenResetConfig(
+                ascii=pwd_token_config.ascii,
+                numbers=pwd_token_config.numbers,
+                token_len=pwd_token_config.token_len,
+                token_exp_seconds=pwd_token_config.token_exp_min * 60,
+            )
+    return context
+
+
+# Write a transform function that will take PwdTokenResetConfig and convert it to PwdTokenResetConfigV1
+# Note that one key will change, token_exp_seconds to token_exp_min
+def convert_pwd_to_pwdv1(context: TransformContext) -> TransformContext:
+    if context.output and "pwd_token_config" in context.output:
+        pwd_token_config = context.output["pwd_token_config"]
+        if isinstance(pwd_token_config, PwdTokenResetConfig):
+            context.output["pwd_token_config"] = PwdTokenResetConfigV1(
+                ascii=pwd_token_config.ascii,
+                numbers=pwd_token_config.numbers,
+                token_len=pwd_token_config.token_len,
+                token_exp_min=pwd_token_config.token_exp_seconds // 60,
+            )
+    return context
+
+
 # Server Settings Migration
 
 
@@ -408,10 +443,7 @@ def migrate_server_settings_v3_to_v4() -> list[Callable]:
 
 @migrate(ServerSettingsV4, ServerSettings)
 def migrate_server_settings_v4_to_current() -> list[Callable]:
-    return [
-        drop(["pwd_token_config"]),
-        make_set_default("pwd_token_config", PwdTokenResetConfigV1()),
-    ]
+    return [convert_pwdv1_to_pwd]
 
 
 # drop
@@ -436,10 +468,7 @@ def migrate_server_settings_v4_to_v3() -> list[Callable]:
 @migrate(ServerSettings, ServerSettingsV4)
 def migrate_server_settings_current_to_v4() -> list[Callable]:
     # Use drop function on "notifications_enabled" attrubute
-    return [
-        drop(["pwd_token_config"]),
-        make_set_default("pwd_token_config", PwdTokenResetConfig()),
-    ]
+    return [convert_pwd_to_pwdv1]
 
 
 # Server Settings Update Migration
@@ -463,10 +492,7 @@ def migrate_server_settings_update_v3_to_v4() -> list[Callable]:
 
 @migrate(ServerSettingsUpdateV4, ServerSettingsUpdate)
 def migrate_server_settings_update_v4_to_current() -> list[Callable]:
-    return [
-        drop(["pwd_token_config"]),
-        make_set_default("pwd_token_config", PwdTokenResetConfigV1()),
-    ]
+    return [convert_pwdv1_to_pwd]
 
 
 # drop
@@ -487,10 +513,7 @@ def migrate_server_settings_update_v4_to_v3() -> list[Callable]:
 
 @migrate(ServerSettingsUpdate, ServerSettingsUpdateV4)
 def migrate_server_settings_update_current_to_v4() -> list[Callable]:
-    return [
-        drop(["pwd_token_config"]),
-        make_set_default("pwd_token_config", PwdTokenResetConfig()),
-    ]
+    return [convert_pwd_to_pwdv1]
 
 
 # PwdTokenResetConfig Migration
@@ -499,10 +522,13 @@ def migrate_server_settings_update_current_to_v4() -> list[Callable]:
 # set seconds and drop mins
 @migrate(PwdTokenResetConfigV1, PwdTokenResetConfig)
 def migrate_pwd_token_reset_config_v1_to_current() -> list[Callable]:
-    return [make_set_default("token_exp_seconds", 1800), drop(["token_exp_min"])]
+    # use rename method from transforms.py to change token_exp_min to token_exp_seconds
+    return [rename("token_exp_min", "token_exp_seconds")]
 
 
 # drop seconds and add mins
 @migrate(PwdTokenResetConfig, PwdTokenResetConfigV1)
 def migrate_pwd_token_reset_config_current_to_v1() -> list[Callable]:
-    return [drop(["token_exp_seconds"]), make_set_default("token_exp_min", 30)]
+    # use rename method from transforms.py to change token_exp_seconds to token_exp_min
+    return [rename("token_exp_seconds", "token_exp_min")]
+    # return [drop(["token_exp_seconds"]), make_set_default("token_exp_min", 30)]

From 8edcd53cc4422ed94df3058fe645825329814967 Mon Sep 17 00:00:00 2001
From: Sameer Wagh <snwagh@gmail.com>
Date: Mon, 9 Sep 2024 13:00:38 -0400
Subject: [PATCH 08/11] Removing all upgradability

---
 .../bigquery/011-users-emails-passwords.ipynb |   7 +-
 .../src/syft/service/settings/settings.py     | 177 ++----------------
 2 files changed, 22 insertions(+), 162 deletions(-)

diff --git a/notebooks/scenarios/bigquery/011-users-emails-passwords.ipynb b/notebooks/scenarios/bigquery/011-users-emails-passwords.ipynb
index 27fea6b32aa..36877c24a66 100644
--- a/notebooks/scenarios/bigquery/011-users-emails-passwords.ipynb
+++ b/notebooks/scenarios/bigquery/011-users-emails-passwords.ipynb
@@ -497,7 +497,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "high_client.api.services.settings.update(pwd_token_config={\"token_exp_seconds\": 10})\n",
+    "# Variable is poorly named, token expiration time is in seconds and not minutes\n",
+    "high_client.api.services.settings.update(pwd_token_config={\"token_exp_min\": 5})\n",
     "high_client.refresh()"
    ]
   },
@@ -519,7 +520,7 @@
    "outputs": [],
    "source": [
     "# Wait 10 seconds\n",
-    "await asyncio.sleep(10)"
+    "await asyncio.sleep(5)"
    ]
   },
   {
@@ -567,7 +568,7 @@
    "outputs": [],
    "source": [
     "# Set things back to the the default settings\n",
-    "high_client.api.services.settings.update(pwd_token_config={\"token_exp_seconds\": 1800})\n",
+    "high_client.api.services.settings.update(pwd_token_config={\"token_exp_min\": 1800})\n",
     "high_client.refresh()"
    ]
   },
diff --git a/packages/syft/src/syft/service/settings/settings.py b/packages/syft/src/syft/service/settings/settings.py
index c9c64efe133..a50ca25257c 100644
--- a/packages/syft/src/syft/service/settings/settings.py
+++ b/packages/syft/src/syft/service/settings/settings.py
@@ -21,12 +21,9 @@
 from ...types.syft_object import SYFT_OBJECT_VERSION_2
 from ...types.syft_object import SYFT_OBJECT_VERSION_3
 from ...types.syft_object import SYFT_OBJECT_VERSION_4
-from ...types.syft_object import SYFT_OBJECT_VERSION_5
 from ...types.syft_object import SyftObject
-from ...types.transforms import TransformContext
 from ...types.transforms import drop
 from ...types.transforms import make_set_default
-from ...types.transforms import rename
 from ...types.uid import UID
 from ...util.misc_objs import HTMLObject
 from ...util.misc_objs import MarkdownDescription
@@ -38,26 +35,16 @@
 MIN_SERVER_NAME_LENGTH = 1
 
 
-@serializable()
-class PwdTokenResetConfigV1(SyftObject):
-    __canonical_name__ = "PwdTokenResetConfig"
-    __version__ = SYFT_OBJECT_VERSION_1
-
-    ascii: bool = True
-    numbers: bool = True
-    token_len: int = 12
-    token_exp_min: int = 30
-
-
 @serializable()
 class PwdTokenResetConfig(SyftObject):
     __canonical_name__ = "PwdTokenResetConfig"
-    __version__ = SYFT_OBJECT_VERSION_2
+    __version__ = SYFT_OBJECT_VERSION_1
 
     ascii: bool = True
     numbers: bool = True
     token_len: int = 12
-    token_exp_seconds: int = 1800
+    # Token expiration time in seconds (not minutes)
+    token_exp_min: int = 1800  # TODO: Rename variable to token_exp_sec
 
     @model_validator(mode="after")
     def validate_char_types(self) -> Self:
@@ -124,32 +111,13 @@ class ServerSettingsUpdateV3(PartialSyftObject):
     welcome_markdown: HTMLObject | MarkdownDescription
     eager_execution_enabled: bool
     notifications_enabled: bool
-    pwd_token_config: PwdTokenResetConfigV1
-
-
-@serializable()
-class ServerSettingsUpdateV4(PartialSyftObject):
-    __canonical_name__ = "ServerSettingsUpdate"
-    __version__ = SYFT_OBJECT_VERSION_4
-    id: UID
-    name: str
-    organization: str
-    description: str
-    on_board: bool
-    signup_enabled: bool
-    admin_email: str
-    association_request_auto_approval: bool
-    welcome_markdown: HTMLObject | MarkdownDescription
-    eager_execution_enabled: bool
-    notifications_enabled: bool
-    pwd_token_config: PwdTokenResetConfigV1
-    allow_guest_sessions: bool
+    pwd_token_config: PwdTokenResetConfig
 
 
 @serializable()
 class ServerSettingsUpdate(PartialSyftObject):
     __canonical_name__ = "ServerSettingsUpdate"
-    __version__ = SYFT_OBJECT_VERSION_5
+    __version__ = SYFT_OBJECT_VERSION_4
     id: UID
     name: str
     organization: str
@@ -248,50 +216,13 @@ class ServerSettingsV3(SyftObject):
         text=DEFAULT_WELCOME_MSG
     )
     notifications_enabled: bool
-    pwd_token_config: PwdTokenResetConfigV1 = PwdTokenResetConfigV1()
-
-
-@serializable()
-class ServerSettingsV4(SyftObject):
-    __canonical_name__ = "ServerSettings"
-    __version__ = SYFT_OBJECT_VERSION_4
-    __repr_attrs__ = [
-        "name",
-        "organization",
-        "description",
-        "deployed_on",
-        "signup_enabled",
-        "admin_email",
-        "allow_guest_sessions",
-    ]
-
-    id: UID
-    name: str = "Server"
-    deployed_on: str
-    organization: str = "OpenMined"
-    verify_key: SyftVerifyKey
-    on_board: bool = True
-    description: str = "This is the default description for a Datasite Server."
-    server_type: ServerType = ServerType.DATASITE
-    signup_enabled: bool
-    admin_email: EmailStr
-    server_side_type: ServerSideType = ServerSideType.HIGH_SIDE
-    show_warnings: bool
-    association_request_auto_approval: bool
-    eager_execution_enabled: bool = False
-    default_worker_pool: str = DEFAULT_WORKER_POOL_NAME
-    welcome_markdown: HTMLObject | MarkdownDescription = HTMLObject(
-        text=DEFAULT_WELCOME_MSG
-    )
-    notifications_enabled: bool
-    pwd_token_config: PwdTokenResetConfigV1 = PwdTokenResetConfigV1()
-    allow_guest_sessions: bool = True
+    pwd_token_config: PwdTokenResetConfig = PwdTokenResetConfig()
 
 
 @serializable()
 class ServerSettings(SyftObject):
     __canonical_name__ = "ServerSettings"
-    __version__ = SYFT_OBJECT_VERSION_5
+    __version__ = SYFT_OBJECT_VERSION_4
     __repr_attrs__ = [
         "name",
         "organization",
@@ -389,39 +320,6 @@ def _repr_html_(self) -> Any:
             """
 
 
-# Helper functions for nested migrations
-
-
-# Write a transoform function that will take PwdTokenResetConfigV1 and convert it to PwdTokenResetConfig
-# Note that one key will change, token_exp_min to token_exp_seconds
-def convert_pwdv1_to_pwd(context: TransformContext) -> TransformContext:
-    if context.output and "pwd_token_config" in context.output:
-        pwd_token_config = context.output["pwd_token_config"]
-        if isinstance(pwd_token_config, PwdTokenResetConfigV1):
-            context.output["pwd_token_config"] = PwdTokenResetConfig(
-                ascii=pwd_token_config.ascii,
-                numbers=pwd_token_config.numbers,
-                token_len=pwd_token_config.token_len,
-                token_exp_seconds=pwd_token_config.token_exp_min * 60,
-            )
-    return context
-
-
-# Write a transform function that will take PwdTokenResetConfig and convert it to PwdTokenResetConfigV1
-# Note that one key will change, token_exp_seconds to token_exp_min
-def convert_pwd_to_pwdv1(context: TransformContext) -> TransformContext:
-    if context.output and "pwd_token_config" in context.output:
-        pwd_token_config = context.output["pwd_token_config"]
-        if isinstance(pwd_token_config, PwdTokenResetConfig):
-            context.output["pwd_token_config"] = PwdTokenResetConfigV1(
-                ascii=pwd_token_config.ascii,
-                numbers=pwd_token_config.numbers,
-                token_len=pwd_token_config.token_len,
-                token_exp_min=pwd_token_config.token_exp_seconds // 60,
-            )
-    return context
-
-
 # Server Settings Migration
 
 
@@ -433,19 +331,14 @@ def migrate_server_settings_v1_to_v2() -> list[Callable]:
 
 @migrate(ServerSettingsV2, ServerSettingsV3)
 def migrate_server_settings_v2_to_v3() -> list[Callable]:
-    return [make_set_default("pwd_token_config", PwdTokenResetConfigV1())]
+    return [make_set_default("pwd_token_config", PwdTokenResetConfig())]
 
 
-@migrate(ServerSettingsV3, ServerSettingsV4)
-def migrate_server_settings_v3_to_v4() -> list[Callable]:
+@migrate(ServerSettingsV3, ServerSettings)
+def migrate_server_settings_v3_to_current() -> list[Callable]:
     return [make_set_default("allow_guest_sessions", False)]
 
 
-@migrate(ServerSettingsV4, ServerSettings)
-def migrate_server_settings_v4_to_current() -> list[Callable]:
-    return [convert_pwdv1_to_pwd]
-
-
 # drop
 @migrate(ServerSettingsV2, ServerSettingsV1)
 def migrate_server_settings_v2_to_v1() -> list[Callable]:
@@ -459,18 +352,12 @@ def migrate_server_settings_v3_to_v2() -> list[Callable]:
     return [drop(["pwd_token_config"])]
 
 
-@migrate(ServerSettingsV4, ServerSettingsV3)
-def migrate_server_settings_v4_to_v3() -> list[Callable]:
+@migrate(ServerSettings, ServerSettingsV3)
+def migrate_server_settings_current_to_v3() -> list[Callable]:
     # Use drop function on "notifications_enabled" attrubute
     return [drop(["allow_guest_sessions"])]
 
 
-@migrate(ServerSettings, ServerSettingsV4)
-def migrate_server_settings_current_to_v4() -> list[Callable]:
-    # Use drop function on "notifications_enabled" attrubute
-    return [convert_pwd_to_pwdv1]
-
-
 # Server Settings Update Migration
 
 
@@ -482,19 +369,14 @@ def migrate_server_settings_update_v1_to_v2() -> list[Callable]:
 
 @migrate(ServerSettingsUpdateV2, ServerSettingsUpdateV3)
 def migrate_server_settings_update_v2_to_v3() -> list[Callable]:
-    return [make_set_default("pwd_token_config", PwdTokenResetConfigV1())]
+    return [make_set_default("pwd_token_config", PwdTokenResetConfig())]
 
 
-@migrate(ServerSettingsUpdateV3, ServerSettingsUpdateV4)
-def migrate_server_settings_update_v3_to_v4() -> list[Callable]:
+@migrate(ServerSettingsUpdateV3, ServerSettingsUpdate)
+def migrate_server_settings_update_v3_to_current() -> list[Callable]:
     return [make_set_default("allow_guest_sessions", False)]
 
 
-@migrate(ServerSettingsUpdateV4, ServerSettingsUpdate)
-def migrate_server_settings_update_v4_to_current() -> list[Callable]:
-    return [convert_pwdv1_to_pwd]
-
-
 # drop
 @migrate(ServerSettingsUpdateV2, ServerSettingsUpdateV1)
 def migrate_server_settings_update_v2_to_v1() -> list[Callable]:
@@ -502,33 +384,10 @@ def migrate_server_settings_update_v2_to_v1() -> list[Callable]:
 
 
 @migrate(ServerSettingsUpdateV3, ServerSettingsUpdateV2)
-def migrate_server_settings_update_v3_to_v2() -> list[Callable]:
+def migrate_server_settings_update_current_to_v2() -> list[Callable]:
     return [drop(["pwd_token_config"])]
 
 
-@migrate(ServerSettingsUpdateV4, ServerSettingsUpdateV3)
-def migrate_server_settings_update_v4_to_v3() -> list[Callable]:
+@migrate(ServerSettingsUpdate, ServerSettingsUpdateV3)
+def migrate_server_settings_update_current_to_v3() -> list[Callable]:
     return [drop(["allow_guest_sessions"])]
-
-
-@migrate(ServerSettingsUpdate, ServerSettingsUpdateV4)
-def migrate_server_settings_update_current_to_v4() -> list[Callable]:
-    return [convert_pwd_to_pwdv1]
-
-
-# PwdTokenResetConfig Migration
-
-
-# set seconds and drop mins
-@migrate(PwdTokenResetConfigV1, PwdTokenResetConfig)
-def migrate_pwd_token_reset_config_v1_to_current() -> list[Callable]:
-    # use rename method from transforms.py to change token_exp_min to token_exp_seconds
-    return [rename("token_exp_min", "token_exp_seconds")]
-
-
-# drop seconds and add mins
-@migrate(PwdTokenResetConfig, PwdTokenResetConfigV1)
-def migrate_pwd_token_reset_config_current_to_v1() -> list[Callable]:
-    # use rename method from transforms.py to change token_exp_seconds to token_exp_min
-    return [rename("token_exp_seconds", "token_exp_min")]
-    # return [drop(["token_exp_seconds"]), make_set_default("token_exp_min", 30)]

From f418c3aece9cb410f4d3167b6c4cf3ff0b6a90bd Mon Sep 17 00:00:00 2001
From: Sameer Wagh <snwagh@gmail.com>
Date: Mon, 9 Sep 2024 13:33:20 -0400
Subject: [PATCH 09/11] fixed variable naming bug

---
 .../syft/src/syft/service/notification/email_templates.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/syft/src/syft/service/notification/email_templates.py b/packages/syft/src/syft/service/notification/email_templates.py
index a83d21cfba4..7de8f711e14 100644
--- a/packages/syft/src/syft/service/notification/email_templates.py
+++ b/packages/syft/src/syft/service/notification/email_templates.py
@@ -57,20 +57,20 @@ def email_body(notification: "Notification", context: AuthedServiceContext) -> s
 
         # method = context.server.get_service_method(SettingsService.get)
         # settings = method(context=context)
-        # expiry_time = settings.pwd_token_config.token_exp_seconds
+        # expiry_time = settings.pwd_token_config.token_exp_min
 
         # Option 2
         settings_service = context.server.get_service("settingsservice")
         settings = settings_service.get(context)
-        expiry_time = settings.pwd_token_config.token_exp_seconds
+        expiry_time = settings.pwd_token_config.token_exp_min
 
         # Option 3
-        # expiry_time = context.server.settings.pwd_token_config.token_exp_seconds
+        # expiry_time = context.server.settings.pwd_token_config.token_exp_min
 
         # Option 4
         # from ...server.service_registry import ServiceRegistry
         # settings = ServiceRegistry.get_service("settings").get(context=context)
-        # expiry_time = settings.pwd_token_config.token_exp_seconds
+        # expiry_time = settings.pwd_token_config.token_exp_min
 
         head = """<head>
             <style>

From d2d07cfc33ab2f28b3ff24d1a0bb576088fe7f02 Mon Sep 17 00:00:00 2001
From: Sameer Wagh <snwagh@gmail.com>
Date: Mon, 9 Sep 2024 14:44:23 -0400
Subject: [PATCH 10/11] Minor

---
 .../scenarios/bigquery/011-users-emails-passwords.ipynb     | 6 +++---
 packages/syft/src/syft/service/user/user_service.py         | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/notebooks/scenarios/bigquery/011-users-emails-passwords.ipynb b/notebooks/scenarios/bigquery/011-users-emails-passwords.ipynb
index 36877c24a66..c6a4c8c865d 100644
--- a/notebooks/scenarios/bigquery/011-users-emails-passwords.ipynb
+++ b/notebooks/scenarios/bigquery/011-users-emails-passwords.ipynb
@@ -498,7 +498,7 @@
    "outputs": [],
    "source": [
     "# Variable is poorly named, token expiration time is in seconds and not minutes\n",
-    "high_client.api.services.settings.update(pwd_token_config={\"token_exp_min\": 5})\n",
+    "high_client.api.services.settings.update(pwd_token_config={\"token_exp_min\": 3})\n",
     "high_client.refresh()"
    ]
   },
@@ -519,8 +519,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# Wait 10 seconds\n",
-    "await asyncio.sleep(5)"
+    "# Wait 3 seconds to ensure token expires\n",
+    "await asyncio.sleep(3)"
    ]
   },
   {
diff --git a/packages/syft/src/syft/service/user/user_service.py b/packages/syft/src/syft/service/user/user_service.py
index 34a78a55163..85b1fa928ad 100644
--- a/packages/syft/src/syft/service/user/user_service.py
+++ b/packages/syft/src/syft/service/user/user_service.py
@@ -267,9 +267,7 @@ def reset_password(
             )
 
         # If token expired
-        expiration_time = (
-            root_context.server.settings.pwd_token_config.token_exp_seconds
-        )
+        expiration_time = root_context.server.settings.pwd_token_config.token_exp_min
         if time_difference > timedelta(seconds=expiration_time):
             raise SyftException(
                 public_message="Failed to reset user password. Token is invalid or expired."

From c85636422bfda5b247e8a7740ee7a6fe922c3247 Mon Sep 17 00:00:00 2001
From: Sameer Wagh <snwagh@gmail.com>
Date: Mon, 9 Sep 2024 16:16:46 -0400
Subject: [PATCH 11/11] Updating service method approach

---
 .../service/notification/email_templates.py   | 24 +++----------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/packages/syft/src/syft/service/notification/email_templates.py b/packages/syft/src/syft/service/notification/email_templates.py
index 6a5bcb7bb82..599120f1956 100644
--- a/packages/syft/src/syft/service/notification/email_templates.py
+++ b/packages/syft/src/syft/service/notification/email_templates.py
@@ -50,27 +50,9 @@ def email_body(notification: "Notification", context: AuthedServiceContext) -> s
         if result.is_err():
             raise Exception("Couldn't update the user password")
 
-        # Get the token expiry time from settings
-        # Option 1
-        # relative
-        # from ..settings.settings_service import SettingsService
-
-        # method = context.server.get_service_method(SettingsService.get)
-        # settings = method(context=context)
-        # expiry_time = settings.pwd_token_config.token_exp_min
-
-        # Option 2
-        settings_service = context.server.get_service("settingsservice")
-        settings = settings_service.get(context)
-        expiry_time = settings.pwd_token_config.token_exp_min
-
-        # Option 3
-        # expiry_time = context.server.settings.pwd_token_config.token_exp_min
-
-        # Option 4
-        # from ...server.service_registry import ServiceRegistry
-        # settings = ServiceRegistry.get_service("settings").get(context=context)
-        # expiry_time = settings.pwd_token_config.token_exp_min
+        expiry_time = context.server.services.settings.get(
+            context=context
+        ).pwd_token_config.token_exp_min
 
         head = """<head>
             <style>