neo4j-driver 5.7.0 → 5.8.0

package/lib/driver.js

@@ -74,13 +74,14 @@ var Driver = /** @class */ (function (_super) {
      * @returns {RxSession} new reactive session.
      */
     Driver.prototype.rxSession = function (_a) {
-        var _b = _a === void 0 ? {} : _a, _c = _b.defaultAccessMode, defaultAccessMode = _c === void 0 ? WRITE : _c, bookmarks = _b.bookmarks, _d = _b.database, database = _d === void 0 ? '' : _d, fetchSize = _b.fetchSize, impersonatedUser = _b.impersonatedUser, bookmarkManager = _b.bookmarkManager, notificationFilter = _b.notificationFilter;
+        var _b = _a === void 0 ? {} : _a, _c = _b.defaultAccessMode, defaultAccessMode = _c === void 0 ? WRITE : _c, bookmarks = _b.bookmarks, _d = _b.database, database = _d === void 0 ? '' : _d, fetchSize = _b.fetchSize, impersonatedUser = _b.impersonatedUser, bookmarkManager = _b.bookmarkManager, notificationFilter = _b.notificationFilter, auth = _b.auth;
         return new session_rx_1.default({
             session: this._newSession({
                 defaultAccessMode: defaultAccessMode,
                 bookmarkOrBookmarks: bookmarks,
                 database: database,
                 impersonatedUser: impersonatedUser,
+                auth: auth,
                 reactive: false,
                 fetchSize: validateFetchSizeValue(fetchSize, this._config.fetchSize),
                 bookmarkManager: bookmarkManager,

package/lib/index.js

@@ -40,7 +40,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PathSegment = exports.Path = exports.UnboundRelationship = exports.Relationship = exports.Node = exports.Record = exports.ServerInfo = exports.Notification = exports.QueryStatistics = exports.ProfiledPlan = exports.Plan = exports.ResultSummary = exports.RxResult = exports.RxManagedTransaction = exports.RxTransaction = exports.RxSession = exports.EagerResult = exports.Result = exports.ManagedTransaction = exports.Transaction = exports.Session = exports.Driver = exports.temporal = exports.spatial = exports.graph = exports.error = exports.routing = exports.session = exports.types = exports.logging = exports.auth = exports.isRetryableError = exports.Neo4jError = exports.integer = exports.isUnboundRelationship = exports.isRelationship = exports.isPathSegment = exports.isPath = exports.isNode = exports.isDateTime = exports.isLocalDateTime = exports.isDate = exports.isTime = exports.isLocalTime = exports.isDuration = exports.isPoint = exports.isInt = exports.int = exports.hasReachableServer = exports.driver = void 0;
-exports.notificationFilterMinimumSeverityLevel = exports.notificationFilterDisabledCategory = exports.notificationSeverityLevel = exports.notificationCategory = exports.resultTransformers = exports.bookmarkManager = exports.DateTime = exports.LocalDateTime = exports.Date = exports.Time = exports.LocalTime = exports.Duration = exports.Integer = exports.Point = void 0;
+exports.expirationBasedAuthTokenManager = exports.notificationFilterMinimumSeverityLevel = exports.notificationFilterDisabledCategory = exports.notificationSeverityLevel = exports.notificationCategory = exports.resultTransformers = exports.bookmarkManager = exports.DateTime = exports.LocalDateTime = exports.Date = exports.Time = exports.LocalTime = exports.Duration = exports.Integer = exports.Point = void 0;
 /**
  * Copyright (c) "Neo4j"
  * Neo4j Sweden AB [http://neo4j.com]
@@ -113,6 +113,7 @@ Object.defineProperty(exports, "notificationCategory", { enumerable: true, get:
 Object.defineProperty(exports, "notificationSeverityLevel", { enumerable: true, get: function () { return neo4j_driver_core_1.notificationSeverityLevel; } });
 Object.defineProperty(exports, "notificationFilterDisabledCategory", { enumerable: true, get: function () { return neo4j_driver_core_1.notificationFilterDisabledCategory; } });
 Object.defineProperty(exports, "notificationFilterMinimumSeverityLevel", { enumerable: true, get: function () { return neo4j_driver_core_1.notificationFilterMinimumSeverityLevel; } });
+Object.defineProperty(exports, "expirationBasedAuthTokenManager", { enumerable: true, get: function () { return neo4j_driver_core_1.expirationBasedAuthTokenManager; } });
 var neo4j_driver_bolt_connection_1 = require("neo4j-driver-bolt-connection");
 var session_rx_1 = __importDefault(require("./session-rx"));
 exports.RxSession = session_rx_1.default;
@@ -123,6 +124,24 @@ exports.RxManagedTransaction = transaction_managed_rx_1.default;
 var result_rx_1 = __importDefault(require("./result-rx"));
 exports.RxResult = result_rx_1.default;
 var _a = neo4j_driver_core_1.internal.util, ENCRYPTION_ON = _a.ENCRYPTION_ON, assertString = _a.assertString, isEmptyObjectOrNull = _a.isEmptyObjectOrNull, ServerAddress = neo4j_driver_core_1.internal.serverAddress.ServerAddress, urlUtil = neo4j_driver_core_1.internal.urlUtil;
+function isAuthTokenManager(value) {
+    return typeof value === 'object' &&
+        value != null &&
+        'getToken' in value &&
+        'onTokenExpired' in value &&
+        typeof value.getToken === 'function' &&
+        typeof value.onTokenExpired === 'function';
+}
+function createAuthManager(authTokenOrManager) {
+    if (isAuthTokenManager(authTokenOrManager)) {
+        return authTokenOrManager;
+    }
+    var authToken = authTokenOrManager;
+    // Sanitize authority token. Nicer error from server when a scheme is set.
+    authToken = authToken || {};
+    authToken.scheme = authToken.scheme || 'none';
+    return (0, neo4j_driver_core_1.staticAuthTokenManager)({ authToken: authToken });
+}
 /**
  * Construct a new Neo4j Driver. This is your main entry point for this
  * library.
@@ -301,9 +320,7 @@ function driver(url, authToken, config) {
         config.encrypted = ENCRYPTION_ON;
         config.trust = trust;
     }
-    // Sanitize authority token. Nicer error from server when a scheme is set.
-    authToken = authToken || {};
-    authToken.scheme = authToken.scheme || 'none';
+    var authTokenManager = createAuthManager(authToken);
     // Use default user agent or user agent specified by user.
     config.userAgent = config.userAgent || USER_AGENT;
     var address = ServerAddress.fromUrl(parsedUrl.hostAndPort);
@@ -321,7 +338,7 @@ function driver(url, authToken, config) {
                     config: config,
                     log: log,
                     hostNameResolver: hostNameResolver,
-                    authToken: authToken,
+                    authTokenManager: authTokenManager,
                     address: address,
                     userAgent: config.userAgent,
                     routingContext: parsedUrl.query
@@ -337,7 +354,7 @@ function driver(url, authToken, config) {
                     id: id,
                     config: config,
                     log: log,
-                    authToken: authToken,
+                    authTokenManager: authTokenManager,
                     address: address,
                     userAgent: config.userAgent
                 });
@@ -534,6 +551,7 @@ var forExport = {
     notificationCategory: neo4j_driver_core_1.notificationCategory,
     notificationSeverityLevel: neo4j_driver_core_1.notificationSeverityLevel,
     notificationFilterDisabledCategory: neo4j_driver_core_1.notificationFilterDisabledCategory,
-    notificationFilterMinimumSeverityLevel: neo4j_driver_core_1.notificationFilterMinimumSeverityLevel
+    notificationFilterMinimumSeverityLevel: neo4j_driver_core_1.notificationFilterMinimumSeverityLevel,
+    expirationBasedAuthTokenManager: neo4j_driver_core_1.expirationBasedAuthTokenManager
 };
 exports.default = forExport;

package/lib/version.js

@@ -26,4 +26,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // This is set up this way to keep the version in the code in
 // sync with the npm package version, and to allow the build
 // system to control version names at packaging time.
-exports.default = '5.7.0';
+exports.default = '5.8.0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neo4j-driver",
-  "version": "5.7.0",
+  "version": "5.8.0",
   "description": "The official Neo4j driver for Javascript",
   "author": "Neo4j",
   "license": "Apache-2.0",
@@ -79,9 +79,9 @@
     "webpack": "^5.75.0"
   },
   "dependencies": {
-    "neo4j-driver-bolt-connection": "^5.7.0",
-    "neo4j-driver-core": "^5.7.0",
+    "neo4j-driver-bolt-connection": "^5.8.0",
+    "neo4j-driver-core": "^5.8.0",
     "rxjs": "^7.8.0"
   },
-  "gitHead": "dd93e78d7b189c59765fe6bc0104c5d4a5fbd15d"
+  "gitHead": "d8c4e0f4f9643f99da56bb8f1d179d0ec4b3b3ab"
 }

package/types/index.d.ts

@@ -83,7 +83,10 @@ import {
   NotificationFilterDisabledCategory,
   NotificationFilterMinimumSeverityLevel,
   notificationFilterDisabledCategory,
-  notificationFilterMinimumSeverityLevel
+  notificationFilterMinimumSeverityLevel,
+  AuthTokenManager,
+  AuthTokenAndExpiration,
+  expirationBasedAuthTokenManager
 } from 'neo4j-driver-core'
 import {
   AuthToken,
@@ -265,6 +268,7 @@ declare const forExport: {
   notificationSeverityLevel: typeof notificationSeverityLevel
   notificationFilterDisabledCategory: typeof notificationFilterDisabledCategory
   notificationFilterMinimumSeverityLevel: typeof notificationFilterMinimumSeverityLevel
+  expirationBasedAuthTokenManager: typeof expirationBasedAuthTokenManager
 }
 
 export {
@@ -338,7 +342,8 @@ export {
   notificationCategory,
   notificationSeverityLevel,
   notificationFilterDisabledCategory,
-  notificationFilterMinimumSeverityLevel
+  notificationFilterMinimumSeverityLevel,
+  expirationBasedAuthTokenManager
 }
 
 export type {
@@ -352,7 +357,9 @@ export type {
   NotificationSeverityLevel,
   NotificationFilter,
   NotificationFilterDisabledCategory,
-  NotificationFilterMinimumSeverityLevel
+  NotificationFilterMinimumSeverityLevel,
+  AuthTokenManager,
+  AuthTokenAndExpiration
 }
 
 export default forExport