@sudobility/wildduck_client 1.2.0 → 1.4.0

package/dist/utils/autoreply.js.map

@@ -1 +1 @@
-{"version":3,"file":"autoreply.js","sourceRoot":"","sources":["../../src/utils/autoreply.ts"],"names":[],"mappings":"AAyBA,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,aAA4B,EAC5B,MAAsB,EACtB,MAAc;IAEd,MAAM,MAAM,GAAG,MAAM,CAAC,mBAAmB,IAAI,MAAM,CAAC,UAAU,CAAC;IAC/D,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,OAAO,CAC1C,GAAG,MAAM,UAAU,MAAM,YAAY,EACrC;QACE,MAAM,EAAE,KAAK;QACb,OAAO,EAAE;YACP,cAAc,EAAE,kBAAkB;YAClC,GAAG,CAAC,MAAM,CAAC,mBAAmB;gBAC5B,CAAC,CAAC;oBACE,aAAa,EAAE,UAAU,MAAM,CAAC,QAAQ,EAAE;oBAC1C,cAAc,EAAE,YAAY;iBAC7B;gBACH,CAAC,CAAC,EAAE,gBAAgB,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC;SAC3C;KACF,CACF,CAAC;IACF,OAAO,QAAQ,EAAE,IAAyB,CAAC;AAC7C,CAAC;AAaD,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,aAA4B,EAC5B,MAAsB,EACtB,MAAc,EACd,MAA6B;IAE7B,MAAM,MAAM,GAAG,MAAM,CAAC,mBAAmB,IAAI,MAAM,CAAC,UAAU,CAAC;IAC/D,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,OAAO,CAC1C,GAAG,MAAM,UAAU,MAAM,YAAY,EACrC;QACE,MAAM,EAAE,KAAK;QACb,OAAO,EAAE;YACP,cAAc,EAAE,kBAAkB;YAClC,GAAG,CAAC,MAAM,CAAC,mBAAmB;gBAC5B,CAAC,CAAC;oBACE,aAAa,EAAE,UAAU,MAAM,CAAC,QAAQ,EAAE;oBAC1C,cAAc,EAAE,YAAY;iBAC7B;gBACH,CAAC,CAAC,EAAE,gBAAgB,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC;SAC3C;QACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;KAC7B,CACF,CAAC;IACF,OAAO,QAAQ,EAAE,IAA4B,CAAC;AAChD,CAAC;AAMD,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,aAA4B,EAC5B,MAAsB,EACtB,MAAc,EACd,OAKC,EACD,QAGC,EACD,IAAa,EACb,EAAW;IAEX,MAAM,MAAM,GAAQ;QAClB,MAAM,EAAE,IAAI;QACZ,GAAG,OAAO;QACV,GAAG,QAAQ;KACZ,CAAC;IACF,IAAI,IAAI;QAAE,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;IAC7B,IAAI,EAAE;QAAE,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC;IACvB,OAAO,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAChE,CAAC;AAMD,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,aAA4B,EAC5B,MAAsB,EACtB,MAAc,EACd,IAAa,EACb,EAAW;IAEX,MAAM,MAAM,GAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IACtC,IAAI,IAAI;QAAE,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;IAC7B,IAAI,EAAE;QAAE,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC;IACvB,OAAO,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAChE,CAAC;AAMD,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,aAA4B,EAC5B,MAAsB,EACtB,MAAc,EACd,IAAa,EACb,EAAW;IAEX,MAAM,MAAM,GAAG,MAAM,CAAC,mBAAmB,IAAI,MAAM,CAAC,UAAU,CAAC;IAC/D,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,OAAO,CAC1C,GAAG,MAAM,UAAU,MAAM,YAAY,EACrC;QACE,MAAM,EAAE,QAAQ;QAChB,OAAO,EAAE;YACP,cAAc,EAAE,kBAAkB;YAClC,GAAG,CAAC,MAAM,CAAC,mBAAmB;gBAC5B,CAAC,CAAC;oBACE,aAAa,EAAE,UAAU,MAAM,CAAC,QAAQ,EAAE;oBAC1C,cAAc,EAAE,YAAY;iBAC7B;gBACH,CAAC,CAAC,EAAE,gBAAgB,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC;SAC3C;QACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;KACnC,CACF,CAAC;IACF,OAAO,QAAQ,EAAE,IAA4B,CAAC;AAChD,CAAC"}
+{"version":3,"file":"autoreply.js","sourceRoot":"","sources":["../../src/utils/autoreply.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AA2BzD,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,aAA4B,EAC5B,MAAsB,EACtB,gBAAkC;IAElC,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IACnD,OAAO,GAAG,CAAC,YAAY,CAAC,gBAAgB,CAA+B,CAAC;AAC1E,CAAC;AAaD,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,aAA4B,EAC5B,MAAsB,EACtB,gBAAkC,EAClC,MAA6B;IAE7B,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IACnD,OAAO,GAAG,CAAC,eAAe,CAAC,gBAAgB,EAAE,MAAa,CAAC,CAAC;AAC9D,CAAC;AAMD,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,aAA4B,EAC5B,MAAsB,EACtB,gBAAkC,EAClC,OAKC,EACD,QAGC;IAED,MAAM,MAAM,GAA0B;QACpC,MAAM,EAAE,IAAI;QACZ,GAAG,OAAO;QACV,GAAG,QAAQ;KACZ,CAAC;IACF,OAAO,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,CAAC,CAAC;AAC1E,CAAC;AAMD,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,aAA4B,EAC5B,MAAsB,EACtB,gBAAkC;IAElC,OAAO,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,gBAAgB,EAAE;QAC9D,MAAM,EAAE,KAAK;KACd,CAAC,CAAC;AACL,CAAC;AAMD,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,aAA4B,EAC5B,MAAsB,EACtB,gBAAkC;IAElC,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IACnD,OAAO,GAAG,CAAC,eAAe,CAAC,gBAAgB,CAAC,CAAC;AAC/C,CAAC"}

package/dist/utils/filters.d.ts

@@ -1,5 +1,5 @@
 import type { Optional } from "@sudobility/types";
-import type { EmailFilter, FilterAction, FilterQuery, FilterResponse, NetworkClient, WildduckConfig } from "@sudobility/types";
+import type { EmailFilter, FilterAction, FilterQuery, FilterResponse, NetworkClient, WildduckConfig, WildduckUserAuth } from "@sudobility/types";
 export interface FilterParams {
     name: string;
     query: FilterQuery;
@@ -8,19 +8,19 @@ export interface FilterParams {
     sess?: string;
     ip?: string;
 }
-export declare function getFilters(networkClient: NetworkClient, config: WildduckConfig, userId: string): Promise<EmailFilter[]>;
-export declare function getFilter(networkClient: NetworkClient, config: WildduckConfig, userId: string, filterId: string): Promise<Optional<EmailFilter>>;
-export declare function createFilter(networkClient: NetworkClient, config: WildduckConfig, userId: string, params: FilterParams): Promise<FilterResponse>;
-export declare function updateFilter(networkClient: NetworkClient, config: WildduckConfig, userId: string, filterId: string, params: Partial<FilterParams>): Promise<{
+export declare function getFilters(networkClient: NetworkClient, config: WildduckConfig, wildduckUserAuth: WildduckUserAuth): Promise<EmailFilter[]>;
+export declare function getFilter(networkClient: NetworkClient, config: WildduckConfig, wildduckUserAuth: WildduckUserAuth, filterId: string): Promise<Optional<EmailFilter>>;
+export declare function createFilter(networkClient: NetworkClient, config: WildduckConfig, wildduckUserAuth: WildduckUserAuth, params: FilterParams): Promise<FilterResponse>;
+export declare function updateFilter(networkClient: NetworkClient, config: WildduckConfig, wildduckUserAuth: WildduckUserAuth, filterId: string, params: Partial<FilterParams>): Promise<{
     success: boolean;
 }>;
-export declare function deleteFilter(networkClient: NetworkClient, config: WildduckConfig, userId: string, filterId: string, sess?: string, ip?: string): Promise<{
+export declare function deleteFilter(networkClient: NetworkClient, config: WildduckConfig, wildduckUserAuth: WildduckUserAuth, filterId: string): Promise<{
     success: boolean;
 }>;
-export declare function enableFilter(networkClient: NetworkClient, config: WildduckConfig, userId: string, filterId: string, sess?: string, ip?: string): Promise<{
+export declare function enableFilter(networkClient: NetworkClient, config: WildduckConfig, wildduckUserAuth: WildduckUserAuth, filterId: string): Promise<{
     success: boolean;
 }>;
-export declare function disableFilter(networkClient: NetworkClient, config: WildduckConfig, userId: string, filterId: string, sess?: string, ip?: string): Promise<{
+export declare function disableFilter(networkClient: NetworkClient, config: WildduckConfig, wildduckUserAuth: WildduckUserAuth, filterId: string): Promise<{
     success: boolean;
 }>;
 //# sourceMappingURL=filters.d.ts.map

package/dist/utils/filters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filters.d.ts","sourceRoot":"","sources":["../../src/utils/filters.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,KAAK,EACV,WAAW,EACX,YAAY,EACZ,WAAW,EACX,cAAc,EACd,aAAa,EACb,cAAc,EACf,MAAM,mBAAmB,CAAC;AAK3B,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,WAAW,CAAC;IACnB,MAAM,EAAE,YAAY,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;CACb;AAMD,wBAAsB,UAAU,CAC9B,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,WAAW,EAAE,CAAC,CAmBxB;AAMD,wBAAsB,SAAS,CAC7B,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAsBhC;AAMD,wBAAsB,YAAY,CAChC,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC,cAAc,CAAC,CAmBzB;AAMD,wBAAsB,YAAY,CAChC,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,GAC5B,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAmB/B;AAMD,wBAAsB,YAAY,CAChC,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,IAAI,CAAC,EAAE,MAAM,EACb,EAAE,CAAC,EAAE,MAAM,GACV,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAmB/B;AAMD,wBAAsB,YAAY,CAChC,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,IAAI,CAAC,EAAE,MAAM,EACb,EAAE,CAAC,EAAE,MAAM,GACV,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAK/B;AAMD,wBAAsB,aAAa,CACjC,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,IAAI,CAAC,EAAE,MAAM,EACb,EAAE,CAAC,EAAE,MAAM,GACV,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAK/B"}
+{"version":3,"file":"filters.d.ts","sourceRoot":"","sources":["../../src/utils/filters.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,KAAK,EACV,WAAW,EACX,YAAY,EACZ,WAAW,EACX,cAAc,EACd,aAAa,EACb,cAAc,EACd,gBAAgB,EACjB,MAAM,mBAAmB,CAAC;AAK3B,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,WAAW,CAAC;IACnB,MAAM,EAAE,YAAY,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;CACb;AAMD,wBAAsB,UAAU,CAC9B,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,gBAAgB,EAAE,gBAAgB,GACjC,OAAO,CAAC,WAAW,EAAE,CAAC,CAIxB;AAMD,wBAAsB,SAAS,CAC7B,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,gBAAgB,EAAE,gBAAgB,EAClC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAKhC;AAMD,wBAAsB,YAAY,CAChC,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,gBAAgB,EAAE,gBAAgB,EAClC,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC,cAAc,CAAC,CAGzB;AAMD,wBAAsB,YAAY,CAChC,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,gBAAgB,EAAE,gBAAgB,EAClC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,GAC5B,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAG/B;AAMD,wBAAsB,YAAY,CAChC,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,gBAAgB,EAAE,gBAAgB,EAClC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAG/B;AAMD,wBAAsB,YAAY,CAChC,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,gBAAgB,EAAE,gBAAgB,EAClC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAI/B;AAMD,wBAAsB,aAAa,CACjC,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,gBAAgB,EAAE,gBAAgB,EAClC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAI/B"}

package/dist/utils/filters.js

@@ -1,106 +1,33 @@
-export async function getFilters(networkClient, config, userId) {
-    const apiUrl = config.cloudflareWorkerUrl || config.backendUrl;
-    const response = await networkClient.request(`${apiUrl}/users/${userId}/filters`, {
-        method: "GET",
-        headers: {
-            "Content-Type": "application/json",
-            ...(config.cloudflareWorkerUrl
-                ? {
-                    Authorization: `Bearer ${config.apiToken}`,
-                    "X-App-Source": "0xmail-box",
-                }
-                : { "X-Access-Token": config.apiToken }),
-        },
-    });
-    const data = response?.data;
+import { WildduckAPI } from "../network/wildduck-client";
+export async function getFilters(networkClient, config, wildduckUserAuth) {
+    const api = new WildduckAPI(networkClient, config);
+    const data = await api.getFilters(wildduckUserAuth);
     return data.results || [];
 }
-export async function getFilter(networkClient, config, userId, filterId) {
-    const apiUrl = config.cloudflareWorkerUrl || config.backendUrl;
-    try {
-        const response = await networkClient.request(`${apiUrl}/users/${userId}/filters/${filterId}`, {
-            method: "GET",
-            headers: {
-                "Content-Type": "application/json",
-                ...(config.cloudflareWorkerUrl
-                    ? {
-                        Authorization: `Bearer ${config.apiToken}`,
-                        "X-App-Source": "0xmail-box",
-                    }
-                    : { "X-Access-Token": config.apiToken }),
-            },
-        });
-        return response?.data;
-    }
-    catch {
-        return null;
-    }
+export async function getFilter(networkClient, config, wildduckUserAuth, filterId) {
+    const filters = await getFilters(networkClient, config, wildduckUserAuth);
+    return filters.find((f) => f.id === filterId) || null;
 }
-export async function createFilter(networkClient, config, userId, params) {
-    const apiUrl = config.cloudflareWorkerUrl || config.backendUrl;
-    const response = await networkClient.request(`${apiUrl}/users/${userId}/filters`, {
-        method: "POST",
-        headers: {
-            "Content-Type": "application/json",
-            ...(config.cloudflareWorkerUrl
-                ? {
-                    Authorization: `Bearer ${config.apiToken}`,
-                    "X-App-Source": "0xmail-box",
-                }
-                : { "X-Access-Token": config.apiToken }),
-        },
-        body: JSON.stringify(params),
-    });
-    return response?.data;
+export async function createFilter(networkClient, config, wildduckUserAuth, params) {
+    const api = new WildduckAPI(networkClient, config);
+    return api.createFilter(wildduckUserAuth, params);
 }
-export async function updateFilter(networkClient, config, userId, filterId, params) {
-    const apiUrl = config.cloudflareWorkerUrl || config.backendUrl;
-    const response = await networkClient.request(`${apiUrl}/users/${userId}/filters/${filterId}`, {
-        method: "PUT",
-        headers: {
-            "Content-Type": "application/json",
-            ...(config.cloudflareWorkerUrl
-                ? {
-                    Authorization: `Bearer ${config.apiToken}`,
-                    "X-App-Source": "0xmail-box",
-                }
-                : { "X-Access-Token": config.apiToken }),
-        },
-        body: JSON.stringify(params),
-    });
-    return response?.data;
+export async function updateFilter(networkClient, config, wildduckUserAuth, filterId, params) {
+    const api = new WildduckAPI(networkClient, config);
+    return api.updateFilter(wildduckUserAuth, filterId, params);
 }
-export async function deleteFilter(networkClient, config, userId, filterId, sess, ip) {
-    const apiUrl = config.cloudflareWorkerUrl || config.backendUrl;
-    const response = await networkClient.request(`${apiUrl}/users/${userId}/filters/${filterId}`, {
-        method: "DELETE",
-        headers: {
-            "Content-Type": "application/json",
-            ...(config.cloudflareWorkerUrl
-                ? {
-                    Authorization: `Bearer ${config.apiToken}`,
-                    "X-App-Source": "0xmail-box",
-                }
-                : { "X-Access-Token": config.apiToken }),
-        },
-        body: JSON.stringify({ sess, ip }),
-    });
-    return response?.data;
+export async function deleteFilter(networkClient, config, wildduckUserAuth, filterId) {
+    const api = new WildduckAPI(networkClient, config);
+    return api.deleteFilter(wildduckUserAuth, filterId);
 }
-export async function enableFilter(networkClient, config, userId, filterId, sess, ip) {
-    const params = { disabled: false };
-    if (sess)
-        params.sess = sess;
-    if (ip)
-        params.ip = ip;
-    return updateFilter(networkClient, config, userId, filterId, params);
+export async function enableFilter(networkClient, config, wildduckUserAuth, filterId) {
+    return updateFilter(networkClient, config, wildduckUserAuth, filterId, {
+        disabled: false,
+    });
 }
-export async function disableFilter(networkClient, config, userId, filterId, sess, ip) {
-    const params = { disabled: true };
-    if (sess)
-        params.sess = sess;
-    if (ip)
-        params.ip = ip;
-    return updateFilter(networkClient, config, userId, filterId, params);
+export async function disableFilter(networkClient, config, wildduckUserAuth, filterId) {
+    return updateFilter(networkClient, config, wildduckUserAuth, filterId, {
+        disabled: true,
+    });
 }
 //# sourceMappingURL=filters.js.map

package/dist/utils/filters.js.map

@@ -1 +1 @@
-{"version":3,"file":"filters.js","sourceRoot":"","sources":["../../src/utils/filters.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"filters.js","sourceRoot":"","sources":["../../src/utils/filters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AA4BzD,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,aAA4B,EAC5B,MAAsB,EACtB,gBAAkC;IAElC,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IACnD,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;IACpD,OAAO,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;AAC5B,CAAC;AAMD,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,aAA4B,EAC5B,MAAsB,EACtB,gBAAkC,EAClC,QAAgB;IAIhB,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,aAAa,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAC1E,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,QAAQ,CAAC,IAAI,IAAI,CAAC;AACxD,CAAC;AAMD,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,aAA4B,EAC5B,MAAsB,EACtB,gBAAkC,EAClC,MAAoB;IAEpB,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IACnD,OAAO,GAAG,CAAC,YAAY,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;AACpD,CAAC;AAMD,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,aAA4B,EAC5B,MAAsB,EACtB,gBAAkC,EAClC,QAAgB,EAChB,MAA6B;IAE7B,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IACnD,OAAO,GAAG,CAAC,YAAY,CAAC,gBAAgB,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;AAC9D,CAAC;AAMD,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,aAA4B,EAC5B,MAAsB,EACtB,gBAAkC,EAClC,QAAgB;IAEhB,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IACnD,OAAO,GAAG,CAAC,YAAY,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;AACtD,CAAC;AAMD,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,aAA4B,EAC5B,MAAsB,EACtB,gBAAkC,EAClC,QAAgB;IAEhB,OAAO,YAAY,CAAC,aAAa,EAAE,MAAM,EAAE,gBAAgB,EAAE,QAAQ,EAAE;QACrE,QAAQ,EAAE,KAAK;KAChB,CAAC,CAAC;AACL,CAAC;AAMD,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,aAA4B,EAC5B,MAAsB,EACtB,gBAAkC,EAClC,QAAgB;IAEhB,OAAO,YAAY,CAAC,aAAa,EAAE,MAAM,EAAE,gBAAgB,EAAE,QAAQ,EAAE;QACrE,QAAQ,EAAE,IAAI;KACf,CAAC,CAAC;AACL,CAAC"}

package/dist/utils/forwarding.d.ts

@@ -1,12 +1,12 @@
-import type { ForwardingTarget, NetworkClient, WildduckConfig } from "@sudobility/types";
-export declare function getForwardingTargets(networkClient: NetworkClient, config: WildduckConfig, userId: string): Promise<ForwardingTarget[]>;
-export declare function updateForwardingTargets(networkClient: NetworkClient, config: WildduckConfig, userId: string, targets: ForwardingTarget[], sess?: string, ip?: string): Promise<{
+import type { ForwardingTarget, NetworkClient, WildduckConfig, WildduckUserAuth } from "@sudobility/types";
+export declare function getForwardingTargets(networkClient: NetworkClient, config: WildduckConfig, wildduckUserAuth: WildduckUserAuth): Promise<ForwardingTarget[]>;
+export declare function updateForwardingTargets(networkClient: NetworkClient, config: WildduckConfig, wildduckUserAuth: WildduckUserAuth, targets: ForwardingTarget[]): Promise<{
     success: boolean;
 }>;
-export declare function addForwardingTarget(networkClient: NetworkClient, config: WildduckConfig, userId: string, target: ForwardingTarget, sess?: string, ip?: string): Promise<{
+export declare function addForwardingTarget(networkClient: NetworkClient, config: WildduckConfig, wildduckUserAuth: WildduckUserAuth, target: ForwardingTarget): Promise<{
     success: boolean;
 }>;
-export declare function removeForwardingTarget(networkClient: NetworkClient, config: WildduckConfig, userId: string, target: ForwardingTarget, sess?: string, ip?: string): Promise<{
+export declare function removeForwardingTarget(networkClient: NetworkClient, config: WildduckConfig, wildduckUserAuth: WildduckUserAuth, target: ForwardingTarget): Promise<{
     success: boolean;
 }>;
 //# sourceMappingURL=forwarding.d.ts.map

package/dist/utils/forwarding.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"forwarding.d.ts","sourceRoot":"","sources":["../../src/utils/forwarding.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,aAAa,EACb,cAAc,EACf,MAAM,mBAAmB,CAAC;AAM3B,wBAAsB,oBAAoB,CACxC,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAmB7B;AAMD,wBAAsB,uBAAuB,CAC3C,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,gBAAgB,EAAE,EAC3B,IAAI,CAAC,EAAE,MAAM,EACb,EAAE,CAAC,EAAE,MAAM,GACV,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAuB/B;AAMD,wBAAsB,mBAAmB,CACvC,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,gBAAgB,EACxB,IAAI,CAAC,EAAE,MAAM,EACb,EAAE,CAAC,EAAE,MAAM,GACV,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAqB/B;AAMD,wBAAsB,sBAAsB,CAC1C,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,gBAAgB,EACxB,IAAI,CAAC,EAAE,MAAM,EACb,EAAE,CAAC,EAAE,MAAM,GACV,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAe/B"}
+{"version":3,"file":"forwarding.d.ts","sourceRoot":"","sources":["../../src/utils/forwarding.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,gBAAgB,EAChB,aAAa,EACb,cAAc,EACd,gBAAgB,EACjB,MAAM,mBAAmB,CAAC;AAM3B,wBAAsB,oBAAoB,CACxC,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,gBAAgB,EAAE,gBAAgB,GACjC,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAI7B;AAMD,wBAAsB,uBAAuB,CAC3C,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,gBAAgB,EAAE,gBAAgB,EAClC,OAAO,EAAE,gBAAgB,EAAE,GAC1B,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAG/B;AAMD,wBAAsB,mBAAmB,CACvC,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,gBAAgB,EAAE,gBAAgB,EAClC,MAAM,EAAE,gBAAgB,GACvB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAG/B;AAMD,wBAAsB,sBAAsB,CAC1C,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,gBAAgB,EAAE,gBAAgB,EAClC,MAAM,EAAE,gBAAgB,GACvB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAG/B"}

package/dist/utils/forwarding.js

@@ -1,52 +1,19 @@
-export async function getForwardingTargets(networkClient, config, userId) {
-    const apiUrl = config.cloudflareWorkerUrl || config.backendUrl;
-    const response = await networkClient.request(`${apiUrl}/users/${userId}`, {
-        method: "GET",
-        headers: {
-            "Content-Type": "application/json",
-            ...(config.cloudflareWorkerUrl
-                ? {
-                    Authorization: `Bearer ${config.apiToken}`,
-                    "X-App-Source": "0xmail-box",
-                }
-                : { "X-Access-Token": config.apiToken }),
-        },
-    });
-    const data = response?.data;
+import { WildduckAPI } from "../network/wildduck-client";
+export async function getForwardingTargets(networkClient, config, wildduckUserAuth) {
+    const api = new WildduckAPI(networkClient, config);
+    const data = await api.getForwardingTargets(wildduckUserAuth);
     return data.targets || [];
 }
-export async function updateForwardingTargets(networkClient, config, userId, targets, sess, ip) {
-    const apiUrl = config.cloudflareWorkerUrl || config.backendUrl;
-    const response = await networkClient.request(`${apiUrl}/users/${userId}`, {
-        method: "PUT",
-        headers: {
-            "Content-Type": "application/json",
-            ...(config.cloudflareWorkerUrl
-                ? {
-                    Authorization: `Bearer ${config.apiToken}`,
-                    "X-App-Source": "0xmail-box",
-                }
-                : { "X-Access-Token": config.apiToken }),
-        },
-        body: JSON.stringify({
-            targets,
-            sess,
-            ip,
-        }),
-    });
-    return response?.data;
+export async function updateForwardingTargets(networkClient, config, wildduckUserAuth, targets) {
+    const api = new WildduckAPI(networkClient, config);
+    return api.updateUserSettings(wildduckUserAuth, { targets });
 }
-export async function addForwardingTarget(networkClient, config, userId, target, sess, ip) {
-    const currentTargets = await getForwardingTargets(networkClient, config, userId);
-    if (currentTargets.includes(target)) {
-        return { success: true };
-    }
-    const updatedTargets = [...currentTargets, target];
-    return updateForwardingTargets(networkClient, config, userId, updatedTargets, sess, ip);
+export async function addForwardingTarget(networkClient, config, wildduckUserAuth, target) {
+    const api = new WildduckAPI(networkClient, config);
+    return api.addForwardingTarget(wildduckUserAuth, target);
 }
-export async function removeForwardingTarget(networkClient, config, userId, target, sess, ip) {
-    const currentTargets = await getForwardingTargets(networkClient, config, userId);
-    const updatedTargets = currentTargets.filter((t) => t !== target);
-    return updateForwardingTargets(networkClient, config, userId, updatedTargets, sess, ip);
+export async function removeForwardingTarget(networkClient, config, wildduckUserAuth, target) {
+    const api = new WildduckAPI(networkClient, config);
+    return api.removeForwardingTarget(wildduckUserAuth, target);
 }
 //# sourceMappingURL=forwarding.js.map

package/dist/utils/forwarding.js.map

@@ -1 +1 @@
-{"version":3,"file":"forwarding.js","sourceRoot":"","sources":["../../src/utils/forwarding.ts"],"names":[],"mappings":"AAUA,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,aAA4B,EAC5B,MAAsB,EACtB,MAAc;IAEd,MAAM,MAAM,GAAG,MAAM,CAAC,mBAAmB,IAAI,MAAM,CAAC,UAAU,CAAC;IAC/D,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,OAAO,CAC1C,GAAG,MAAM,UAAU,MAAM,EAAE,EAC3B;QACE,MAAM,EAAE,KAAK;QACb,OAAO,EAAE;YACP,cAAc,EAAE,kBAAkB;YAClC,GAAG,CAAC,MAAM,CAAC,mBAAmB;gBAC5B,CAAC,CAAC;oBACE,aAAa,EAAE,UAAU,MAAM,CAAC,QAAQ,EAAE;oBAC1C,cAAc,EAAE,YAAY;iBAC7B;gBACH,CAAC,CAAC,EAAE,gBAAgB,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC;SAC3C;KACF,CACF,CAAC;IACF,MAAM,IAAI,GAAG,QAAQ,EAAE,IAAW,CAAC;IACnC,OAAO,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;AAC5B,CAAC;AAMD,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,aAA4B,EAC5B,MAAsB,EACtB,MAAc,EACd,OAA2B,EAC3B,IAAa,EACb,EAAW;IAEX,MAAM,MAAM,GAAG,MAAM,CAAC,mBAAmB,IAAI,MAAM,CAAC,UAAU,CAAC;IAC/D,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,OAAO,CAC1C,GAAG,MAAM,UAAU,MAAM,EAAE,EAC3B;QACE,MAAM,EAAE,KAAK;QACb,OAAO,EAAE;YACP,cAAc,EAAE,kBAAkB;YAClC,GAAG,CAAC,MAAM,CAAC,mBAAmB;gBAC5B,CAAC,CAAC;oBACE,aAAa,EAAE,UAAU,MAAM,CAAC,QAAQ,EAAE;oBAC1C,cAAc,EAAE,YAAY;iBAC7B;gBACH,CAAC,CAAC,EAAE,gBAAgB,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC;SAC3C;QACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;YACnB,OAAO;YACP,IAAI;YACJ,EAAE;SACH,CAAC;KACH,CACF,CAAC;IACF,OAAO,QAAQ,EAAE,IAA4B,CAAC;AAChD,CAAC;AAMD,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,aAA4B,EAC5B,MAAsB,EACtB,MAAc,EACd,MAAwB,EACxB,IAAa,EACb,EAAW;IAEX,MAAM,cAAc,GAAG,MAAM,oBAAoB,CAC/C,aAAa,EACb,MAAM,EACN,MAAM,CACP,CAAC;IAGF,IAAI,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QACpC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3B,CAAC;IAED,MAAM,cAAc,GAAG,CAAC,GAAG,cAAc,EAAE,MAAM,CAAC,CAAC;IACnD,OAAO,uBAAuB,CAC5B,aAAa,EACb,MAAM,EACN,MAAM,EACN,cAAc,EACd,IAAI,EACJ,EAAE,CACH,CAAC;AACJ,CAAC;AAMD,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,aAA4B,EAC5B,MAAsB,EACtB,MAAc,EACd,MAAwB,EACxB,IAAa,EACb,EAAW;IAEX,MAAM,cAAc,GAAG,MAAM,oBAAoB,CAC/C,aAAa,EACb,MAAM,EACN,MAAM,CACP,CAAC;IACF,MAAM,cAAc,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC;IAClE,OAAO,uBAAuB,CAC5B,aAAa,EACb,MAAM,EACN,MAAM,EACN,cAAc,EACd,IAAI,EACJ,EAAE,CACH,CAAC;AACJ,CAAC"}
+{"version":3,"file":"forwarding.js","sourceRoot":"","sources":["../../src/utils/forwarding.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAYzD,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,aAA4B,EAC5B,MAAsB,EACtB,gBAAkC;IAElC,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IACnD,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,CAAC;IAC9D,OAAO,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;AAC5B,CAAC;AAMD,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,aAA4B,EAC5B,MAAsB,EACtB,gBAAkC,EAClC,OAA2B;IAE3B,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IACnD,OAAO,GAAG,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;AAC/D,CAAC;AAMD,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,aAA4B,EAC5B,MAAsB,EACtB,gBAAkC,EAClC,MAAwB;IAExB,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IACnD,OAAO,GAAG,CAAC,mBAAmB,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;AAC3D,CAAC;AAMD,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,aAA4B,EAC5B,MAAsB,EACtB,gBAAkC,EAClC,MAAwB;IAExB,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IACnD,OAAO,GAAG,CAAC,sBAAsB,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;AAC9D,CAAC"}

package/dist/utils/spam-settings.d.ts

@@ -1,21 +1,21 @@
-import type { NetworkClient, SpamSettings, WildduckConfig } from "@sudobility/types";
-export declare function getSpamSettings(networkClient: NetworkClient, config: WildduckConfig, userId: string): Promise<SpamSettings>;
-export declare function updateSpamLevel(networkClient: NetworkClient, config: WildduckConfig, userId: string, spamLevel: number, sess?: string, ip?: string): Promise<{
+import type { NetworkClient, SpamSettings, WildduckConfig, WildduckUserAuth } from "@sudobility/types";
+export declare function getSpamSettings(networkClient: NetworkClient, config: WildduckConfig, wildduckUserAuth: WildduckUserAuth): Promise<SpamSettings>;
+export declare function updateSpamLevel(networkClient: NetworkClient, config: WildduckConfig, wildduckUserAuth: WildduckUserAuth, spamLevel: number): Promise<{
     success: boolean;
 }>;
-export declare function updateFromWhitelist(networkClient: NetworkClient, config: WildduckConfig, userId: string, fromWhitelist: string[], sess?: string, ip?: string): Promise<{
+export declare function updateFromWhitelist(networkClient: NetworkClient, config: WildduckConfig, wildduckUserAuth: WildduckUserAuth, fromWhitelist: string[]): Promise<{
     success: boolean;
 }>;
-export declare function addToFromWhitelist(networkClient: NetworkClient, config: WildduckConfig, userId: string, emailOrDomain: string, sess?: string, ip?: string): Promise<{
+export declare function addToFromWhitelist(networkClient: NetworkClient, config: WildduckConfig, wildduckUserAuth: WildduckUserAuth, emailOrDomain: string): Promise<{
     success: boolean;
 }>;
-export declare function removeFromWhitelist(networkClient: NetworkClient, config: WildduckConfig, userId: string, emailOrDomain: string, sess?: string, ip?: string): Promise<{
+export declare function removeFromWhitelist(networkClient: NetworkClient, config: WildduckConfig, wildduckUserAuth: WildduckUserAuth, emailOrDomain: string): Promise<{
     success: boolean;
 }>;
-export declare function updateSpamSettings(networkClient: NetworkClient, config: WildduckConfig, userId: string, settings: {
+export declare function updateSpamSettings(networkClient: NetworkClient, config: WildduckConfig, wildduckUserAuth: WildduckUserAuth, settings: {
     spamLevel?: number;
     fromWhitelist?: string[];
-}, sess?: string, ip?: string): Promise<{
+}): Promise<{
     success: boolean;
 }>;
 //# sourceMappingURL=spam-settings.d.ts.map

package/dist/utils/spam-settings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"spam-settings.d.ts","sourceRoot":"","sources":["../../src/utils/spam-settings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EACb,YAAY,EACZ,cAAc,EACf,MAAM,mBAAmB,CAAC;AAM3B,wBAAsB,eAAe,CACnC,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,YAAY,CAAC,CAuBvB;AAOD,wBAAsB,eAAe,CACnC,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,IAAI,CAAC,EAAE,MAAM,EACb,EAAE,CAAC,EAAE,MAAM,GACV,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAuB/B;AAOD,wBAAsB,mBAAmB,CACvC,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,EAAE,EACvB,IAAI,CAAC,EAAE,MAAM,EACb,EAAE,CAAC,EAAE,MAAM,GACV,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAuB/B;AAMD,wBAAsB,kBAAkB,CACtC,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,EACrB,IAAI,CAAC,EAAE,MAAM,EACb,EAAE,CAAC,EAAE,MAAM,GACV,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAkB/B;AAMD,wBAAsB,mBAAmB,CACvC,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,EACrB,IAAI,CAAC,EAAE,MAAM,EACb,EAAE,CAAC,EAAE,MAAM,GACV,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAc/B;AAMD,wBAAsB,kBAAkB,CACtC,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE;IACR,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B,EACD,IAAI,CAAC,EAAE,MAAM,EACb,EAAE,CAAC,EAAE,MAAM,GACV,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAuB/B"}
+{"version":3,"file":"spam-settings.d.ts","sourceRoot":"","sources":["../../src/utils/spam-settings.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,aAAa,EACb,YAAY,EACZ,cAAc,EACd,gBAAgB,EACjB,MAAM,mBAAmB,CAAC;AAM3B,wBAAsB,eAAe,CACnC,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,gBAAgB,EAAE,gBAAgB,GACjC,OAAO,CAAC,YAAY,CAAC,CAQvB;AAOD,wBAAsB,eAAe,CACnC,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,gBAAgB,EAAE,gBAAgB,EAClC,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAG/B;AAOD,wBAAsB,mBAAmB,CACvC,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,gBAAgB,EAAE,gBAAgB,EAClC,aAAa,EAAE,MAAM,EAAE,GACtB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAG/B;AAMD,wBAAsB,kBAAkB,CACtC,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,gBAAgB,EAAE,gBAAgB,EAClC,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAG/B;AAMD,wBAAsB,mBAAmB,CACvC,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,gBAAgB,EAAE,gBAAgB,EAClC,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAG/B;AAMD,wBAAsB,kBAAkB,CACtC,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,gBAAgB,EAAE,gBAAgB,EAClC,QAAQ,EAAE;IACR,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B,GACA,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAG/B"}

package/dist/utils/spam-settings.js

@@ -1,100 +1,31 @@
-export async function getSpamSettings(networkClient, config, userId) {
-    const apiUrl = config.cloudflareWorkerUrl || config.backendUrl;
-    const response = await networkClient.request(`${apiUrl}/users/${userId}`, {
-        method: "GET",
-        headers: {
-            "Content-Type": "application/json",
-            ...(config.cloudflareWorkerUrl
-                ? {
-                    Authorization: `Bearer ${config.apiToken}`,
-                    "X-App-Source": "0xmail-box",
-                }
-                : { "X-Access-Token": config.apiToken }),
-        },
-    });
-    const data = response?.data;
+import { WildduckAPI } from "../network/wildduck-client";
+export async function getSpamSettings(networkClient, config, wildduckUserAuth) {
+    const api = new WildduckAPI(networkClient, config);
+    const data = await api.getSpamSettings(wildduckUserAuth);
     return {
         success: data.success,
         spamLevel: data.spamLevel,
         fromWhitelist: data.fromWhitelist || [],
     };
 }
-export async function updateSpamLevel(networkClient, config, userId, spamLevel, sess, ip) {
-    const apiUrl = config.cloudflareWorkerUrl || config.backendUrl;
-    const response = await networkClient.request(`${apiUrl}/users/${userId}`, {
-        method: "PUT",
-        headers: {
-            "Content-Type": "application/json",
-            ...(config.cloudflareWorkerUrl
-                ? {
-                    Authorization: `Bearer ${config.apiToken}`,
-                    "X-App-Source": "0xmail-box",
-                }
-                : { "X-Access-Token": config.apiToken }),
-        },
-        body: JSON.stringify({
-            spamLevel,
-            sess,
-            ip,
-        }),
-    });
-    return response?.data;
+export async function updateSpamLevel(networkClient, config, wildduckUserAuth, spamLevel) {
+    const api = new WildduckAPI(networkClient, config);
+    return api.updateSpamLevel(wildduckUserAuth, spamLevel);
 }
-export async function updateFromWhitelist(networkClient, config, userId, fromWhitelist, sess, ip) {
-    const apiUrl = config.cloudflareWorkerUrl || config.backendUrl;
-    const response = await networkClient.request(`${apiUrl}/users/${userId}`, {
-        method: "PUT",
-        headers: {
-            "Content-Type": "application/json",
-            ...(config.cloudflareWorkerUrl
-                ? {
-                    Authorization: `Bearer ${config.apiToken}`,
-                    "X-App-Source": "0xmail-box",
-                }
-                : { "X-Access-Token": config.apiToken }),
-        },
-        body: JSON.stringify({
-            fromWhitelist,
-            sess,
-            ip,
-        }),
-    });
-    return response?.data;
+export async function updateFromWhitelist(networkClient, config, wildduckUserAuth, fromWhitelist) {
+    const api = new WildduckAPI(networkClient, config);
+    return api.updateUserSettings(wildduckUserAuth, { fromWhitelist });
 }
-export async function addToFromWhitelist(networkClient, config, userId, emailOrDomain, sess, ip) {
-    const settings = await getSpamSettings(networkClient, config, userId);
-    const currentWhitelist = settings.fromWhitelist || [];
-    if (currentWhitelist.includes(emailOrDomain)) {
-        return { success: true };
-    }
-    const updatedWhitelist = [...currentWhitelist, emailOrDomain];
-    return updateFromWhitelist(networkClient, config, userId, updatedWhitelist, sess, ip);
+export async function addToFromWhitelist(networkClient, config, wildduckUserAuth, emailOrDomain) {
+    const api = new WildduckAPI(networkClient, config);
+    return api.addToWhitelist(wildduckUserAuth, emailOrDomain);
 }
-export async function removeFromWhitelist(networkClient, config, userId, emailOrDomain, sess, ip) {
-    const settings = await getSpamSettings(networkClient, config, userId);
-    const currentWhitelist = settings.fromWhitelist || [];
-    const updatedWhitelist = currentWhitelist.filter((item) => item !== emailOrDomain);
-    return updateFromWhitelist(networkClient, config, userId, updatedWhitelist, sess, ip);
+export async function removeFromWhitelist(networkClient, config, wildduckUserAuth, emailOrDomain) {
+    const api = new WildduckAPI(networkClient, config);
+    return api.removeFromWhitelist(wildduckUserAuth, emailOrDomain);
 }
-export async function updateSpamSettings(networkClient, config, userId, settings, sess, ip) {
-    const apiUrl = config.cloudflareWorkerUrl || config.backendUrl;
-    const response = await networkClient.request(`${apiUrl}/users/${userId}`, {
-        method: "PUT",
-        headers: {
-            "Content-Type": "application/json",
-            ...(config.cloudflareWorkerUrl
-                ? {
-                    Authorization: `Bearer ${config.apiToken}`,
-                    "X-App-Source": "0xmail-box",
-                }
-                : { "X-Access-Token": config.apiToken }),
-        },
-        body: JSON.stringify({
-            ...settings,
-            sess,
-            ip,
-        }),
-    });
-    return response?.data;
+export async function updateSpamSettings(networkClient, config, wildduckUserAuth, settings) {
+    const api = new WildduckAPI(networkClient, config);
+    return api.updateUserSettings(wildduckUserAuth, settings);
 }
 //# sourceMappingURL=spam-settings.js.map

package/dist/utils/spam-settings.js.map

@@ -1 +1 @@
-{"version":3,"file":"spam-settings.js","sourceRoot":"","sources":["../../src/utils/spam-settings.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"spam-settings.js","sourceRoot":"","sources":["../../src/utils/spam-settings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAYzD,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,aAA4B,EAC5B,MAAsB,EACtB,gBAAkC;IAElC,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IACnD,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,eAAe,CAAC,gBAAgB,CAAC,CAAC;IACzD,OAAO;QACL,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,aAAa,EAAE,IAAI,CAAC,aAAa,IAAI,EAAE;KACxC,CAAC;AACJ,CAAC;AAOD,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,aAA4B,EAC5B,MAAsB,EACtB,gBAAkC,EAClC,SAAiB;IAEjB,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IACnD,OAAO,GAAG,CAAC,eAAe,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;AAC1D,CAAC;AAOD,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,aAA4B,EAC5B,MAAsB,EACtB,gBAAkC,EAClC,aAAuB;IAEvB,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IACnD,OAAO,GAAG,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,EAAE,aAAa,EAAE,CAAC,CAAC;AACrE,CAAC;AAMD,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,aAA4B,EAC5B,MAAsB,EACtB,gBAAkC,EAClC,aAAqB;IAErB,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IACnD,OAAO,GAAG,CAAC,cAAc,CAAC,gBAAgB,EAAE,aAAa,CAAC,CAAC;AAC7D,CAAC;AAMD,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,aAA4B,EAC5B,MAAsB,EACtB,gBAAkC,EAClC,aAAqB;IAErB,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IACnD,OAAO,GAAG,CAAC,mBAAmB,CAAC,gBAAgB,EAAE,aAAa,CAAC,CAAC;AAClE,CAAC;AAMD,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,aAA4B,EAC5B,MAAsB,EACtB,gBAAkC,EAClC,QAGC;IAED,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IACnD,OAAO,GAAG,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;AAC5D,CAAC"}

package/dist/utils/user-settings.d.ts

@@ -1,9 +1,9 @@
-import type { NetworkClient, UserInfo, WildduckConfig } from "@sudobility/types";
-export declare function getUserInfo(networkClient: NetworkClient, config: WildduckConfig, userId: string): Promise<UserInfo>;
-export declare function updateUserName(networkClient: NetworkClient, config: WildduckConfig, userId: string, name: string, sess?: string, ip?: string): Promise<{
+import type { NetworkClient, UserInfo, WildduckConfig, WildduckUserAuth } from "@sudobility/types";
+export declare function getUserInfo(networkClient: NetworkClient, config: WildduckConfig, wildduckUserAuth: WildduckUserAuth): Promise<UserInfo>;
+export declare function updateUserName(networkClient: NetworkClient, config: WildduckConfig, wildduckUserAuth: WildduckUserAuth, name: string): Promise<{
     success: boolean;
 }>;
-export declare function updateUserSettings(networkClient: NetworkClient, config: WildduckConfig, userId: string, settings: {
+export declare function updateUserSettings(networkClient: NetworkClient, config: WildduckConfig, wildduckUserAuth: WildduckUserAuth, settings: {
     name?: string;
     language?: string;
     retention?: number;

package/dist/utils/user-settings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user-settings.d.ts","sourceRoot":"","sources":["../../src/utils/user-settings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EACb,QAAQ,EACR,cAAc,EACf,MAAM,mBAAmB,CAAC;AAM3B,wBAAsB,WAAW,CAC/B,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,QAAQ,CAAC,CAkBnB;AAMD,wBAAsB,cAAc,CAClC,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE,MAAM,EACb,EAAE,CAAC,EAAE,MAAM,GACV,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAuB/B;AAMD,wBAAsB,kBAAkB,CACtC,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE;IACR,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;CACb,GACA,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAmB/B"}
+{"version":3,"file":"user-settings.d.ts","sourceRoot":"","sources":["../../src/utils/user-settings.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,aAAa,EACb,QAAQ,EACR,cAAc,EACd,gBAAgB,EACjB,MAAM,mBAAmB,CAAC;AAM3B,wBAAsB,WAAW,CAC/B,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,gBAAgB,EAAE,gBAAgB,GACjC,OAAO,CAAC,QAAQ,CAAC,CAInB;AAMD,wBAAsB,cAAc,CAClC,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,gBAAgB,EAAE,gBAAgB,EAClC,IAAI,EAAE,MAAM,GACX,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAG/B;AAMD,wBAAsB,kBAAkB,CACtC,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,gBAAgB,EAAE,gBAAgB,EAClC,QAAQ,EAAE;IACR,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;CACb,GACA,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAG/B"}

package/dist/utils/user-settings.js

@@ -1,55 +1,15 @@
-export async function getUserInfo(networkClient, config, userId) {
-    const apiUrl = config.cloudflareWorkerUrl || config.backendUrl;
-    const response = await networkClient.request(`${apiUrl}/users/${userId}`, {
-        method: "GET",
-        headers: {
-            "Content-Type": "application/json",
-            ...(config.cloudflareWorkerUrl
-                ? {
-                    Authorization: `Bearer ${config.apiToken}`,
-                    "X-App-Source": "0xmail-box",
-                }
-                : { "X-Access-Token": config.apiToken }),
-        },
-    });
-    return response?.data;
+import { WildduckAPI } from "../network/wildduck-client";
+export async function getUserInfo(networkClient, config, wildduckUserAuth) {
+    const api = new WildduckAPI(networkClient, config);
+    const userData = await api.getUser(wildduckUserAuth);
+    return userData;
 }
-export async function updateUserName(networkClient, config, userId, name, sess, ip) {
-    const apiUrl = config.cloudflareWorkerUrl || config.backendUrl;
-    const response = await networkClient.request(`${apiUrl}/users/${userId}`, {
-        method: "PUT",
-        headers: {
-            "Content-Type": "application/json",
-            ...(config.cloudflareWorkerUrl
-                ? {
-                    Authorization: `Bearer ${config.apiToken}`,
-                    "X-App-Source": "0xmail-box",
-                }
-                : { "X-Access-Token": config.apiToken }),
-        },
-        body: JSON.stringify({
-            name,
-            sess,
-            ip,
-        }),
-    });
-    return response?.data;
+export async function updateUserName(networkClient, config, wildduckUserAuth, name) {
+    const api = new WildduckAPI(networkClient, config);
+    return api.updateUserSettings(wildduckUserAuth, { name });
 }
-export async function updateUserSettings(networkClient, config, userId, settings) {
-    const apiUrl = config.cloudflareWorkerUrl || config.backendUrl;
-    const response = await networkClient.request(`${apiUrl}/users/${userId}`, {
-        method: "PUT",
-        headers: {
-            "Content-Type": "application/json",
-            ...(config.cloudflareWorkerUrl
-                ? {
-                    Authorization: `Bearer ${config.apiToken}`,
-                    "X-App-Source": "0xmail-box",
-                }
-                : { "X-Access-Token": config.apiToken }),
-        },
-        body: JSON.stringify(settings),
-    });
-    return response?.data;
+export async function updateUserSettings(networkClient, config, wildduckUserAuth, settings) {
+    const api = new WildduckAPI(networkClient, config);
+    return api.updateUserSettings(wildduckUserAuth, settings);
 }
 //# sourceMappingURL=user-settings.js.map

package/dist/utils/user-settings.js.map

@@ -1 +1 @@
-{"version":3,"file":"user-settings.js","sourceRoot":"","sources":["../../src/utils/user-settings.ts"],"names":[],"mappings":"AAUA,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,aAA4B,EAC5B,MAAsB,EACtB,MAAc;IAEd,MAAM,MAAM,GAAG,MAAM,CAAC,mBAAmB,IAAI,MAAM,CAAC,UAAU,CAAC;IAC/D,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,OAAO,CAC1C,GAAG,MAAM,UAAU,MAAM,EAAE,EAC3B;QACE,MAAM,EAAE,KAAK;QACb,OAAO,EAAE;YACP,cAAc,EAAE,kBAAkB;YAClC,GAAG,CAAC,MAAM,CAAC,mBAAmB;gBAC5B,CAAC,CAAC;oBACE,aAAa,EAAE,UAAU,MAAM,CAAC,QAAQ,EAAE;oBAC1C,cAAc,EAAE,YAAY;iBAC7B;gBACH,CAAC,CAAC,EAAE,gBAAgB,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC;SAC3C;KACF,CACF,CAAC;IACF,OAAO,QAAQ,EAAE,IAAgB,CAAC;AACpC,CAAC;AAMD,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,aAA4B,EAC5B,MAAsB,EACtB,MAAc,EACd,IAAY,EACZ,IAAa,EACb,EAAW;IAEX,MAAM,MAAM,GAAG,MAAM,CAAC,mBAAmB,IAAI,MAAM,CAAC,UAAU,CAAC;IAC/D,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,OAAO,CAC1C,GAAG,MAAM,UAAU,MAAM,EAAE,EAC3B;QACE,MAAM,EAAE,KAAK;QACb,OAAO,EAAE;YACP,cAAc,EAAE,kBAAkB;YAClC,GAAG,CAAC,MAAM,CAAC,mBAAmB;gBAC5B,CAAC,CAAC;oBACE,aAAa,EAAE,UAAU,MAAM,CAAC,QAAQ,EAAE;oBAC1C,cAAc,EAAE,YAAY;iBAC7B;gBACH,CAAC,CAAC,EAAE,gBAAgB,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC;SAC3C;QACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;YACnB,IAAI;YACJ,IAAI;YACJ,EAAE;SACH,CAAC;KACH,CACF,CAAC;IACF,OAAO,QAAQ,EAAE,IAA4B,CAAC;AAChD,CAAC;AAMD,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,aAA4B,EAC5B,MAAsB,EACtB,MAAc,EACd,QAqBC;IAED,MAAM,MAAM,GAAG,MAAM,CAAC,mBAAmB,IAAI,MAAM,CAAC,UAAU,CAAC;IAC/D,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,OAAO,CAC1C,GAAG,MAAM,UAAU,MAAM,EAAE,EAC3B;QACE,MAAM,EAAE,KAAK;QACb,OAAO,EAAE;YACP,cAAc,EAAE,kBAAkB;YAClC,GAAG,CAAC,MAAM,CAAC,mBAAmB;gBAC5B,CAAC,CAAC;oBACE,aAAa,EAAE,UAAU,MAAM,CAAC,QAAQ,EAAE;oBAC1C,cAAc,EAAE,YAAY;iBAC7B;gBACH,CAAC,CAAC,EAAE,gBAAgB,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC;SAC3C;QACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;KAC/B,CACF,CAAC;IACF,OAAO,QAAQ,EAAE,IAA4B,CAAC;AAChD,CAAC"}
+{"version":3,"file":"user-settings.js","sourceRoot":"","sources":["../../src/utils/user-settings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAYzD,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,aAA4B,EAC5B,MAAsB,EACtB,gBAAkC;IAElC,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IACnD,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACrD,OAAO,QAA+B,CAAC;AACzC,CAAC;AAMD,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,aAA4B,EAC5B,MAAsB,EACtB,gBAAkC,EAClC,IAAY;IAEZ,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IACnD,OAAO,GAAG,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;AAC5D,CAAC;AAMD,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,aAA4B,EAC5B,MAAsB,EACtB,gBAAkC,EAClC,QAqBC;IAED,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IACnD,OAAO,GAAG,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;AAC5D,CAAC"}