Skip to content

A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.

TypeScript fluxerfluxerapp

refactor(api): flatten elasticsearch auth and query selection

Hampus69784aad319b
diff --git a/fluxer_api/pkgs/elasticsearch_search/src/ElasticsearchClient.ts b/fluxer_api/pkgs/elasticsearch_search/src/ElasticsearchClient.ts
index f3be57281..07f9a38fc 100644
--- a/fluxer_api/pkgs/elasticsearch_search/src/ElasticsearchClient.ts
+++ b/fluxer_api/pkgs/elasticsearch_search/src/ElasticsearchClient.ts
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
-import {Client} from '@elastic/elasticsearch';
+import {Client, type ClientOptions} from '@elastic/elasticsearch';
export interface ElasticsearchClientConfig {
node: string;
@@ -14,13 +14,16 @@ export interface ElasticsearchClientConfig {
}
export function createElasticsearchClient(config: ElasticsearchClientConfig): Client {
+ const node = config.node;
+ let auth: ClientOptions['auth'];
+ if (config.auth?.apiKey) {
+ auth = {apiKey: config.auth.apiKey};
+ } else if (config.auth?.username) {
+ auth = {username: config.auth.username, password: config.auth.password ?? ''};
+ }
return new Client({
- node: config.node,
- auth: config.auth?.apiKey
- ? {apiKey: config.auth.apiKey}
- : config.auth?.username
- ? {username: config.auth.username, password: config.auth.password ?? ''}
- : undefined,
+ node,
+ auth,
requestTimeout: config.requestTimeoutMs,
tls: config.tlsRejectUnauthorized === false ? {rejectUnauthorized: false} : undefined,
});
diff --git a/fluxer_api/pkgs/elasticsearch_search/src/adapters/ElasticsearchIndexAdapter.ts b/fluxer_api/pkgs/elasticsearch_search/src/adapters/ElasticsearchIndexAdapter.ts
index f469b6b21..1c4fbabae 100644
--- a/fluxer_api/pkgs/elasticsearch_search/src/adapters/ElasticsearchIndexAdapter.ts
+++ b/fluxer_api/pkgs/elasticsearch_search/src/adapters/ElasticsearchIndexAdapter.ts
@@ -269,20 +269,23 @@ export class ElasticsearchIndexAdapter<
const offset = options?.offset ?? (options?.page ? (options.page - 1) * (options.hitsPerPage ?? 25) : 0);
const filterClauses = compactFilters(this.buildFilters(filters));
const sort = this.buildSort?.(filters);
- const must: Array<Record<string, unknown>> = query
- ? [
- {
- multi_match: {
- query,
- fields: this.searchableFields,
- type: this.searchType,
- operator: 'or',
- ...(this.fuzziness != null ? {fuzziness: this.fuzziness} : {}),
- ...(this.minimumShouldMatch != null ? {minimum_should_match: this.minimumShouldMatch} : {}),
- },
+ let must: Array<Record<string, unknown>>;
+ if (query) {
+ must = [
+ {
+ multi_match: {
+ query,
+ fields: this.searchableFields,
+ type: this.searchType,
+ operator: 'or',
+ ...(this.fuzziness != null ? {fuzziness: this.fuzziness} : {}),
+ ...(this.minimumShouldMatch != null ? {minimum_should_match: this.minimumShouldMatch} : {}),
},
- ]
- : [{match_all: {}}];
+ },
+ ];
+ } else {
+ must = [{match_all: {}}];
+ }
const facets = options?.facets;
const searchParams: ElasticsearchBaseSearchRequest = {
index: this.indexDefinition.indexName,