@jytextiles/medusa-plugin-faire-store-sync 0.2.3 → 0.2.5

package/src/admin/routes/settings/faire/page.tsx

@@ -1,5 +1,5 @@
 import { defineRouteConfig } from "@medusajs/admin-sdk"
-import { BuildingStorefront } from "@medusajs/icons"
+import { BuildingStorefront, ChevronDownMini } from "@medusajs/icons"
 import {
   Alert,
   Button,
@@ -7,7 +7,10 @@ import {
   DataTable,
   DataTableFilteringState,
   DataTablePaginationState,
+  Drawer,
+  DropdownMenu,
   Heading,
+  Input,
   Label,
   Skeleton,
   StatusBadge,
@@ -53,6 +56,8 @@ const FaireSettingsPage = () => {
     pageSize: PAGE_SIZE,
   })
   const [filtering, setFiltering] = useState<DataTableFilteringState>({})
+  const [apiKeyOpen, setApiKeyOpen] = useState(false)
+  const [apiKey, setApiKey] = useState("")
 
   // ── Queries ───────────────────────────────────────────────────────────────
   const statusQuery = useQuery({
@@ -91,6 +96,20 @@ const FaireSettingsPage = () => {
       }),
   })
 
+  const apiKeyMutation = useMutation({
+    mutationFn: () => faireApi.connectApiKey(apiKey.trim()),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: STATUS_KEY })
+      setApiKeyOpen(false)
+      setApiKey("")
+      toast.success("Connected to Faire with API key")
+    },
+    onError: (err: any) =>
+      toast.error("Failed to connect with API key", {
+        description: err.message,
+      }),
+  })
+
   const disconnectMutation = useMutation({
     mutationFn: () => faireApi.disconnect(),
     onSuccess: () => {
@@ -211,13 +230,22 @@ const FaireSettingsPage = () => {
               </Button>
             </div>
           ) : (
-            <Button
-              size="small"
-              onClick={() => connectMutation.mutate()}
-              isLoading={connectMutation.isPending}
-            >
-              Connect Faire
-            </Button>
+            <DropdownMenu>
+              <DropdownMenu.Trigger asChild>
+                <Button size="small" isLoading={connectMutation.isPending}>
+                  Connect Faire
+                  <ChevronDownMini />
+                </Button>
+              </DropdownMenu.Trigger>
+              <DropdownMenu.Content>
+                <DropdownMenu.Item onClick={() => connectMutation.mutate()}>
+                  Connect with OAuth
+                </DropdownMenu.Item>
+                <DropdownMenu.Item onClick={() => setApiKeyOpen(true)}>
+                  Connect with API key (private)
+                </DropdownMenu.Item>
+              </DropdownMenu.Content>
+            </DropdownMenu>
           )}
         </div>
         {connected && status?.account && (
@@ -264,6 +292,48 @@ const FaireSettingsPage = () => {
         </DataTable>
       </Container>
 
+      {/* API-key connect (private integrations) */}
+      <Drawer open={apiKeyOpen} onOpenChange={setApiKeyOpen}>
+        <Drawer.Content>
+          <Drawer.Header>
+            <Drawer.Title>Connect with API key</Drawer.Title>
+          </Drawer.Header>
+          <Drawer.Body className="flex flex-col gap-y-3">
+            <Text className="text-ui-fg-subtle" size="small">
+              For private / unpublished Faire integrations, paste the API key
+              your Faire brand issued for this app. This connects without OAuth.
+            </Text>
+            <div className="flex flex-col gap-y-1">
+              <Label size="small">Faire API key</Label>
+              <Input
+                type="password"
+                placeholder="Paste the Faire API key…"
+                value={apiKey}
+                onChange={(e) => setApiKey(e.target.value)}
+                autoComplete="off"
+              />
+            </div>
+          </Drawer.Body>
+          <Drawer.Footer>
+            <Button
+              variant="secondary"
+              size="small"
+              onClick={() => setApiKeyOpen(false)}
+            >
+              Cancel
+            </Button>
+            <Button
+              size="small"
+              onClick={() => apiKeyMutation.mutate()}
+              isLoading={apiKeyMutation.isPending}
+              disabled={!apiKey.trim()}
+            >
+              Connect
+            </Button>
+          </Drawer.Footer>
+        </Drawer.Content>
+      </Drawer>
+
       <Toaster />
     </div>
   )

package/src/modules/faire-sync/migrations/.snapshot-medusa-faire-sync.json

@@ -301,6 +301,25 @@
           "enumItems": [],
           "mappedType": "text"
         },
+        "auth_mode": {
+          "name": "auth_mode",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
+          "default": "'oauth'",
+          "comment": null,
+          "enumItems": [
+            "oauth",
+            "apiKey"
+          ],
+          "mappedType": "enum"
+        },
         "access_token": {
           "name": "access_token",
           "type": "text",
@@ -1158,230 +1177,8 @@
           "enumItems": [],
           "mappedType": "json"
         },
-        "created_at": {
-          "name": "created_at",
-          "type": "timestamptz",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": false,
-          "unique": false,
-          "length": 6,
-          "precision": null,
-          "scale": null,
-          "default": "now()",
-          "comment": null,
-          "enumItems": [],
-          "mappedType": "datetime"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "timestamptz",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": false,
-          "unique": false,
-          "length": 6,
-          "precision": null,
-          "scale": null,
-          "default": "now()",
-          "comment": null,
-          "enumItems": [],
-          "mappedType": "datetime"
-        },
-        "deleted_at": {
-          "name": "deleted_at",
-          "type": "timestamptz",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": true,
-          "unique": false,
-          "length": 6,
-          "precision": null,
-          "scale": null,
-          "default": null,
-          "comment": null,
-          "enumItems": [],
-          "mappedType": "datetime"
-        }
-      },
-      "name": "faire_sync_settings",
-      "schema": "public",
-      "indexes": [
-        {
-          "keyName": "IDX_faire_sync_settings_deleted_at",
-          "columnNames": [],
-          "composite": false,
-          "constraint": false,
-          "primary": false,
-          "unique": false,
-          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_faire_sync_settings_deleted_at\" ON \"faire_sync_settings\" (\"deleted_at\") WHERE deleted_at IS NULL"
-        },
-        {
-          "keyName": "faire_sync_settings_pkey",
-          "columnNames": [
-            "id"
-          ],
-          "composite": false,
-          "constraint": true,
-          "primary": true,
-          "unique": true
-        }
-      ],
-      "checks": [],
-      "foreignKeys": {},
-      "nativeEnums": {}
-    },
-    {
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": true,
-          "nullable": false,
-          "unique": false,
-          "length": null,
-          "precision": null,
-          "scale": null,
-          "default": null,
-          "comment": null,
-          "enumItems": [],
-          "mappedType": "text"
-        },
-        "webhook_id": {
-          "name": "webhook_id",
-          "type": "text",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": false,
-          "unique": false,
-          "length": null,
-          "precision": null,
-          "scale": null,
-          "default": null,
-          "comment": null,
-          "enumItems": [],
-          "mappedType": "text"
-        },
-        "event_type": {
-          "name": "event_type",
-          "type": "text",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": false,
-          "unique": false,
-          "length": null,
-          "precision": null,
-          "scale": null,
-          "default": null,
-          "comment": null,
-          "enumItems": [],
-          "mappedType": "text"
-        },
-        "brand_id": {
-          "name": "brand_id",
-          "type": "text",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": true,
-          "unique": false,
-          "length": null,
-          "precision": null,
-          "scale": null,
-          "default": null,
-          "comment": null,
-          "enumItems": [],
-          "mappedType": "text"
-        },
-        "resource_url": {
-          "name": "resource_url",
-          "type": "text",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": true,
-          "unique": false,
-          "length": null,
-          "precision": null,
-          "scale": null,
-          "default": null,
-          "comment": null,
-          "enumItems": [],
-          "mappedType": "text"
-        },
-        "payload": {
-          "name": "payload",
-          "type": "jsonb",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": true,
-          "unique": false,
-          "length": null,
-          "precision": null,
-          "scale": null,
-          "default": null,
-          "comment": null,
-          "enumItems": [],
-          "mappedType": "json"
-        },
-        "resource": {
-          "name": "resource",
-          "type": "jsonb",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": true,
-          "unique": false,
-          "length": null,
-          "precision": null,
-          "scale": null,
-          "default": null,
-          "comment": null,
-          "enumItems": [],
-          "mappedType": "json"
-        },
-        "processed": {
-          "name": "processed",
-          "type": "boolean",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": false,
-          "unique": false,
-          "length": null,
-          "precision": null,
-          "scale": null,
-          "default": "false",
-          "comment": null,
-          "enumItems": [],
-          "mappedType": "boolean"
-        },
-        "error": {
-          "name": "error",
-          "type": "text",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": true,
-          "unique": false,
-          "length": null,
-          "precision": null,
-          "scale": null,
-          "default": null,
-          "comment": null,
-          "enumItems": [],
-          "mappedType": "text"
-        },
-        "received_at": {
-          "name": "received_at",
+        "last_order_sync_at": {
+          "name": "last_order_sync_at",
           "type": "timestamptz",
           "unsigned": false,
           "autoincrement": false,
@@ -1445,29 +1242,20 @@
           "mappedType": "datetime"
         }
       },
-      "name": "faire_webhook_event",
+      "name": "faire_sync_settings",
       "schema": "public",
       "indexes": [
         {
-          "keyName": "IDX_faire_webhook_event_webhook_id_unique",
-          "columnNames": [],
-          "composite": false,
-          "constraint": false,
-          "primary": false,
-          "unique": false,
-          "expression": "CREATE UNIQUE INDEX IF NOT EXISTS \"IDX_faire_webhook_event_webhook_id_unique\" ON \"faire_webhook_event\" (\"webhook_id\") WHERE deleted_at IS NULL"
-        },
-        {
-          "keyName": "IDX_faire_webhook_event_deleted_at",
+          "keyName": "IDX_faire_sync_settings_deleted_at",
           "columnNames": [],
           "composite": false,
           "constraint": false,
           "primary": false,
           "unique": false,
-          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_faire_webhook_event_deleted_at\" ON \"faire_webhook_event\" (\"deleted_at\") WHERE deleted_at IS NULL"
+          "expression": "CREATE INDEX IF NOT EXISTS \"IDX_faire_sync_settings_deleted_at\" ON \"faire_sync_settings\" (\"deleted_at\") WHERE deleted_at IS NULL"
         },
         {
-          "keyName": "faire_webhook_event_pkey",
+          "keyName": "faire_sync_settings_pkey",
           "columnNames": [
             "id"
           ],

package/src/modules/faire-sync/migrations/Migration20260709154411.ts

@@ -0,0 +1,19 @@
+import { Migration } from "@medusajs/framework/mikro-orm/migrations";
+
+export class Migration20260709154411 extends Migration {
+
+  override async up(): Promise<void> {
+    this.addSql(`drop table if exists "faire_webhook_event" cascade;`);
+
+    this.addSql(`alter table if exists "faire_sync_settings" add column if not exists "last_order_sync_at" timestamptz null;`);
+  }
+
+  override async down(): Promise<void> {
+    this.addSql(`create table if not exists "faire_webhook_event" ("id" text not null, "webhook_id" text not null, "event_type" text not null, "brand_id" text null, "resource_url" text null, "payload" jsonb null, "resource" jsonb null, "processed" boolean not null default false, "error" text null, "received_at" timestamptz null, "created_at" timestamptz not null default now(), "updated_at" timestamptz not null default now(), "deleted_at" timestamptz null, constraint "faire_webhook_event_pkey" primary key ("id"));`);
+    this.addSql(`CREATE UNIQUE INDEX IF NOT EXISTS "IDX_faire_webhook_event_webhook_id_unique" ON "faire_webhook_event" ("webhook_id") WHERE deleted_at IS NULL;`);
+    this.addSql(`CREATE INDEX IF NOT EXISTS "IDX_faire_webhook_event_deleted_at" ON "faire_webhook_event" ("deleted_at") WHERE deleted_at IS NULL;`);
+
+    this.addSql(`alter table if exists "faire_sync_settings" drop column if exists "last_order_sync_at";`);
+  }
+
+}

package/src/modules/faire-sync/migrations/Migration20260709161201.ts

@@ -0,0 +1,13 @@
+import { Migration } from "@medusajs/framework/mikro-orm/migrations";
+
+export class Migration20260709161201 extends Migration {
+
+  override async up(): Promise<void> {
+    this.addSql(`alter table if exists "faire_sync_account" add column if not exists "auth_mode" text check ("auth_mode" in ('oauth', 'apiKey')) not null default 'oauth';`);
+  }
+
+  override async down(): Promise<void> {
+    this.addSql(`alter table if exists "faire_sync_account" drop column if exists "auth_mode";`);
+  }
+
+}

package/src/modules/faire-sync/models/faire-sync-account.ts

@@ -6,6 +6,10 @@ const FaireSyncAccount = model.define("faire_sync_account", {
   brand_name: model.text(),
   currency: model.text().nullable(),
   country: model.text().nullable(),
+  // How this account authenticates to Faire: OAuth (published apps) or a
+  // brand-issued API key (private/single-merchant integrations). Drives which
+  // auth header the client sends, so both connection types can coexist.
+  auth_mode: model.enum(["oauth", "apiKey"]).default("oauth"),
   access_token: model.text(),
   refresh_token: model.text().nullable(),
   token_expires_at: model.dateTime().nullable(),

package/src/modules/faire-sync/service.ts

@@ -3,7 +3,6 @@ import FaireSyncAccount from "./models/faire-sync-account"
 import FaireSyncRecord from "./models/faire-sync-record"
 import FaireSyncSettings from "./models/faire-sync-settings"
 import FaireSyncBatch from "./models/faire-sync-batch"
-import FaireWebhookEvent from "./models/faire-webhook-event"
 import FaireOrder from "./models/faire-order"
 import { FaireClient } from "../../lib/faire-client"
 import { encryptSecret, decryptSecret } from "../../lib/crypto"
@@ -83,7 +82,6 @@ class FaireSyncService extends MedusaService({
   FaireSyncRecord,
   FaireSyncSettings,
   FaireSyncBatch,
-  FaireWebhookEvent,
   FaireOrder,
 }) {
   protected options_: ModuleOptions
@@ -94,7 +92,15 @@ class FaireSyncService extends MedusaService({
     this.options_ = resolveFaireOptions(options)
   }
 
-  getClient(): FaireClient {
+  /**
+   * Build a Faire client. Pass `authModeOverride` (e.g. an account's `auth_mode`)
+   * to force the auth header for that connection type; without it, the plugin's
+   * configured default is used (cached).
+   */
+  getClient(authModeOverride?: "oauth" | "apiKey"): FaireClient {
+    if (authModeOverride) {
+      return new FaireClient({ ...this.options_, authMode: authModeOverride })
+    }
     if (!this.client_) {
       this.client_ = new FaireClient(this.options_)
     }
@@ -130,7 +136,11 @@ class FaireSyncService extends MedusaService({
     }
   }
 
-  async saveAccount(token: TokenData, brand: BrandInfo) {
+  async saveAccount(
+    token: TokenData,
+    brand: BrandInfo,
+    authMode: "oauth" | "apiKey" = "oauth"
+  ) {
     const existing = await this.getActiveAccount()
     const expiresAt =
       token.expires_in != null
@@ -141,6 +151,7 @@ class FaireSyncService extends MedusaService({
       brand_name: brand.brand_name,
       currency: brand.currency ?? null,
       country: brand.country ?? null,
+      auth_mode: authMode,
       access_token: encryptSecret(token.access_token),
       refresh_token: encryptSecret(token.refresh_token ?? null),
       token_expires_at: expiresAt,
@@ -165,8 +176,9 @@ class FaireSyncService extends MedusaService({
     // Best-effort: a failed revoke must not block local disconnect.
     try {
       const accessToken = decryptSecret((account as any).access_token)
-      if (accessToken && this.options_.authMode !== "apiKey") {
-        await this.getClient().revokeToken(accessToken)
+      // Only OAuth tokens are revocable; a brand-issued API key is not.
+      if (accessToken && (account as any).auth_mode !== "apiKey") {
+        await this.getClient("oauth").revokeToken(accessToken)
       }
     } catch (err: any) {
       // eslint-disable-next-line no-console
@@ -256,12 +268,8 @@ class FaireSyncService extends MedusaService({
   }
 
   async startOAuth(): Promise<{ authorization_url: string; state: string }> {
-    if (this.options_.authMode === "apiKey") {
-      throw new MedusaError(
-        MedusaError.Types.INVALID_DATA,
-        "Faire is configured in API-key mode — use /admin/faire/auth/api-key to connect, not OAuth."
-      )
-    }
+    // Both connection types are available per-account, so OAuth is always
+    // offered here; the API-key path is a separate entry point.
     try {
       const state = crypto.randomUUID()
       await this.updateSettings({
@@ -270,7 +278,7 @@ class FaireSyncService extends MedusaService({
           created_at: Date.now(),
         },
       })
-      const client = this.getClient()
+      const client = this.getClient("oauth")
       return {
         authorization_url: client.getAuthorizationUrl(state),
         state,
@@ -292,14 +300,16 @@ class FaireSyncService extends MedusaService({
       )
     }
     try {
-      const client = this.getClient()
+      // Force API-key auth (X-FAIRE-ACCESS-TOKEN) for this connection regardless
+      // of the plugin's default mode, and persist it so later API calls use it.
+      const client = this.getClient("apiKey")
       const brand = await client.getBrand(accessToken)
       const token: TokenData = {
         access_token: accessToken,
         token_type: "Bearer",
         retrieved_at: Date.now(),
       }
-      const account = await this.saveAccount(token, brand)
+      const account = await this.saveAccount(token, brand, "apiKey")
       await this.updateSettings({
         account_id: account.id,
         default_brand_id: brand.brand_id,
@@ -320,11 +330,12 @@ class FaireSyncService extends MedusaService({
         "Invalid or expired OAuth state. Please start the Faire connection again."
       )
     }
+    let token: TokenData | undefined
     try {
       const client = this.getClient()
-      const token = await client.exchangeCodeForToken(code)
+      token = await client.exchangeCodeForToken(code)
       const brand = await client.getBrand(token.access_token)
-      const account = await this.saveAccount(token, brand)
+      const account = await this.saveAccount(token, brand, "oauth")
       await this.updateSettings({
         account_id: account.id,
         default_brand_id: brand.brand_id,
@@ -332,6 +343,17 @@ class FaireSyncService extends MedusaService({
       })
       return { account, brand }
     } catch (err) {
+      // Self-heal a dropped OAuth so the next attempt starts clean:
+      //  1. clear the pending state (otherwise it sticks and confuses retries), and
+      //  2. if the code exchange succeeded but a later step failed, REVOKE the
+      //     just-obtained token — otherwise Faire keeps the app "installed via an
+      //     active OAuth access token" and every reconnect fails with that 400.
+      await this.updateSettings({ pending_oauth: null }).catch(() => {})
+      if (token?.access_token) {
+        await this.getClient()
+          .revokeToken(token.access_token)
+          .catch(() => {})
+      }
       throw toMedusaError(err)
     }
   }

package/src/workflows/ingest-faire-orders-bulk.ts

@@ -70,7 +70,7 @@ const processBatchStep = createStep(
   ): Promise<StepResponse<{ synced: number; failed: number }>> => {
     const service: FaireSyncService = container.resolve(FAIRE_SYNC_MODULE)
     const account = await service.ensureFreshToken()
-    const client = service.getClient()
+    const client = service.getClient((account as any).auth_mode)
 
     // Resolve the incremental window. Precedence:
     //   explicit input > persisted high-water mark > full backfill (undefined).

package/src/workflows/sync-product-to-faire.ts

@@ -26,6 +26,7 @@ type ResolvedConfig = {
   account_id: string
   brand_id: string
   access_token: string
+  auth_mode: "oauth" | "apiKey"
   currency: string | null
   settings: any
 }
@@ -66,6 +67,7 @@ const resolveFaireConfigStep = createStep(
       account_id: account.id,
       brand_id: account.brand_id,
       access_token: account.access_token,
+      auth_mode: (account.auth_mode as "oauth" | "apiKey") ?? "oauth",
       currency: account.currency ?? null,
       settings,
     })
@@ -211,7 +213,7 @@ const syncProductStep = createStep(
     { container }
   ): Promise<StepResponse<SyncResult>> => {
     const service: FaireSyncService = container.resolve(FAIRE_SYNC_MODULE)
-    const client = service.getClient()
+    const client = service.getClient(input.config.auth_mode)
     const { access_token, settings } = input.config
     const { product_input, existing_product_token, product_status } =
       input.prepared

package/.medusa/server/src/modules/faire-sync/models/faire-webhook-event.js

@@ -1,21 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("@medusajs/framework/utils");
-/**
- * Durable record of an inbound Faire webhook delivery. `webhook_id` is the
- * delivery id Faire sends (unique) so retries are idempotent.
- */
-const FaireWebhookEvent = utils_1.model.define("faire_webhook_event", {
-    id: utils_1.model.id().primaryKey(),
-    webhook_id: utils_1.model.text().unique(),
-    event_type: utils_1.model.text(),
-    brand_id: utils_1.model.text().nullable(),
-    resource_url: utils_1.model.text().nullable(),
-    payload: utils_1.model.json().nullable(),
-    resource: utils_1.model.json().nullable(),
-    processed: utils_1.model.boolean().default(false),
-    error: utils_1.model.text().nullable(),
-    received_at: utils_1.model.dateTime().nullable(),
-});
-exports.default = FaireWebhookEvent;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFpcmUtd2ViaG9vay1ldmVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3NyYy9tb2R1bGVzL2ZhaXJlLXN5bmMvbW9kZWxzL2ZhaXJlLXdlYmhvb2stZXZlbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxxREFBaUQ7QUFFakQ7OztHQUdHO0FBQ0gsTUFBTSxpQkFBaUIsR0FBRyxhQUFLLENBQUMsTUFBTSxDQUFDLHFCQUFxQixFQUFFO0lBQzVELEVBQUUsRUFBRSxhQUFLLENBQUMsRUFBRSxFQUFFLENBQUMsVUFBVSxFQUFFO0lBQzNCLFVBQVUsRUFBRSxhQUFLLENBQUMsSUFBSSxFQUFFLENBQUMsTUFBTSxFQUFFO0lBQ2pDLFVBQVUsRUFBRSxhQUFLLENBQUMsSUFBSSxFQUFFO0lBQ3hCLFFBQVEsRUFBRSxhQUFLLENBQUMsSUFBSSxFQUFFLENBQUMsUUFBUSxFQUFFO0lBQ2pDLFlBQVksRUFBRSxhQUFLLENBQUMsSUFBSSxFQUFFLENBQUMsUUFBUSxFQUFFO0lBQ3JDLE9BQU8sRUFBRSxhQUFLLENBQUMsSUFBSSxFQUFFLENBQUMsUUFBUSxFQUFFO0lBQ2hDLFFBQVEsRUFBRSxhQUFLLENBQUMsSUFBSSxFQUFFLENBQUMsUUFBUSxFQUFFO0lBQ2pDLFNBQVMsRUFBRSxhQUFLLENBQUMsT0FBTyxFQUFFLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQztJQUN6QyxLQUFLLEVBQUUsYUFBSyxDQUFDLElBQUksRUFBRSxDQUFDLFFBQVEsRUFBRTtJQUM5QixXQUFXLEVBQUUsYUFBSyxDQUFDLFFBQVEsRUFBRSxDQUFDLFFBQVEsRUFBRTtDQUN6QyxDQUFDLENBQUE7QUFFRixrQkFBZSxpQkFBaUIsQ0FBQSJ9