From 45bf2ac867edd115d0271b65638cfe7c83c773c6 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Thu, 2 May 2024 15:08:17 -0500
Subject: [PATCH] useCurrentUserStore() has been renamed to useCurrentUser()

---
 .../{currentUserStore.mjs => useCurrentUser.mjs}   | 14 +++++++++++++-
 composables/ving/useMessageBus.mjs                 |  2 +-
 composables/ving/userSettingsButtons.mjs           |  2 +-
 composables/ving/userSettingsLinks.mjs             |  2 +-
 layouts/default.vue                                |  2 +-
 middleware/admin.mjs                               |  2 +-
 middleware/auth.mjs                                |  2 +-
 pages/user/[id]/profile.vue                        |  2 +-
 pages/user/admin/[id].vue                          |  2 +-
 pages/user/create.vue                              |  2 +-
 pages/user/login.vue                               |  2 +-
 pages/user/logout.vue                              |  2 +-
 pages/user/must-verify-email.vue                   |  2 +-
 pages/user/settings/account.vue                    |  2 +-
 pages/user/settings/apikeys.vue                    |  2 +-
 pages/user/settings/index.vue                      |  2 +-
 pages/user/settings/preferences.vue                |  2 +-
 pages/user/verify-email.vue                        |  2 +-
 ving/docs/change-log.md                            |  1 +
 ving/docs/subsystems/ui.md                         |  4 ++--
 20 files changed, 33 insertions(+), 20 deletions(-)
 rename composables/ving/{currentUserStore.mjs => useCurrentUser.mjs} (88%)

diff --git a/composables/ving/currentUserStore.mjs b/composables/ving/useCurrentUser.mjs
similarity index 88%
rename from composables/ving/currentUserStore.mjs
rename to composables/ving/useCurrentUser.mjs
index d990bca7..9f3e0306 100644
--- a/composables/ving/currentUserStore.mjs
+++ b/composables/ving/useCurrentUser.mjs
@@ -4,7 +4,7 @@ import { isObject, isUndefined } from '#ving/utils/identify.mjs';
 
 const query = { includeOptions: true, includeMeta: true, includeLinks: true };
 
