@localazy/strapi-plugin 0.2.4 → 0.2.6

package/.github/workflows/qa.yml

@@ -0,0 +1,25 @@
+name: QA checks
+
+on:
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  lint:
+    name: Tests
+    runs-on: [self-hosted, Linux]
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 16
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Run tests
+        run: npm run test

package/.github/workflows/release.yml

@@ -0,0 +1,44 @@
+name: Release CI
+
+on:
+  push:
+    branches:
+      - main
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  ci:
+    name: CI Init
+    runs-on: [self-hosted, Linux]
+    outputs:
+      action: ${{ steps.init.outputs.action }}
+    steps:
+      - id: init
+        uses: localazy/release/init@v2
+
+  prepare:
+    name: Prepare Release PR
+    needs: ci
+    if: needs.ci.outputs.action == 'prepare'
+    runs-on: [self-hosted, Linux]
+    steps:
+      - uses: localazy/release/prepare@v2
+        with:
+          app-id: ${{ secrets.AUTH_APP_ID }}
+          app-key: ${{ secrets.AUTH_APP_KEY }}
+
+  publish:
+    name: Publish Release
+    needs: ci
+    if: needs.ci.outputs.action == 'publish'
+    runs-on: [self-hosted, Linux]
+    steps:
+      - uses: localazy/release/publish@v2
+        with:
+          app-id: ${{ secrets.AUTH_APP_ID }}
+          app-key: ${{ secrets.AUTH_APP_KEY }}
+          npm-publish: public
+          npm-token: ${{ secrets.NPM_AUTH_TOKEN_PUBLIC }}

package/CHANGELOG.md

