@clickhouse/client-web 1.9.0 → 1.10.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -17,10 +17,21 @@ class WebConnection {
|
|
|
17
17
|
writable: true,
|
|
18
18
|
value: void 0
|
|
19
19
|
});
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
20
|
+
if (params.auth.type === 'JWT') {
|
|
21
|
+
this.defaultHeaders = {
|
|
22
|
+
Authorization: `Bearer ${params.auth.access_token}`,
|
|
23
|
+
...params?.http_headers,
|
|
24
|
+
};
|
|
25
|
+
}
|
|
26
|
+
else if (params.auth.type === 'Credentials') {
|
|
27
|
+
this.defaultHeaders = {
|
|
28
|
+
Authorization: `Basic ${btoa(`${params.auth.username}:${params.auth.password}`)}`,
|
|
29
|
+
...params?.http_headers,
|
|
30
|
+
};
|
|
31
|
+
}
|
|
32
|
+
else {
|
|
33
|
+
throw new Error(`Unknown auth type: ${params.auth.type}`);
|
|
34
|
+
}
|
|
24
35
|
}
|
|
25
36
|
async query(params) {
|
|
26
37
|
const query_id = getQueryId(params.query_id);
|
|
@@ -128,11 +139,12 @@ class WebConnection {
|
|
|
128
139
|
};
|
|
129
140
|
}
|
|
130
141
|
try {
|
|
142
|
+
const authHeaderOverride = getAuthHeaderOverride(params?.auth);
|
|
131
143
|
const headers = (0, client_common_1.withCompressionHeaders)({
|
|
132
|
-
headers:
|
|
144
|
+
headers: authHeaderOverride !== undefined
|
|
133
145
|
? {
|
|
134
146
|
...this.defaultHeaders,
|
|
135
|
-
Authorization:
|
|
147
|
+
Authorization: authHeaderOverride,
|
|
136
148
|
}
|
|
137
149
|
: this.defaultHeaders,
|
|
138
150
|
enable_request_compression: false,
|
|
@@ -202,4 +214,12 @@ function getResponseHeaders(response) {
|
|
|
202
214
|
});
|
|
203
215
|
return headers;
|
|
204
216
|
}
|
|
217
|
+
function getAuthHeaderOverride(auth) {
|
|
218
|
+
if ((0, client_common_1.isJWTAuth)(auth)) {
|
|
219
|
+
return `Bearer ${auth.access_token}`;
|
|
220
|
+
}
|
|
221
|
+
if ((0, client_common_1.isCredentialsAuth)(auth)) {
|
|
222
|
+
return `Basic ${btoa(`${auth.username}:${auth.password}`)}`;
|
|
223
|
+
}
|
|
224
|
+
}
|
|
205
225
|
//# sourceMappingURL=web_connection.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web_connection.js","sourceRoot":"","sources":["../../../../packages/client-web/src/connection/web_connection.ts"],"names":[],"mappings":";;;AAWA,
|
|
1
|
+
{"version":3,"file":"web_connection.js","sourceRoot":"","sources":["../../../../packages/client-web/src/connection/web_connection.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -3,4 +3,4 @@ export { createClient } from './client';
|
|
|
3
3
|
export { type WebClickHouseClientConfigOptions as ClickHouseClientConfigOptions } from './config';
|
|
4
4
|
export { ResultSet } from './result_set';
|
|
5
5
|
/** Re-export @clickhouse/client-common types */
|
|
6
|
-
export { type BaseClickHouseClientConfigOptions, type BaseQueryParams, type QueryParams, type ExecParams, type InsertParams, type InsertValues, type CommandParams, type CommandResult, type ExecResult, type InsertResult, type DataFormat, type RawDataFormat, type JSONDataFormat, type StreamableDataFormat, type StreamableJSONDataFormat, type SingleDocumentJSONFormat, type Logger, type LogParams, type ErrorLogParams, type WarnLogParams, type ClickHouseSettings, type MergeTreeSettings, type Row, type ResponseJSON, type InputJSON, type InputJSONObjectEachRow, type BaseResultSet, type PingResult, ClickHouseError, ClickHouseLogLevel, SettingsMap, SupportedJSONFormats, SupportedRawFormats, StreamableFormats, StreamableJSONFormats, SingleDocumentJSONFormats, RecordsJSONFormats, type SimpleColumnType, type ParsedColumnSimple, type ParsedColumnEnum, type ParsedColumnFixedString, type ParsedColumnNullable, type ParsedColumnDecimal, type ParsedColumnDateTime, type ParsedColumnDateTime64, type ParsedColumnArray, type ParsedColumnTuple, type ParsedColumnMap, type ParsedColumnType, parseColumnType, SimpleColumnTypes, type ProgressRow, isProgressRow, type RowOrProgress, TupleParam, } from '@clickhouse/client-common';
|
|
6
|
+
export { type BaseClickHouseClientConfigOptions, type BaseQueryParams, type QueryParams, type ExecParams, type InsertParams, type InsertValues, type CommandParams, type CommandResult, type ExecResult, type InsertResult, type DataFormat, type RawDataFormat, type JSONDataFormat, type StreamableDataFormat, type StreamableJSONDataFormat, type SingleDocumentJSONFormat, type Logger, type LogParams, type ErrorLogParams, type WarnLogParams, type ClickHouseSettings, type MergeTreeSettings, type Row, type ResponseJSON, type InputJSON, type InputJSONObjectEachRow, type BaseResultSet, type PingResult, ClickHouseError, ClickHouseLogLevel, SettingsMap, SupportedJSONFormats, SupportedRawFormats, StreamableFormats, StreamableJSONFormats, SingleDocumentJSONFormats, RecordsJSONFormats, type SimpleColumnType, type ParsedColumnSimple, type ParsedColumnEnum, type ParsedColumnFixedString, type ParsedColumnNullable, type ParsedColumnDecimal, type ParsedColumnDateTime, type ParsedColumnDateTime64, type ParsedColumnArray, type ParsedColumnTuple, type ParsedColumnMap, type ParsedColumnType, parseColumnType, SimpleColumnTypes, type ProgressRow, isProgressRow, type RowOrProgress, type ClickHouseAuth, type ClickHouseJWTAuth, type ClickHouseCredentialsAuth, TupleParam, } from '@clickhouse/client-common';
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../packages/client-web/src/index.ts"],"names":[],"mappings":";;;AAIA,mCAAuC;AAA9B,sGAAA,YAAY,OAAA;AAErB,2CAAwC;AAA/B,uGAAA,SAAS,OAAA;AAElB,gDAAgD;AAChD,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../packages/client-web/src/index.ts"],"names":[],"mappings":";;;AAIA,mCAAuC;AAA9B,sGAAA,YAAY,OAAA;AAErB,2CAAwC;AAA/B,uGAAA,SAAS,OAAA;AAElB,gDAAgD;AAChD,2DA2DkC;AA9BhC,gHAAA,eAAe,OAAA;AACf,mHAAA,kBAAkB,OAAA;AAClB,4GAAA,WAAW,OAAA;AAmBX,gHAAA,eAAe,OAAA;AACf,kHAAA,iBAAiB,OAAA;AAEjB,8GAAA,aAAa,OAAA;AAKb,2GAAA,UAAU,OAAA"}
|
package/dist/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: "1.
|
|
1
|
+
declare const _default: "1.10.0";
|
|
2
2
|
export default _default;
|
package/dist/version.js
CHANGED
package/dist/version.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../../packages/client-web/src/version.ts"],"names":[],"mappings":";;AAAA,kBAAe,
|
|
1
|
+
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../../packages/client-web/src/version.ts"],"names":[],"mappings":";;AAAA,kBAAe,QAAQ,CAAA"}
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@clickhouse/client-web",
|
|
3
3
|
"description": "Official JS client for ClickHouse DB - Web API implementation",
|
|
4
4
|
"homepage": "https://clickhouse.com",
|
|
5
|
-
"version": "1.
|
|
5
|
+
"version": "1.10.0",
|
|
6
6
|
"license": "Apache-2.0",
|
|
7
7
|
"keywords": [
|
|
8
8
|
"clickhouse",
|
|
@@ -20,6 +20,6 @@
|
|
|
20
20
|
"dist"
|
|
21
21
|
],
|
|
22
22
|
"dependencies": {
|
|
23
|
-
"@clickhouse/client-common": "1.
|
|
23
|
+
"@clickhouse/client-common": "1.10.0"
|
|
24
24
|
}
|
|
25
25
|
}
|