From b2509e9e53ab6b51dfd55e26712e8928160cd64b Mon Sep 17 00:00:00 2001
From: Nicolai Ort <info@nicolai-ort.com>
Date: Fri, 26 Mar 2021 19:45:53 +0100
Subject: [PATCH] Module now exports functions that check if a password is
 strong enough and equal to a potential confirmation field

ref #106
---
 src/components/auth/PasswordStrength.svelte | 34 +++++++++++++--------
 src/components/settings/Settings.svelte     |  5 ++-
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/components/auth/PasswordStrength.svelte b/src/components/auth/PasswordStrength.svelte
index 007426cc..df9b99cd 100644
--- a/src/components/auth/PasswordStrength.svelte
+++ b/src/components/auth/PasswordStrength.svelte
@@ -1,18 +1,26 @@
-<script>
-    import { getLocaleFromNavigator, _ } from "svelte-i18n";
-    import { passwordStrength } from "check-password-strength";
-    export let password_change;
-    export let password_confirm;
-    
-    $: strength = passwordStrength(password_change);
-    $: passwords_match =
-        !password_confirm || password_confirm === password_change;
-    $: update_password_enabled =
-        strength?.contains.includes("lowercase") &&
+<script context="module">
+import { passwordStrength } from "check-password-strength";
+export function password_strong_enough(password_change) {
+    let strength = passwordStrength(password_change);
+    return (strength?.contains.includes("lowercase") &&
         strength?.contains.includes("uppercase") &&
         strength?.contains.includes("number") &&
-        strength?.length > 9 &&
-        passwords_match == true;
+        strength?.length > 9);
+}
+export function password_strong_enough_and_equal(password_change, password_confirm){
+    return password_strong_enough(password_change) && password_change === password_confirm;
+}
+</script>
+
+<script>
+    import { getLocaleFromNavigator, _ } from "svelte-i18n";
+    import { passwordStrength as Strength } from "check-password-strength";
+    export let password_change;
+    export let password_confirm;
+
+    $: strength = Strength(password_change);
+    $: passwords_match =
+        !password_confirm || password_confirm === password_change;
 </script>
 
 <div class="ml-4">
diff --git a/src/components/settings/Settings.svelte b/src/components/settings/Settings.svelte
index 8d62ce82..88b34f20 100644
--- a/src/components/settings/Settings.svelte
+++ b/src/components/settings/Settings.svelte
@@ -4,7 +4,7 @@
   import { MeService } from "@odit/lfk-client-js";
   import Toastify from "toastify-js";
   import ConfirmProfileDeletion from "./ConfirmProfileDeletion.svelte";
-  import PasswordStrength from "../auth/PasswordStrength.svelte";
+  import PasswordStrength, {password_strong_enough_and_equal} from "../auth/PasswordStrength.svelte";
   $: data_loaded = false;
   $: delete_triggered = false;
   $: original_data = {};
@@ -16,8 +16,7 @@
     JSON.stringify(editable) === JSON.stringify(original_data)
   );
   $: save_enabled = changes_performed && isEmail(editable.email);
-  $: update_password_enabled =
-    password_change.length > 0 && password_change === password_confirm;
+  $: update_password_enabled = password_strong_enough_and_equal(password_change, password_confirm);
   const user_promise = MeService.meControllerGet().then((data) => {
     data_loaded = true;
     data.groups = data.groups.map((g) => g.id);