@vegan-friendly/strapi-plugin-elasticsearch 0.2.6 → 0.2.7

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vegan-friendly/strapi-plugin-elasticsearch",
-    "version": "0.2.6",
+    "version": "0.2.7",
     "description": "A Strapi plugin to enable using Elasticsearch with Strapi CMS.",
     "homepage": "https://github.com/vegan-friendly/strapi-plugin-elasticsearch",
     "strapi": {

package/dist/server/bootstrap.js

@@ -16,10 +16,10 @@ exports.default = async ({ strapi }) => {
             console.warn('The plugin strapi-plugin-elasticsearch is enabled but the searchConnector is not configured.');
         else {
             const connector = pluginConfig['searchConnector'];
+            const auth = getAuth(connector);
             await esInterface.initializeSearchEngine({
                 host: connector.host,
-                uname: connector.username,
-                password: connector.password,
+                auth,
                 cert: connector.certificate,
             });
             strapi.cron.add({
@@ -152,3 +152,27 @@ exports.default = async ({ strapi }) => {
         console.error(err);
     }
 };
+function getAuth(connector) {
+    const { apiKey, username, password, bearer } = connector;
+    let auth;
+    let configTypes = [];
+    if (username && password) {
+        auth = { username, password };
+        configTypes.push('username/password');
+    }
+    if (bearer) {
+        auth = { bearer };
+        configTypes.push('bearer');
+    }
+    if (apiKey) {
+        auth = { apiKey };
+        configTypes.push('apiKey');
+    }
+    if (configTypes.length > 1) {
+        throw new Error('You cannot provide more than one authentication method. Please choose one of the following: ' + configTypes.join(', '));
+    }
+    if (!auth) {
+        throw new Error('No authentication method provided. Please provide one of the following: apiKey, bearer, username+password');
+    }
+    return auth;
+}

package/dist/server/services/es-interface.js

@@ -3,14 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const elasticsearch_1 = require("@elastic/elasticsearch");
 let client = null;
 exports.default = ({ strapi }) => ({
-    async initializeSearchEngine({ host, uname, password, cert }) {
+    async initializeSearchEngine({ host, auth, cert }) {
         try {
             client = new elasticsearch_1.Client({
                 node: host,
-                auth: {
-                    username: uname,
-                    password: password,
-                },
+                auth: auth,
                 tls: {
                     ca: cert,
                     rejectUnauthorized: false,

package/dist/server/types/esInterface.type.d.ts

@@ -1,4 +1,6 @@
 import { MappingTypeMapping } from '@elastic/elasticsearch/lib/api/types';
+import { ApiKeyAuth, BasicAuth, BearerAuth } from '@elastic/transport/lib/types';
+export type EsAuth = BasicAuth | ApiKeyAuth | BearerAuth;
 export interface EsInterfaceService {
     /**
      * Initializes the search engine connection.
@@ -7,8 +9,7 @@ export interface EsInterfaceService {
      */
     initializeSearchEngine(params: {
         host: string;
-        uname: string;
-        password: string;
+        auth?: EsAuth;
         cert: string;
     }): Promise<void>;
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vegan-friendly/strapi-plugin-elasticsearch",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "description": "A Strapi plugin to enable using Elasticsearch with Strapi CMS.",
   "homepage": "https://github.com/vegan-friendly/strapi-plugin-elasticsearch",
   "strapi": {