Adapt backend to new provider calls for Basic and Bearer tokens

Author: bigmontz

packages/testkit-backend/src/context.js

@@ -15,7 +15,8 @@ export default class Context {
     this._authTokenManagers = {}
     this._authTokenManagerGetAuthRequests = {}
     this._authTokenManagerOnAuthExpiredRequests = {}
-    this._expirationBasedAuthTokenProviderRequests = {}
+    this._bearerAuthTokenProviderRequests = {}
+    this._basicAuthTokenProviderRequests = {}
     this._binder = binder
     this._environmentLogLevel = environmentLogLevel
   }
@@ -201,16 +202,28 @@ export default class Context {
     delete this._authTokenManagerOnAuthExpiredRequests[id]
   }
 
-  addExpirationBasedAuthTokenProviderRequest (resolve, reject) {
-    return this._add(this._expirationBasedAuthTokenProviderRequests, { resolve, reject })
+  addBearerAuthTokenProviderRequest (resolve, reject) {
+    return this._add(this._bearerAuthTokenProviderRequests, { resolve, reject })
   }
 
-  getExpirationBasedAuthTokenProviderRequest (id) {
-    return this._expirationBasedAuthTokenProviderRequests[id]
+  getBearerAuthTokenProviderRequest (id) {
+    return this._bearerAuthTokenProviderRequests[id]
   }
 
-  removeExpirationBasedAuthTokenProviderRequest (id) {
-    delete this._expirationBasedAuthTokenProviderRequests[id]
+  removeBearerAuthTokenProviderRequest (id) {
+    delete this._bearerAuthTokenProviderRequests[id]
+  }
+
+  addBasicAuthTokenProviderRequest (resolve, reject) {
+    return this._add(this._basicAuthTokenProviderRequests, { resolve, reject })
+  }
+
+  getBasicAuthTokenProviderRequest (id) {
+    return this._basicAuthTokenProviderRequests[id]
+  }
+
+  removeBasicAuthTokenProviderRequest (id) {
+    delete this._basicAuthTokenProviderRequests[id]
   }
 
   _add (map, object) {

packages/testkit-backend/src/request-handlers-rx.js

@@ -29,8 +29,10 @@ export {
   AuthTokenManagerClose,
   AuthTokenManagerGetAuthCompleted,
   AuthTokenManagerOnAuthExpiredCompleted,
-  NewExpirationBasedAuthTokenManager,
-  ExpirationBasedAuthTokenProviderCompleted,
+  NewBearerAuthTokenManager,
+  BearerAuthTokenProviderCompleted,
+  NewBasicAuthTokenManager,
+  BasicAuthTokenProviderCompleted,
   FakeTimeInstall,
   FakeTimeTick,
   FakeTimeUninstall

packages/testkit-backend/src/request-handlers.js

@@ -560,28 +560,47 @@ export function AuthTokenManagerOnAuthExpiredCompleted (_, context, { requestId
   context.removeAuthTokenManagerOnAuthExpiredRequest(requestId)
 }
 
-export function NewExpirationBasedAuthTokenManager ({ neo4j }, context, _, wire) {
-  const id = context.addAuthTokenManager((expirationBasedAuthTokenManagerId) => {
+export function NewBearerAuthTokenManager ({ neo4j }, context, _, wire) {
+  const id = context.addAuthTokenManager((bearerAuthTokenManagerId) => {
     return neo4j.authTokenManagers.bearer({
       tokenProvider: () => new Promise((resolve, reject) => {
-        const id = context.addExpirationBasedAuthTokenProviderRequest(resolve, reject)
-        wire.writeResponse(responses.ExpirationBasedAuthTokenProviderRequest({ id, expirationBasedAuthTokenManagerId }))
+        const id = context.addBearerAuthTokenProviderRequest(resolve, reject)
+        wire.writeResponse(responses.BearerAuthTokenProviderRequest({ id, bearerAuthTokenManagerId }))
       })
     })
   })
 
-  wire.writeResponse(responses.ExpirationBasedAuthTokenManager({ id }))
+  wire.writeResponse(responses.BearerAuthTokenManager({ id }))
 }
 
-export function ExpirationBasedAuthTokenProviderCompleted (_, context, { requestId, auth }) {
-  const request = context.getExpirationBasedAuthTokenProviderRequest(requestId)
+export function BearerAuthTokenProviderCompleted (_, context, { requestId, auth }) {
+  const request = context.getBearerAuthTokenProviderRequest(requestId)
   request.resolve({
     expiration: auth.data.expiresInMs != null
       ? new Date(new Date().getTime() + auth.data.expiresInMs)
       : undefined,
     token: context.binder.parseAuthToken(auth.data.auth.data)
   })
-  context.removeExpirationBasedAuthTokenProviderRequest(requestId)
+  context.removeBearerAuthTokenProviderRequest(requestId)
+}
+
+export function NewBasicAuthTokenManager ({ neo4j }, context, _, wire) {
+  const id = context.addAuthTokenManager((basicAuthTokenManagerId) => {
+    return neo4j.authTokenManagers.basic({
+      tokenProvider: () => new Promise((resolve, reject) => {
+        const id = context.addBasicAuthTokenProviderRequest(resolve, reject)
+        wire.writeResponse(responses.BasicAuthTokenProviderRequest({ id, basicAuthTokenManagerId }))
+      })
+    })
+  })
+
+  wire.writeResponse(responses.BasicAuthTokenManager({ id }))
+}
+
+export function BasicAuthTokenProviderCompleted (_, context, { requestId, auth }) {
+  const request = context.getBasicAuthTokenProviderRequest(requestId)
+  request.resolve(context.binder.parseAuthToken(auth.data))
+  context.removeBasicAuthTokenProviderRequest(requestId)
 }
 
 export function GetRoutingTable (_, context, { driverId, database }, wire) {

packages/testkit-backend/src/responses.js

@@ -119,12 +119,20 @@ export function AuthTokenManagerOnAuthExpiredRequest ({ id, authTokenManagerId,
   return response('AuthTokenManagerOnAuthExpiredRequest', { id, authTokenManagerId, auth: AuthorizationToken(auth) })
 }
 
-export function ExpirationBasedAuthTokenManager ({ id }) {
-  return response('ExpirationBasedAuthTokenManager', { id })
+export function BearerAuthTokenManager ({ id }) {
+  return response('BearerAuthTokenManager', { id })
 }
 
-export function ExpirationBasedAuthTokenProviderRequest ({ id, expirationBasedAuthTokenManagerId }) {
-  return response('ExpirationBasedAuthTokenProviderRequest', { id, expirationBasedAuthTokenManagerId })
+export function BearerAuthTokenProviderRequest ({ id, bearerAuthTokenManagerId }) {
+  return response('BearerAuthTokenProviderRequest', { id, bearerAuthTokenManagerId })
+}
+
+export function BasicAuthTokenManager ({ id }) {
+  return response('BasicAuthTokenManager', { id })
+}
+
+export function BasicAuthTokenProviderRequest ({ id, basicAuthTokenManagerId }) {
+  return response('BasicAuthTokenProviderRequest', { id, basicAuthTokenManagerId })
 }
 
 export function DriverIsAuthenticated ({ id, authenticated }) {