Create common plugin

Signed-off-by: Craig Perkins <[email protected]>

server/backend/opensearch_security_common_plugin.ts

@@ -0,0 +1,79 @@
+/*
+ *   Copyright OpenSearch Contributors
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License").
+ *   You may not use this file except in compliance with the License.
+ *   A copy of the License is located at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file. This file is distributed
+ *   on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ *   express or implied. See the License for the specific language governing
+ *   permissions and limitations under the License.
+ */
+
+// eslint-disable-next-line import/no-default-export
+export default function (Client: any, config: any, components: any) {
+  const ca = components.clientAction.factory;
+
+  if (!Client.prototype.opensearch_security) {
+    Client.prototype.opensearch_security = components.clientAction.namespaceFactory();
+  }
+
+  /**
+   * Updates a resource.
+   * Resource identification is expected to computed from headers. Eg: auth headers.
+   *
+   * Sample response:
+   * {
+   *   "status": "OK",
+   *   "message": "Username updated."
+   * }
+   */
+  Client.prototype.opensearch_security.prototype.saveResourceWithoutId = ca({
+    method: 'PUT',
+    needBody: true,
+    url: {
+      fmt: '/_plugins/_security/api/<%=resourceName%>',
+      req: {
+        resourceName: {
+          type: 'string',
+          required: true,
+        },
+      },
+    },
+  });
+
+  /**
+   * Returns a Security resource configuration.
+   *
+   * Sample response:
+   *
+   * {
+   *   "user": {
+   *     "hash": "#123123"
+   *   }
+   * }
+   */
+  Client.prototype.opensearch_security.prototype.listResource = ca({
+    url: {
+      fmt: '/_plugins/_security/api/<%=resourceName%>',
+      req: {
+        resourceName: {
+          type: 'string',
+          required: true,
+        },
+      },
+    },
+  });
+
+  /**
+   * Gets auth info.
+   */
+  Client.prototype.opensearch_security.prototype.authinfo = ca({
+    url: {
+      fmt: '/_plugins/_security/authinfo',
+    },
+  });
+}

server/backend/opensearch_security_plugin.ts

@@ -27,62 +27,6 @@ export default function (Client: any, config: any, components: any) {
     },
   });
 
-  /**
-   * Updates a resource.
-   * Resource identification is expected to computed from headers. Eg: auth headers.
-   *
-   * Sample response:
-   * {
-   *   "status": "OK",
-   *   "message": "Username updated."
-   * }
-   */
-  Client.prototype.opensearch_security.prototype.saveResourceWithoutId = ca({
-    method: 'PUT',
-    needBody: true,
-    url: {
-      fmt: '/_plugins/_security/api/<%=resourceName%>',
-      req: {
-        resourceName: {
-          type: 'string',
-          required: true,
-        },
-      },
-    },
-  });
-
-  /**
-   * Returns a Security resource configuration.
-   *
-   * Sample response:
-   *
-   * {
-   *   "user": {
-   *     "hash": "#123123"
-   *   }
-   * }
-   */
-  Client.prototype.opensearch_security.prototype.listResource = ca({
-    url: {
-      fmt: '/_plugins/_security/api/<%=resourceName%>',
-      req: {
-        resourceName: {
-          type: 'string',
-          required: true,
-        },
-      },
-    },
-  });
-
-  /**
-   * Gets auth info.
-   */
-  Client.prototype.opensearch_security.prototype.authinfo = ca({
-    url: {
-      fmt: '/_plugins/_security/authinfo',
-    },
-  });
-
   Client.prototype.opensearch_security.prototype.dashboardsinfo = ca({
     url: {
       fmt: '/_plugins/_security/dashboardsinfo',

server/plugin.ts

@@ -31,6 +31,7 @@ import { defineRoutes, defineSecurityConfigurationRoutes } from './routes';
 import { SecurityPluginConfigType } from '.';
 import opensearchSecurityConfigurationPlugin from './backend/opensearch_security_configuration_plugin';
 import opensearchSecurityPlugin from './backend/opensearch_security_plugin';
+import opensearchSecurityCommonPlugin from './backend/opensearch_security_common_plugin';
 import { SecuritySessionCookie, getSecurityCookieOptions } from './session/security_cookie';
 import { SecurityClient } from './backend/opensearch_security_client';
 import {
@@ -97,7 +98,7 @@ export class SecurityPlugin implements Plugin<SecurityPluginSetup, SecurityPlugi
 
     const router = core.http.createRouter();
 
-    const plugins = [];
+    const plugins = [opensearchSecurityCommonPlugin];
     if (config.configuration.session_management_enabled) {
       plugins.push(opensearchSecurityPlugin);
     }