From 6e8b6549ea8951f6b98e5c513bbad83a6d852ac7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn-Michael=20Miehe?= <jmm@yavook.de>
Date: Thu, 21 Sep 2023 20:01:39 +0000
Subject: [PATCH] more Credentials cleanup

---
 ui/src/components/AdminButton.vue | 7 ++++---
 ui/src/components/LoginModal.vue  | 2 +-
 ui/src/plugins/advent22.ts        | 4 ++++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ui/src/components/AdminButton.vue b/ui/src/components/AdminButton.vue
index ede1c33..886c8b8 100644
--- a/ui/src/components/AdminButton.vue
+++ b/ui/src/components/AdminButton.vue
@@ -11,6 +11,7 @@
 </template>
 
 <script lang="ts">
+import { Credentials } from "@/lib/api";
 import { Options, Vue } from "vue-class-component";
 
 import BulmaButton from "./bulma/Button.vue";
@@ -38,7 +39,7 @@ export default class extends Vue {
   public on_click() {
     if (this.modelValue) {
       // logout
-      this.$advent22.set_api_auth();
+      this.$advent22.clear_api_auth();
       this.$emit("update:modelValue", false);
     } else {
       // show login modal
@@ -47,9 +48,9 @@ export default class extends Vue {
     }
   }
 
-  public on_submit(username: string, password: string) {
+  public on_submit(creds: Credentials) {
     this.modal_visible = false;
-    this.$advent22.api_auth = [username, password];
+    this.$advent22.api_auth = creds;
 
     this.$advent22
       .api_get<boolean>("admin/is_admin")
diff --git a/ui/src/components/LoginModal.vue b/ui/src/components/LoginModal.vue
index 78b1c60..399f274 100644
--- a/ui/src/components/LoginModal.vue
+++ b/ui/src/components/LoginModal.vue
@@ -89,7 +89,7 @@ export default class extends Vue {
   }
 
   public submit(): void {
-    this.$emit("submit", this.username, this.password);
+    this.$emit("submit", [this.username, this.password]);
   }
 
   public cancel(): void {
diff --git a/ui/src/plugins/advent22.ts b/ui/src/plugins/advent22.ts
index c7dc0e2..402c2be 100644
--- a/ui/src/plugins/advent22.ts
+++ b/ui/src/plugins/advent22.ts
@@ -94,6 +94,10 @@ export class Advent22 {
     this._api_auth = creds;
   }
 
+  public clear_api_auth(): void {
+    this.set_api_auth();
+  }
+
   public set api_auth(creds: Credentials) {
     this.set_api_auth(creds);
   }