From 3abd3fa166a19e31a04e298a3305fb2d149847e6 Mon Sep 17 00:00:00 2001
From: amay077 <okuokuoku@gmail.com>
Date: Mon, 6 May 2024 14:22:49 +0900
Subject: [PATCH] avoid password

---
 src/lib/BlueSkyConnection.svelte |  9 +++++----
 src/lib/MainContent.svelte       | 12 +++++-------
 src/lib/func.ts                  |  5 +++--
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/lib/BlueSkyConnection.svelte b/src/lib/BlueSkyConnection.svelte
index 394584e..4ed8b82 100644
--- a/src/lib/BlueSkyConnection.svelte
+++ b/src/lib/BlueSkyConnection.svelte
@@ -10,8 +10,8 @@
   let bskyServer = 'https://bsky.social';
 
   let postSettings = loadPostSetting('bluesky');
-  let user = postSettings?.data?.user ?? '';
-  let password = postSettings?.data?.password ?? '';
+  let user = postSettings?.data?.sessionData?.email ?? '';
+  let password = '';
   
   const onApplyBSkySettings = async () => {
     console.log(`onApplyBSkySettings -> user:`, user);
@@ -30,8 +30,9 @@
       alert('BlueSky に接続できませんでした。');
       return;
     }
-
-    postSettings = { type: 'bluesky', title: 'BlueSky', enabled: true, data: { user, password } };
+    
+    const sessionData = res.data;
+    postSettings = { type: 'bluesky', title: 'BlueSky', enabled: true, data: { sessionData } };
     savePostSetting(postSettings);
     dispatch('onChange');
     alert('BlueSky に接続しました。');
diff --git a/src/lib/MainContent.svelte b/src/lib/MainContent.svelte
index 6ffb3fb..1efae98 100644
--- a/src/lib/MainContent.svelte
+++ b/src/lib/MainContent.svelte
@@ -199,9 +199,12 @@
   const postToBlueSky = async (text: string): Promise<boolean> => {
     try {
       const agent = new BskyAgent({
-        service: 'https://bsky.social'
+        service: 'https://bsky.social',
       });
   
+      // resume session
+      agent.resumeSession(postSettings.bluesky?.data?.sessionData!);
+
       // creating richtext
       const rt = new RichText({
         text,
@@ -213,12 +216,7 @@
         text: rt.text,
         facets: rt.facets,
         createdAt: new Date().toISOString(),
-      };    
-  
-      await agent.login({
-        identifier: 'okuokuoku@gmail.com',
-        password: 'k36i-nsi2-in2j-mg34'
-      });
+      };
   
       await agent.post(postRecord);       
       return true;
diff --git a/src/lib/func.ts b/src/lib/func.ts
index 1cd0dc9..c0263b8 100644
--- a/src/lib/func.ts
+++ b/src/lib/func.ts
@@ -1,3 +1,5 @@
+import type { AtpSessionData } from "@atproto/api";
+
 export type SettingDataMastodon = {
   type: 'mastodon',
   title: 'Mastodon',
@@ -16,8 +18,7 @@ export type SettingDataBluesky = {
   title: 'BlueSky',
   enabled: boolean,
   data: {
-    user: string,
-    password: string,
+    sessionData: AtpSessionData,
   }
 };