Merge branch 'develop'

Author: devbean

src/abstract-wp-client.ts

@@ -139,8 +139,12 @@ export abstract class AbstractWordPressClient implements WordPressClient {
                 username,
                 password
               });
-              const selectedCategories = matterData.categories as number[] ?? this.profile.lastSelectedCategories;
-              const { postParams, publishModal } = await openPublishModal(this.plugin, categories, selectedCategories);
+              const selectedCategories = matterData.categories as number[]
+                ?? this.profile.lastSelectedCategories
+                ?? [ 1 ];
+              const { postParams, publishModal } = await openPublishModal(
+                this.plugin, categories, selectedCategories
+              );
               const params = this.readFromFrontMatter(noteTitle, matterData, postParams);
               params.content = content;
               const result = await this.doPublish({

src/main.ts

@@ -11,6 +11,7 @@ import { AppState } from './app-state';
 import { DEFAULT_SETTINGS, SettingsVersion, upgradeSettings, WordpressPluginSettings } from './plugin-settings';
 import { PassCrypto } from './pass-crypto';
 import { doClientPublish, setupMarkdownParser } from './utils';
+import { cloneDeep } from 'lodash-es';
 
 export default class WordpressPlugin extends Plugin {
 
@@ -94,7 +95,17 @@ export default class WordpressPlugin extends Plugin {
   }
 
   async saveSettings() {
-    await this.saveData(this.#settings);
+    const settings = cloneDeep(this.settings);
+    for (let i = 0; i < settings.profiles.length; i++) {
+      const profile = settings.profiles[i];
+      const password = profile.password;
+      if (password) {
+        const crypto = new PassCrypto();
+        profile.encryptedPassword = await crypto.encrypt(password);
+        delete profile.password;
+      }
+    }
+    await this.saveData(settings);
   }
 
   updateRibbonIcon(): void {

src/plugin-settings.ts

@@ -93,29 +93,33 @@ export async function upgradeSettings(
         showWordPressEditConfirm: existingSettings.showWordPressEditConfirm,
         mathJaxOutputType: existingSettings.mathJaxOutputType
       });
-      const endpoint = existingSettings.endpoint;
-      const apiType = existingSettings.apiType;
-      const xmlRpcPath = existingSettings.xmlRpcPath;
-      const username = existingSettings.username;
-      const password = existingSettings.password;
-      const lastSelectedCategories = existingSettings.lastSelectedCategories;
-      const crypto = new PassCrypto();
-      const encryptedPassword = await crypto.encrypt(password);
-      const profile = {
-        name: WP_DEFAULT_PROFILE_NAME,
-        apiType: apiType,
-        endpoint: endpoint,
-        xmlRpcPath: xmlRpcPath,
-        saveUsername: !isNil(username),
-        savePassword: !isNil(password),
-        isDefault: true,
-        lastSelectedCategories: lastSelectedCategories,
-        username: username,
-        encryptedPassword: encryptedPassword
-      };
-      newSettings.profiles = [
-        profile
-      ];
+      if (existingSettings.endpoint) {
+        const endpoint = existingSettings.endpoint;
+        const apiType = existingSettings.apiType;
+        const xmlRpcPath = existingSettings.xmlRpcPath;
+        const username = existingSettings.username;
+        const password = existingSettings.password;
+        const lastSelectedCategories = existingSettings.lastSelectedCategories;
+        const crypto = new PassCrypto();
+        const encryptedPassword = await crypto.encrypt(password);
+        const profile = {
+          name: WP_DEFAULT_PROFILE_NAME,
+          apiType: apiType,
+          endpoint: endpoint,
+          xmlRpcPath: xmlRpcPath,
+          saveUsername: !isNil(username),
+          savePassword: !isNil(password),
+          isDefault: true,
+          lastSelectedCategories: lastSelectedCategories,
+          username: username,
+          encryptedPassword: encryptedPassword
+        };
+        newSettings.profiles = [
+          profile
+        ];
+      } else {
+        newSettings.profiles = [];
+      }
       return newSettings;
     }
   }