-export const useCurrentUserStore = defineStore('currentUser', {
+export const useCurrentUser = defineStore('currentUser', {
     state: () => ({
         props: {},
         meta: {},
@@ -71,6 +71,18 @@ export const useCurrentUserStore = defineStore('currentUser', {
                 this.setState(response.data);
             return response;
         },
+        async save(key) {
+            const valuesToSave = {};
+            valuesToSave[key] = this.props[key];
+            const response = await useRest(this.links?.self?.href, {
+                method: 'put',
+                body: valuesToSave,
+                query,
+            });
+            if (response.data)
+                this.setState(response.data);
+            return response;
+        },
         async create(newUser) {
             const response = await useRest(`/api/${useRestVersion()}/user`, {
                 method: 'post',
diff --git a/composables/ving/useMessageBus.mjs b/composables/ving/useMessageBus.mjs
index 7addff9b..c42ba125 100644
--- a/composables/ving/useMessageBus.mjs
+++ b/composables/ving/useMessageBus.mjs
@@ -11,7 +11,7 @@
  */
 export default async function useMessageBus() {
     const notify = useNotifyStore();
-    const currentUser = useCurrentUserStore();
+    const currentUser = useCurrentUser();
 
     let reconnectFrequencySeconds = 1;
     let bus = null;
diff --git a/composables/ving/userSettingsButtons.mjs b/composables/ving/userSettingsButtons.mjs
index 922645f3..33c92b7d 100644
--- a/composables/ving/userSettingsButtons.mjs
+++ b/composables/ving/userSettingsButtons.mjs
@@ -6,7 +6,7 @@
  */
 
 export default () => {
-    const currentUser = useCurrentUserStore();
+    const currentUser = useCurrentUser();
     const buttons = computed(() => {
         const out = [
             { label: 'Sign Out', to: '/user/logout', icon: 'ph:door', severity: 'primary' },
diff --git a/composables/ving/userSettingsLinks.mjs b/composables/ving/userSettingsLinks.mjs
index 80cca285..b4f47e53 100644
--- a/composables/ving/userSettingsLinks.mjs
+++ b/composables/ving/userSettingsLinks.mjs
@@ -6,7 +6,7 @@
  */
 
 export default () => {
-    const currentUser = useCurrentUserStore();
+    const currentUser = useCurrentUser();
     const links = computed(() => {
         const out = [
             { label: 'Profile', to: '/user/settings', icon: 'ph:user' },
diff --git a/layouts/default.vue b/layouts/default.vue
index c25e5b6d..9f65b1f5 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -64,7 +64,7 @@
 
 <script setup>
 const config = useRuntimeConfig();
-const currentUser = useCurrentUserStore();
+const currentUser = useCurrentUser();
 await currentUser.isAuthenticated();
 onMounted(async () => {
     // subscribe to message bus
diff --git a/middleware/admin.mjs b/middleware/admin.mjs
index 0fc19d36..b4bd75b8 100644
--- a/middleware/admin.mjs
+++ b/middleware/admin.mjs
@@ -1,6 +1,6 @@
 import { ouch } from '#ving/utils/ouch.mjs';
 export default defineNuxtRouteMiddleware(async (to, from) => {
-    const currentUser = useCurrentUserStore();
+    const currentUser = useCurrentUser();
     if (!currentUser.props?.admin) {
         throw ouch(403, 'You must be an admin to view this.');
     }
diff --git a/middleware/auth.mjs b/middleware/auth.mjs
index a290d9cd..0c8c0066 100644
--- a/middleware/auth.mjs
+++ b/middleware/auth.mjs
@@ -1,5 +1,5 @@
 export default defineNuxtRouteMiddleware(async (to, from) => {
-    const currentUser = useCurrentUserStore();
+    const currentUser = useCurrentUser();
     const isAuthenticated = await currentUser.isAuthenticated();
     if (!isAuthenticated) {
         return await navigateTo(`/user/login?redirectAfter=${to.fullPath}`);
diff --git a/pages/user/[id]/profile.vue b/pages/user/[id]/profile.vue
index 257bea06..12312c43 100644
--- a/pages/user/[id]/profile.vue
+++ b/pages/user/[id]/profile.vue
@@ -40,7 +40,7 @@ await user.fetch()
 
 onBeforeRouteLeave(() => user.dispose());
 
-const currentUser = useCurrentUserStore();
+const currentUser = useCurrentUser();
 
 
 </script>
\ No newline at end of file
diff --git a/pages/user/admin/[id].vue b/pages/user/admin/[id].vue
index f18b913e..372e65c9 100644
--- a/pages/user/admin/[id].vue
+++ b/pages/user/admin/[id].vue
@@ -120,7 +120,7 @@ onBeforeRouteLeave(() => user.dispose());
 async function become() {
     await user.call('post', user.links?.self.href + '/become', undefined, {
         async onSuccess() {
-            const currentUser = useCurrentUserStore();
+            const currentUser = useCurrentUser();
             currentUser.fetch();
             await navigateTo('/');
         }
diff --git a/pages/user/create.vue b/pages/user/create.vue
index fc7d44bc..66c169a0 100644
--- a/pages/user/create.vue
+++ b/pages/user/create.vue
@@ -58,7 +58,7 @@
 <script setup>
 let newUser = ref({ username: '', email: '', realName: '', password: '', password2: '' });
 const config = useRuntimeConfig();
-const currentUser = useCurrentUserStore();
+const currentUser = useCurrentUser();
 
 async function createAccount() {
     const response = await currentUser.create(newUser.value);
diff --git a/pages/user/login.vue b/pages/user/login.vue
index 930294af..8b3d8bc8 100644
--- a/pages/user/login.vue
+++ b/pages/user/login.vue
@@ -57,7 +57,7 @@ import { isString } from '#ving/utils/identify.mjs';
 let login = ref('');
 let password = ref('');
 const config = useRuntimeConfig();
-const currentUser = useCurrentUserStore();
+const currentUser = useCurrentUser();
 
 async function tryLogin() {
     const response = await currentUser.login(login.value, password.value);
diff --git a/pages/user/logout.vue b/pages/user/logout.vue
index 6718ac5d..dce86ab6 100644
--- a/pages/user/logout.vue
+++ b/pages/user/logout.vue
@@ -12,7 +12,7 @@ import { sleep } from '#ving/utils/sleep.mjs';
 definePageMeta({
     middleware: 'auth'
 });
-const currentUser = useCurrentUserStore();
+const currentUser = useCurrentUser();
 await currentUser.logout();
 await sleep(1000 * 5);
 await navigateTo('/');
diff --git a/pages/user/must-verify-email.vue b/pages/user/must-verify-email.vue
index a10dce3a..52f30e9b 100644
--- a/pages/user/must-verify-email.vue
+++ b/pages/user/must-verify-email.vue
@@ -13,7 +13,7 @@
 <script setup>
 const config = useRuntimeConfig();
 onMounted(async () => {
-    const currentUser = useCurrentUserStore();
+    const currentUser = useCurrentUser();
     const query = useRoute().query;
     await currentUser.sendVerifyEmail(query.redirectAfter?.toString());
 });
diff --git a/pages/user/settings/account.vue b/pages/user/settings/account.vue
index cc4de83b..46940e8e 100644
--- a/pages/user/settings/account.vue
+++ b/pages/user/settings/account.vue
@@ -52,7 +52,7 @@ definePageMeta({
     middleware: ['auth']
 });
 const notify = useNotifyStore();
-const currentUser = useCurrentUserStore();
+const currentUser = useCurrentUser();
 const links = userSettingsLinks();
 const buttons = userSettingsButtons();
 const newPassword = ref({ password: '', password2: '' });
diff --git a/pages/user/settings/apikeys.vue b/pages/user/settings/apikeys.vue
index 373cee07..e3636ed3 100644
--- a/pages/user/settings/apikeys.vue
+++ b/pages/user/settings/apikeys.vue
@@ -97,7 +97,7 @@
 definePageMeta({
     middleware: ['auth']
 });
-const currentUser = useCurrentUserStore();
+const currentUser = useCurrentUser();
 const links = userSettingsLinks();
 const buttons = userSettingsButtons();
 const apikeys = useVingKind({
diff --git a/pages/user/settings/index.vue b/pages/user/settings/index.vue
index 8e14085a..9f62ffc3 100644
--- a/pages/user/settings/index.vue
+++ b/pages/user/settings/index.vue
@@ -45,7 +45,7 @@
 definePageMeta({
     middleware: ['auth']
 });
-const currentUser = useCurrentUserStore();
+const currentUser = useCurrentUser();
 const links = userSettingsLinks();
 const buttons = userSettingsButtons();
 </script>
\ No newline at end of file
diff --git a/pages/user/settings/preferences.vue b/pages/user/settings/preferences.vue
index 71c40d22..c5dbaa08 100644
--- a/pages/user/settings/preferences.vue
+++ b/pages/user/settings/preferences.vue
@@ -19,7 +19,7 @@
 definePageMeta({
     middleware: ['auth']
 });
-const currentUser = useCurrentUserStore();
+const currentUser = useCurrentUser();
 const links = userSettingsLinks();
 const buttons = userSettingsButtons();
 </script>
\ No newline at end of file
diff --git a/pages/user/verify-email.vue b/pages/user/verify-email.vue
index 54a2eafa..a0aed39d 100644
--- a/pages/user/verify-email.vue
+++ b/pages/user/verify-email.vue
@@ -12,7 +12,7 @@
 <script setup>
 const config = useRuntimeConfig();
 const message = ref('Please wait while we verify your email address.');
-const currentUser = useCurrentUserStore();
+const currentUser = useCurrentUser();
 const query = useRoute().query;
 await currentUser.verifyEmail(query.verify?.toString());
 if (currentUser.props?.verifiedEmail) {
diff --git a/ving/docs/change-log.md b/ving/docs/change-log.md
index 26d99e34..f199c38f 100644
--- a/ving/docs/change-log.md
+++ b/ving/docs/change-log.md
@@ -9,6 +9,7 @@ outline: deep
 * NOTE: useDateTime() no longer exists, just use formatDate(), formatDateTime(), and formatTimeAgo() directly.
 * NOTE: restVersion() has been renamed to useRestVersion(), update your codebase appropriately.
 * NOTE: adminLinks() has been renamed to useAdminLinks(), update your codebase appropriately.
+* NOTE: useCurrentUserStore() has been renamed to useCurrentUser(), update your codebase appropriately.
 
 ## 2024-04-29
 * Implemented: reformat page generator to use panel components on view and edit #139
diff --git a/ving/docs/subsystems/ui.md b/ving/docs/subsystems/ui.md
index 6cae7eae..c30c6f76 100644
--- a/ving/docs/subsystems/ui.md
+++ b/ving/docs/subsystems/ui.md
@@ -371,11 +371,11 @@ Returns a data structure for use with the `PanelNav` component.
 const links = useAdminLinks();
 ```
 
-### currentUserStore()
+### useCurrentUser()
 Gets you the currently logged in user. 
 
 ```js
-const user = useCurrentUserStore();
+const user = useCurrentUser();
 if (await user.isAuthenticated()) {
     // do logged in user stuff
 }