@@ -0,0 +1,15 @@
+## <small>0.2.6 (2024-05-09)</small>
+
+* 🔧 conf: update .nvmrc node version to v18 ([78f1e4a](https://github.com/localazy/strapi-plugin/commit/78f1e4a))
+* 0.2.3 ([70566df](https://github.com/localazy/strapi-plugin/commit/70566df))
+* 0.2.4 (#49) ([17f864c](https://github.com/localazy/strapi-plugin/commit/17f864c)), closes [#49](https://github.com/localazy/strapi-plugin/issues/49)
+* Add release CI (#52) ([770ea8a](https://github.com/localazy/strapi-plugin/commit/770ea8a)), closes [#52](https://github.com/localazy/strapi-plugin/issues/52)
+* Bump @strapi/strapi from 4.5.6 to 4.15.0 (#42) ([7c4f5f7](https://github.com/localazy/strapi-plugin/commit/7c4f5f7)), closes [#42](https://github.com/localazy/strapi-plugin/issues/42)
+* Bump browserify-sign from 4.2.1 to 4.2.2 (#43) ([1e2900e](https://github.com/localazy/strapi-plugin/commit/1e2900e)), closes [#43](https://github.com/localazy/strapi-plugin/issues/43)
+* Bump http-cache-semantics from 4.1.0 to 4.1.1 (#44) ([3abdd42](https://github.com/localazy/strapi-plugin/commit/3abdd42)), closes [#44](https://github.com/localazy/strapi-plugin/issues/44)
+* LOC-1015 Strapi plugin does not work on certain versions (#48) ([5f55f1b](https://github.com/localazy/strapi-plugin/commit/5f55f1b)), closes [#48](https://github.com/localazy/strapi-plugin/issues/48)
+* LOC-1056 - Add support for the unofficial CKEditor5 plugin (#50) ([dddaebc](https://github.com/localazy/strapi-plugin/commit/dddaebc)), closes [#50](https://github.com/localazy/strapi-plugin/issues/50)
+* LOC-1096 -  Fix Analytics User Identification Within Integrations (#51) ([6000259](https://github.com/localazy/strapi-plugin/commit/6000259)), closes [#51](https://github.com/localazy/strapi-plugin/issues/51)
+
+
+

package/admin/src/config/index.js

@@ -14,8 +14,6 @@ if (process.env.STRAPI_ADMIN_LOCALAZY_ENV === "development") {
   config = development;
 }
 
-console.log(config);
-
 export default {
   ...config,
 };

package/admin/src/index.js

@@ -59,7 +59,7 @@ export default {
 
           return component;
         } catch (e) {
-          console.log(e);
+          console.error(e);
         }
 
         return null;

package/admin/src/modules/@common/models/supported-custom-field-plugins.js

@@ -1,5 +1,6 @@
 const SUPPORTED_CUSTOM_FIELD_PLUGINS = [
   "plugin::ckeditor.CKEditor",
+  "plugin::ckeditor5.CKEditor",
 ];
 
 export default SUPPORTED_CUSTOM_FIELD_PLUGINS;

package/admin/src/modules/@common/services/plugin.service.js

@@ -0,0 +1,16 @@
+/* eslint-disable no-useless-catch */
+import createAxiosInstance from "../../../utils/createAxiosInstance";
+
+const axiosInstance = createAxiosInstance();
+
+export default class PluginService {
+  static async getPluginVersion() {
+    try {
+      const result = await axiosInstance.get("/strapi/version");
+
+      return result.data;
+    } catch (e) {
+      throw e;
+    }
+  }
+}

package/admin/src/modules/@common/services/product-analytics-service.js

@@ -1,13 +1,18 @@
-import AnalyticsService from "../../../plugins/analytics-service";
+import GenericConnectorClient from "../../../plugins/generic-connector-client";
+import PluginService from "./plugin.service";
 
 export default class ProductAnalyticsService {
   static async trackAppConnected(userId, project, params = {}) {
     try {
-      const data = this.buildData(userId, "Strapi Connected", project, params);
-      await AnalyticsService.trackEvent(data.event, {
-        ...data.data,
-        userId,
-        category: "Project",
+      const data = await this.buildData("Strapi Connected", project, params);
+      await GenericConnectorClient.analytics.track({
+        event: data.event,
+        data: {
+          ...data.data,
+          userId,
+          orgId: project.orgId,
+          category: "Project",
+        }
       });
     } catch (e) {
       console.warn(e);
@@ -16,11 +21,15 @@ export default class ProductAnalyticsService {
 
   static async trackAppDisconnected(userId, project, params = {}) {
     try {
-      const data = this.buildData(userId, "Strapi Disconnected", project, params);
-      await AnalyticsService.trackEvent(data.event, {
-        ...data.data,
-        userId,
-        category: "Project",
+      const data = await this.buildData("Strapi Disconnected", project, params);
+      await GenericConnectorClient.analytics.track({
+        event: data.event,
+        data: {
+          ...data.data,
+          userId,
+          orgId: project.orgId,
+          category: "Project",
+        }
       });
     } catch (e) {
       console.warn(e);
@@ -29,11 +38,15 @@ export default class ProductAnalyticsService {
 
   static async trackUploadToLocalazy(userId, project, params = {}) {
     try {
-      const data = this.buildData(userId, "Strapi Upload", project, params);
-      await AnalyticsService.trackEvent(data.event, {
-        ...data.data,
-        userId,
-        category: "Project",
+      const data = await this.buildData("Strapi Upload", project, params);
+      await GenericConnectorClient.analytics.track({
+        event: data.event,
+        data: {
+          ...data.data,
+          userId,
+          orgId: project.orgId,
+          category: "Project",
+        }
       });
     } catch (e) {
       console.warn(e);
@@ -42,24 +55,30 @@ export default class ProductAnalyticsService {
 
   static async trackDownloadToStrapi(userId, project, params = {}) {
     try {
-      const data = this.buildData(userId, "Strapi Download", project, params);
-      await AnalyticsService.trackEvent(data.event, {
-        ...data.data,
-        userId,
-        category: "Project",
+      const data = await this.buildData("Strapi Download", project, params);
+      await GenericConnectorClient.analytics.track({
+        event: data.event,
+        data: {
+          ...data.data,
+          userId,
+          orgId: project.orgId,
+          category: "Project",
+        }
       });
     } catch (e) {
       console.warn(e);
     }
   }
 
-  static buildData(userId, event, project, params) {
+  static async buildData(event, project, params) {
+    const { version } = await PluginService.getPluginVersion();
+
     return {
       event,
       data: {
-        "User Id": userId,
         "Project Id": project.id,
         "Project Name": project.name,
+        version,
         ...params,
       },
     };

package/admin/src/modules/login/components/LoginButton/index.js

@@ -8,6 +8,7 @@ import React, { useState } from "react";
 import PropTypes from "prop-types";
 import { Button } from "@strapi/design-system/Button";
 import { useTranslation } from "react-i18next";
+import { getOAuthAuthorizationUrl } from "@localazy/generic-connector-client";
 import LocalazyLoginService from "../../services/localazy-login-service";
 import { getStrapiDefaultLocale } from "../../../@common/utils/get-default-locale";
 import { isoStrapiToLocalazy } from "../../../@common/utils/iso-locales-utils";
@@ -23,13 +24,12 @@ function LoginButton(props) {
     const strapiDefaultLocale = await getStrapiDefaultLocale();
     const localazyFormatLocaleCode = isoStrapiToLocalazy(strapiDefaultLocale.code);
     const keys = await LocalazyLoginService.generateKeys();
-    const params = new URLSearchParams({
-      client_id: config.LOCALAZY_OAUTH_APP_CLIENT_ID,
-      custom_id: keys.writeKey,
-      allow_create: "true",
-      create_locale: localazyFormatLocaleCode,
-    });
-    const url = `${config.LOCALAZY_OAUTH_URL}?${params.toString()}`;
+    const url = getOAuthAuthorizationUrl({
+      clientId: config.LOCALAZY_OAUTH_APP_CLIENT_ID,
+      customId: keys.writeKey,
+      allowCreate: true,
+      createLocale: localazyFormatLocaleCode,
+    }, config.LOCALAZY_OAUTH_URL);
     window.open(url);
 
     const pollResult = await LocalazyLoginService.continuousPoll(keys.readKey);

package/admin/src/plugins/generic-connector-client.js

@@ -0,0 +1,9 @@
+import { GenericConnectorClient, Services } from "@localazy/generic-connector-client";
+import config from "../config";
+
+const client = new GenericConnectorClient({
+  pluginId: Services.STRAPI,
+  genericConnectorUrl: config.LOCALAZY_PLUGIN_CONNECTOR_API_URL,
+});
+
+export default client;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@localazy/strapi-plugin",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "The official Strapi Plugin by Localazy.",
   "strapi": {
     "name": "localazy",
@@ -40,7 +40,9 @@
   },
   "dependencies": {
     "@david-vaclavek/deep-keys": "^0.5.0",
-    "@localazy/ts-api": "^1.0.13",
+    "@localazy/api-client": "^2.1.5",
+    "@localazy/generic-connector-client": "^0.2.3",
+    "@localazy/ts-api": "^1.1.0",
     "chalk": "^5.3.0",
     "fs-extra": "^11.1.1",
     "i18next": "^22.4.9",
@@ -58,7 +60,12 @@
   },
   "devDependencies": {
     "@babel/plugin-transform-modules-commonjs": "^7.20.11",
+    "@localazy/conventional-changelog-preset": "^1.2.8",
     "@strapi-community/eslint-config": "^0.4.3",
+    "conventional-changelog": "^6.0.0",
+    "conventional-changelog-cli": "^5.0.0",
+    "conventional-changelog-writer": "github:localazy/conventional-changelog-writer",
+    "conventional-recommended-bump": "^9.0.0",
     "eslint": "^8.32.0",
     "eslint-plugin-jest": "^27.2.1",
     "jest": "^29.6.4"

package/server/controllers/index.js

@@ -1,6 +1,5 @@
 "use strict";
 
-const myController = require("./my-controller");
 const localazyUserController = require("./localazy-user-controller");
 const localazyAuthController = require("./localazy-auth-controller");
 const strapiController = require("./strapi-controller");
@@ -9,7 +8,6 @@ const localazyTransferController = require("./localazy-transfer-controller");
 const localazyProjectController = require("./localazy-project-controller");
 
 module.exports = {
-  myController,
   localazyUserController,
   localazyAuthController,
   strapiController,

package/server/controllers/localazy-auth-controller.js

@@ -1,46 +1,22 @@
 "use strict";
 
+const localazyGenericConnectorClientFactory = require("../utils/localazy-generic-connector-client-factory");
+
 module.exports = {
   async generateKeys(ctx) {
-    ctx.body = await strapi
-      .plugin("localazy")
-      .service("localazyAuthService")
-      .generateKeys();
+    const GenericConnectorApi = await localazyGenericConnectorClientFactory();
+    ctx.body = await GenericConnectorApi.public.keys();
   },
 
   async continuousPoll(ctx) {
-    const POLLING_LIMIT = 60;
-    const INTERVAL_PERIOD = 2000; // ms
-    const localazyAuthService = strapi
-      .plugin("localazy")
-      .service("localazyAuthService");
-
-    let counter = 1;
+    // init continuous poll
     const { readKey } = ctx.query;
-    let result = await localazyAuthService.completeLogin(readKey);
-
-    let data = {
-      success: false,
-    };
-    if (!result.completed) {
-      data = await new Promise((resolve, reject) => {
-        const pollInterval = setInterval(async () => {
-          result = await localazyAuthService.completeLogin(readKey);
-
-          if (result.completed) {
-            clearInterval(pollInterval);
-            resolve(result.data);
-          }
-
-          counter += 1;
-          if (counter >= POLLING_LIMIT) {
-            clearInterval(pollInterval);
-            reject(new Error("Sign in attempts timed out."));
-          }
-        }, INTERVAL_PERIOD);
-      });
-    }
+    const GenericConnectorApi = await localazyGenericConnectorClientFactory();
+    const pollResult = await GenericConnectorApi.oauth.continuousPoll({
+      readKey,
+    });
+    const pollResultData = pollResult.data;
 
-    ctx.body = data;
+    ctx.body = pollResultData;
   },
 };

package/server/controllers/strapi-controller.js

@@ -16,4 +16,12 @@ module.exports = {
   async postLifecycleLocalazyWebhooks(ctx) {
     strapi.log("done");
   },
+  async getPluginVersion(ctx) {
+    ctx.body = {
+      version: await strapi
+        .plugin("localazy")
+        .service("strapiService")
+        .getPluginVersion()
+    }
+  }
 };

package/server/lifecycles/deprecate-event-entry-in-localazy-hook.js

@@ -2,7 +2,7 @@
 
 const getPickedFlattenKeysForHookEntry = require('../utils/get-picked-flatten-keys-for-hook-entry');
 const config = require("../config").default;
-const getLocalazyApi = require("../utils/get-localazy-api");
+const localazyApiClientFactory = require("../utils/localazy-api-client-factory");
 const delay = require("../utils/delay");
 
 module.exports = async (event) => {
@@ -20,9 +20,6 @@ module.exports = async (event) => {
   const LocalazyPubApiService = strapi
     .plugin("localazy")
     .service("localazyPubApiService");
-  const LocalazyDownloadService = strapi
-    .plugin("localazy")
-    .service("localazyDownloadService");
 
   const user = await LocalazyUserService.getUser();
 
@@ -37,24 +34,31 @@ module.exports = async (event) => {
     return;
   }
 
-  const projectKeys = await LocalazyDownloadService.download({
-    projectId: user.project.id,
-    fileId: strapiFile.id,
+  const LocalazyApi = await localazyApiClientFactory();
+  const projectKeys = await LocalazyApi.files.listKeys({
+    project: user.project.id,
+    file: strapiFile.id,
     lang: eventEntryLocale,
   });
 
+  if(!projectKeys) {
+    strapi.log.error(`Keys not found for file ${strapiFile.id}`);
+    return {
+      success: false,
+    };
+  }
+
   const pickedFlattenKeys = Object.keys(pickedFlatten);
-  const filteredProjectKeysIds = projectKeys.data
+  const filteredProjectKeysIds = projectKeys
     .filter((key) => pickedFlattenKeys.includes(key.key[0]))
     .map((key) => key.id);
 
-  const LocalazyApi = await getLocalazyApi();
   // call in a loop in a sequence, to avoid hitting PubAPI limits
   for (const filteredProjectKeysId of filteredProjectKeysIds) {
     try {
-      await LocalazyApi.updateKey({
-        projectId: user.project.id,
-        keyId: filteredProjectKeysId,
+      await LocalazyApi.keys.update({
+        project: user.project.id,
+        key: filteredProjectKeysId,
         deprecated: 0,
       });
       await delay();

package/server/lifecycles/upload-event-entry-to-localazy-hook.js

@@ -17,15 +17,20 @@ module.exports = async (event) => {
     .plugin("localazy")
     .service("localazyUploadService");
 
-  const chunks = LocalazyUploadService.splitToChunks(pickedFlatten);
   const importFile = LocalazyUploadService.createImportFileRepresentation(
-    config.LOCALAZY_DEFAULT_FILE_NAME,
-    config.LOCALAZY_DEFAULT_FILE_PATH,
-    config.LOCALAZY_DEFAULT_FILE_EXTENSION,
     eventEntryLocale,
-    chunks
+    pickedFlatten
   );
 
-  const result = await LocalazyUploadService.upload(importFile);
+  const uploadConfig = {
+    contentOptions: {
+      type: config.LOCALAZY_DEFAULT_FILE_EXTENSION,
+    },
+    fileOptions: {
+      name: config.LOCALAZY_DEFAULT_FILE_NAME,
+      path: config.LOCALAZY_DEFAULT_FILE_PATH,
+    }
+  };
+  const result = await LocalazyUploadService.upload(importFile, uploadConfig);
   return result;
 }

package/server/models/supported-custom-field-plugins.js

@@ -1,5 +1,6 @@
 const SUPPORTED_CUSTOM_FIELD_PLUGINS = [
   "plugin::ckeditor.CKEditor",
+  "plugin::ckeditor5.CKEditor",
 ];
 
 module.exports = SUPPORTED_CUSTOM_FIELD_PLUGINS;

package/server/routes/strapi.js

@@ -27,4 +27,12 @@ module.exports = [
       policies: [],
     },
   },
+  {
+    method: "GET",
+    path: `${ROUTE_PREFIX}/version`,
+    handler: "strapiController.getPluginVersion",
+    config: {
+      policies: [],
+    },
+  },
 ];

package/server/services/index.js

@@ -1,11 +1,9 @@
 "use strict";
 
 const localazyUserService = require("./localazy-user-service");
-const localazyAuthService = require("./localazy-auth-service");
 const strapiService = require("./strapi-service");
 const pluginSettingsService = require("./plugin-settings-service");
 const localazyUploadService = require("./localazy-upload-service");
-const localazyDownloadService = require("./localazy-download-service");
 const localazyPubApiService = require("./localazy-pubapi-service");
 const strapiI18nService = require("./strapi-i18n-service");
 const strapiLocalazyI18nService = require("./strapi-localazy-i18n-service");
@@ -14,11 +12,9 @@ const localazyTransferDownloadService = require("./localazy-transfer-download-se
 
 module.exports = {
   localazyUserService,
-  localazyAuthService,
   strapiService,
   pluginSettingsService,
   localazyUploadService,
-  localazyDownloadService,
   localazyPubApiService,
   strapiI18nService,
   strapiLocalazyI18nService,

package/server/services/localazy-pubapi-service.js

@@ -1,13 +1,13 @@
 "use strict";
 
-const getLocalazyApi = require("../utils/get-localazy-api");
+const localazyApiClientFactory = require("../utils/localazy-api-client-factory");
 const config = require("../config").default;
 
 module.exports = ({ strapi }) => ({
   async listFiles(projectId) {
     try {
-      const LocalazyApi = await getLocalazyApi();
-      const result = await LocalazyApi.listFiles({ projectId });
+      const LocalazyApi = await localazyApiClientFactory();
+      const result = await LocalazyApi.files.list({ project: projectId });
 
       return result;
     } catch (e) {
@@ -27,8 +27,8 @@ module.exports = ({ strapi }) => ({
   },
   async listProjects(addOrganization = true, addLanguages = true) {
     try {
-      const LocalazyApi = await getLocalazyApi();
-      const result = await LocalazyApi.listProjects({
+      const LocalazyApi = await localazyApiClientFactory();
+      const result = await LocalazyApi.projects.list({
         organization: addOrganization,
         languages: addLanguages,
       });
@@ -45,8 +45,8 @@ module.exports = ({ strapi }) => ({
     return projects.find((project) => project.id === projectId);
   },
   async getWebhooksSecret(projectId) {
-    const LocalazyApi = await getLocalazyApi();
-    const result = await LocalazyApi.getWebhooksSecret({ projectId });
+    const LocalazyApi = await localazyApiClientFactory();
+    const result = await LocalazyApi.webhooks.getSecret({ project: projectId });
 
     return result;
   }

package/server/services/localazy-transfer-download-service.js

@@ -13,6 +13,7 @@ const isEmpty = require("lodash/isEmpty");
 const RequestInitiatorHelper = require('../utils/request-initiator-helper');
 const PluginSettingsServiceHelper = require('../services/helpers/plugin-settings-service-helper');
 const { DOWNLOAD_EVENT, DOWNLOAD_FINISHED_EVENT } = require('../constants/events');
+const localazyApiClientFactory = require("../utils/localazy-api-client-factory");
 
 const getFilteredLanguagesCodesForDownload = async (languagesCodes) => {
   const pluginSettingsServiceHelper = new PluginSettingsServiceHelper(strapi);
@@ -63,9 +64,6 @@ module.exports = ({ strapi }) => ({
     const LocalazyPubApiService = strapi
       .plugin("localazy")
       .service("localazyPubApiService");
-    const LocalazyDownloadService = strapi
-      .plugin("localazy")
-      .service("localazyDownloadService");
     const strapiLocalazyI18nService = strapi
       .plugin("localazy")
       .service("strapiLocalazyI18nService");
@@ -204,19 +202,19 @@ module.exports = ({ strapi }) => ({
       (languageCode) => !strapiUnsupportedLanguages.includes(languageCode)
     );
     const localazyContent = {};
+    const LocalazyApi = await localazyApiClientFactory();
     for (const isoLocalazy of supportedLanguages) {
       const isoStrapi = isoLocalazyToStrapi(isoLocalazy);
-      const result = await LocalazyDownloadService.download({
-        projectId: user.project.id,
-        fileId: strapiFile.id,
+      const langKeys = await LocalazyApi.files.listKeys({
+        project: user.project.id,
+        file: strapiFile.id,
         lang: isoStrapi,
       });
-      if (!result.success) {
+      if (!langKeys) {
         await JobNotificationService.emit(DOWNLOAD_EVENT, {
-          message: result.message,
+          message: `No keys found for language ${isoLocalazy}`,
         });
       }
-      const langKeys = result.data;
       localazyContent[isoLocalazy] = langKeys;
     }
 

package/server/services/localazy-transfer-upload-service.js

@@ -146,17 +146,21 @@ module.exports = ({ strapi }) => ({
       ? isoStrapiToLocalazy(defaultLocale.code)
       : config.LOCALAZY_DEFAULT_LOCALE;
 
-    const chunks = LocalazyUploadService.splitToChunks(flattenContent);
     const importFile = LocalazyUploadService.createImportFileRepresentation(
-      config.LOCALAZY_DEFAULT_FILE_NAME,
-      config.LOCALAZY_DEFAULT_FILE_PATH,
-      config.LOCALAZY_DEFAULT_FILE_EXTENSION,
       locale,
-      chunks
+      flattenContent
     );
-    // Use `deprecate: "file"` if there is one chunk of transferred data only!
-    const hasMoreTransferFilesChunks = importFile.length > 1;
-    const uploadConfig = !hasMoreTransferFilesChunks ? { deprecate: "file" } : {};
+    // Use `deprecate: "file"` if there is one chunk of transferred data only (99900 keys)!
+    const uploadConfig = {
+      contentOptions: {
+        type: config.LOCALAZY_DEFAULT_FILE_EXTENSION,
+      },
+      i18nOptions: { deprecate: "file" },
+      fileOptions: {
+        name: config.LOCALAZY_DEFAULT_FILE_NAME,
+        path: config.LOCALAZY_DEFAULT_FILE_PATH,
+      }
+    };
     await JobNotificationService.emit(UPLOAD_EVENT, {
       message: "Uploading collections to Localazy...",
     });

package/server/services/localazy-upload-service.js

@@ -2,9 +2,7 @@
 
 "use strict";
 
-const getLocalazyApi = require("../utils/get-localazy-api");
-const delay = require("../utils/delay");
-const config = require("../config").default;
+const localazyApiClientFactory = require("../utils/localazy-api-client-factory");
 
 module.exports = ({ strapi }) => ({
   /**
@@ -12,31 +10,24 @@ module.exports = ({ strapi }) => ({
    * Use config to adjust the upload process.
    * Returns status and id of a last chunk
    */
-  async upload(files, config = {}) {
-    let ret = {
-      success: false,
-      message: "No data was uploaded",
-    };
+  async upload(file, config = {}) {
     try {
-      for (const file of files) {
-        const LocalazyApi = await getLocalazyApi();
-        const user = await strapi
-          .plugin("localazy")
-          .service("localazyUserService")
-          .getUser();
+      const LocalazyApi = await localazyApiClientFactory();
+      const user = await strapi
+        .plugin("localazy")
+        .service("localazyUserService")
+        .getUser();
+
+      const result = await LocalazyApi.import.json({
+        project: user.project.id,
+        json: file,
+        ...config,
+      });
 
-        const result = await LocalazyApi.import({
-          projectId: user.project.id,
-          files: file,
-          ...config,
-        });
-        await delay();
-        ret = {
-          success: true,
-          result: result.result,
-        };
-      }
-      return ret;
+      return {
+        success: true,
+        result,
+      };
     } catch (e) {
       strapi.log.error(e);
       return {
@@ -46,57 +37,16 @@ module.exports = ({ strapi }) => ({
     }
   },
 
-  /**
-   * Check Directus for the Lifted Limits OAuth Apps IDs
-   */
-  CHUNK_LIMIT: config.LOCALAZY_PUBLIC_API_LIFTED_LIMITS ? 99900 : 9990,
-
-  splitToChunks(data, CHUNK_LIMIT = null) {
-    const chunks = [];
-    const keys = Object.keys(data);
-    const keysCount = keys.length;
-    const localChunkLimit = CHUNK_LIMIT || this.CHUNK_LIMIT;
-    const chunksCount = Math.ceil(keysCount / localChunkLimit);
-    for (let i = 0; i < chunksCount; i += 1) {
-      const chunkStrings = {};
-      const from = localChunkLimit * i;
-      const to = localChunkLimit * (i + 1);
-
-      const currentKeys = keys.slice(from, to);
-      currentKeys.forEach((key) => {
-        chunkStrings[key] = data[key];
-      });
-      chunks.push(chunkStrings);
-    }
-
-    return chunks;
-  },
-
   createImportFileRepresentation(
-    filename,
-    path,
-    type,
     sourceLang,
-    stringsChunks
+    strings
   ) {
-    const files = [];
-
-    for (const strings of stringsChunks) {
-      const file = [
-        {
-          name: filename,
-          path,
-          content: {
-            type,
-            [sourceLang]: {
-              ...strings,
-            },
-          },
-        },
-      ];
-      files.push(file);
-    }
+    const file = {
+      [sourceLang]: {
+        ...strings,
+      },
+    };
 
-    return files;
+    return file;
   },
 });

package/server/services/strapi-service.js

@@ -20,4 +20,7 @@ module.exports = ({ strapi }) => ({
     const models = strapi.db.config.models;
     return buildPopulate(models, modelUid);
   },
+  async getPluginVersion() {
+    return require("../../package.json").version;
+  }
 });

package/server/utils/{get-localazy-api.js → localazy-api-client-factory.js}

@@ -1,6 +1,6 @@
 "use strict";
 
-const LocalazyApi = require("@localazy/ts-api").default;
+const ApiClient = require("@localazy/api-client").ApiClient;
 const { LOCALAZY_PUBLIC_API_URL } = require("../config").default;
 
 module.exports = async () => {
@@ -14,9 +14,9 @@ module.exports = async () => {
     throw new Error("Localazy user is not logged in.");
   }
 
-  const api = LocalazyApi({
-    projectToken: accessToken,
-    baseUrl: LOCALAZY_PUBLIC_API_URL,
+  const api = new ApiClient({
+    authToken: accessToken,
+    apiUrl: LOCALAZY_PUBLIC_API_URL,
   });
   return api;
 };

package/server/utils/localazy-generic-connector-client-factory.js

@@ -0,0 +1,15 @@
+"use strict";
+
+const GenericConnectorClient = require("@localazy/generic-connector-client").GenericConnectorClient;
+const config = require("../config");
+
+const ROOT_URL = config.default.LOCALAZY_PLUGIN_CONNECTOR_API_URL;
+const PLUGIN_ID = config.default.LOCALAZY_PLUGIN_ID;
+
+module.exports = async () => {
+  const api = new GenericConnectorClient({
+    pluginId: PLUGIN_ID,
+    genericConnectorUrl: ROOT_URL,
+  });
+  return api;
+};

package/.github/workflows/.build.yml

@@ -1,24 +0,0 @@
-name: CI
-on: [push, pull_request]
-jobs:
-  execute:
-    runs-on: [self-hosted, Linux, aws]
-    env:
-      INPUT_TOKEN: ""
-    steps:
-      - name: Set work folder permissions
-        run: pwd && sudo chown -R $USER:$USER ./
-      - uses: actions/checkout@v2
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v3
-        with:
-          node-version: 16.x
-      - name: Install dependencies
-        run: npm ci
-      - name: Run unit tests
-        run: npm run test
-      - name: Publish to npm
-        uses: JS-DevTools/npm-publish@v1
-        if: github.ref == 'refs/heads/main'
-        with:
-          token: ${{ secrets.NPM_AUTH_TOKEN }}

package/admin/src/plugins/analytics-service.js

@@ -1,14 +0,0 @@
-import createPluginConnectorAxiosInstance from "../utils/createPluginConnectorAxiosInstance";
-
-const ANALYTICS_PATH = "/analytics";
-const axiosInstance = createPluginConnectorAxiosInstance();
-export default class AnalyticsService {
-  static async trackEvent(event, data) {
-    const result = await axiosInstance.post(`${ANALYTICS_PATH}/track`, {
-      event,
-      ...data,
-    });
-
-    return result.data;
-  }
-}

package/admin/src/utils/createPluginConnectorAxiosInstance.js

@@ -1,45 +0,0 @@
-/**
- * axios with plugin connector config.
- */
-
-import axios from "axios";
-import config from "../config";
-
-const BASE_PLUGIN_PATH = config.LOCALAZY_PLUGIN_CONNECTOR_API_URL;
-
-const createPluginConnectorAxiosInstance = (baseUrl = null) => {
-  if (baseUrl === null) {
-    baseUrl = `${BASE_PLUGIN_PATH}`;
-  }
-
-  const instance = axios.create({
-    baseURL: baseUrl,
-  });
-
-  instance.interceptors.request.use(
-    async (config) => {
-      config.headers = {
-        Accept: "application/json",
-        "Content-Type": "application/json",
-        // Strapi plugin id in terms of plugin connector
-        "X-Localazy-Plugin-Id": 1,
-      };
-
-      return config;
-    },
-    (error) => {
-      Promise.reject(error);
-    }
-  );
-
-  instance.interceptors.response.use(
-    (response) => response,
-    (error) => {
-      throw error;
-    }
-  );
-
-  return instance;
-};
-
-export default createPluginConnectorAxiosInstance;

package/server/controllers/my-controller.js

@@ -1,10 +0,0 @@
-"use strict";
-
-module.exports = {
-  index(ctx) {
-    ctx.body = strapi
-      .plugin("localazy")
-      .service("myService")
-      .getWelcomeMessage();
-  },
-};

package/server/services/localazy-auth-service.js

@@ -1,38 +0,0 @@
-"use strict";
-
-const axios = require("axios");
-const config = require("../config");
-
-const ROOT_URL = config.default.LOCALAZY_PLUGIN_CONNECTOR_API_URL;
-const PLUGIN_ID = config.default.LOCALAZY_PLUGIN_ID;
-
-module.exports = (/* { strapi } */) => ({
-  async generateKeys() {
-    try {
-      const result = await axios.get(`${ROOT_URL}/public/keys`, {
-        headers: {
-          "X-Localazy-Plugin-Id": PLUGIN_ID,
-        },
-      });
-      return result.data;
-    } catch (e) {
-      throw e.data;
-    }
-  },
-
-  async completeLogin(readKey) {
-    try {
-      const result = await axios.get(
-        `${ROOT_URL}/oauth/poll?readKey=${readKey}`,
-        {
-          headers: {
-            "X-Localazy-Plugin-Id": PLUGIN_ID,
-          },
-        }
-      );
-      return result.data;
-    } catch (e) {
-      throw e.data;
-    }
-  },
-});

package/server/services/localazy-download-service.js

@@ -1,54 +0,0 @@
-"use strict";
-
-const getLocalazyApi = require("../utils/get-localazy-api");
-const delay = require("../utils/delay");
-
-const fetchChunkResult = async (projectId, fileId, lang, next) => {
-  try {
-    const LocalazyApi = await getLocalazyApi();
-    const chunkResult = await LocalazyApi.listKeysInFileForLanguage({
-      projectId,
-      fileId,
-      lang,
-      next,
-    });
-
-    return chunkResult;
-  } catch (e) {
-    strapi.log.error(e);
-    return {
-      keys: [],
-    };
-  }
-};
-
-module.exports = ({ strapi }) => ({
-  async download(config = {}) {
-    try {
-      const data = [];
-      let chunkResult;
-      do {
-        const next = (chunkResult && chunkResult.next) || "";
-        chunkResult = await fetchChunkResult(
-          config.projectId,
-          config.fileId,
-          config.lang,
-          next
-        );
-        await delay();
-        data.push(chunkResult);
-      } while (chunkResult.next);
-
-      return {
-        success: true,
-        data: data.map((chunk) => chunk.keys).flat(),
-      };
-    } catch (e) {
-      strapi.log.error(e);
-      return {
-        success: false,
-        message: e.message,
-      };
-    }
-  },
-});