From 6c98b1f3d8e39d548572a744f0c034de37b2ecef Mon Sep 17 00:00:00 2001 From: Huw McNamara Date: Tue, 13 Feb 2018 18:25:43 +0000 Subject: [PATCH] undid TlsOptions name change --- types/ftpd/index.d.ts | 2 +- types/http-proxy-middleware/index.d.ts | 2 +- types/node/index.d.ts | 8 ++++---- types/nodemailer/lib/fetch/index.d.ts | 2 +- types/pg/index.d.ts | 4 ++-- types/pg/v6/index.d.ts | 4 ++-- types/smtp-server/index.d.ts | 8 ++++---- types/thrift/index.d.ts | 2 +- types/xmlrpc/index.d.ts | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/types/ftpd/index.d.ts b/types/ftpd/index.d.ts index 8af363b572..cd325109ee 100644 --- a/types/ftpd/index.d.ts +++ b/types/ftpd/index.d.ts @@ -75,7 +75,7 @@ export interface FtpServerOptions { /** * If this is set, the server will allow explicit TLS authentication. Value should be a dictionary which is suitable as the options argument of tls.createServer. */ - tlsOptions?: tls.TlsServerOptions; + tlsOptions?: tls.TlsOptions; /** * If this is set to true, and tlsOptions is also set, then the server will not allow logins over non-secure connections. * Default false diff --git a/types/http-proxy-middleware/index.d.ts b/types/http-proxy-middleware/index.d.ts index dd944d94e3..5db24429c9 100644 --- a/types/http-proxy-middleware/index.d.ts +++ b/types/http-proxy-middleware/index.d.ts @@ -43,7 +43,7 @@ declare namespace proxy { target?: string; forward?: string; agent?: http.Agent; - ssl?: tls.TlsServerOptions; + ssl?: tls.TlsOptions; ws?: boolean; xfwd?: boolean; secure?: boolean; diff --git a/types/node/index.d.ts b/types/node/index.d.ts index e4dc926da8..86ad1fe52e 100644 --- a/types/node/index.d.ts +++ b/types/node/index.d.ts @@ -1741,7 +1741,7 @@ declare module "https" { import * as http from "http"; import { URL } from "url"; - export type ServerOptions = tls.SecureContextOptions & tls.TlsServerOptions; + export type ServerOptions = tls.SecureContextOptions & tls.TlsOptions; export type RequestOptions = http.RequestOptions & { rejectUnauthorized?: boolean; // Defaults to true @@ -4954,7 +4954,7 @@ declare module "tls" { prependOnceListener(event: "secureConnect", listener: () => void): this; } - export interface TlsServerOptions extends SecureContextOptions { + export interface TlsOptions extends SecureContextOptions { clientCertEngine?: string; handshakeTimeout?: number; requestCert?: boolean; @@ -5091,7 +5091,7 @@ declare module "tls" { * Returns Error object, populating it with the reason, host and cert on failure. On success, returns undefined. */ export function checkServerIdentity(host: string, cert: PeerCertificate): Error | undefined; - export function createServer(options: TlsServerOptions, secureConnectionListener?: (socket: TLSSocket) => void): Server; + export function createServer(options: TlsOptions, secureConnectionListener?: (socket: TLSSocket) => void): Server; export function connect(options: ConnectionOptions, secureConnectionListener?: () => void): TLSSocket; export function connect(port: number, host?: string, options?: ConnectionOptions, secureConnectListener?: () => void): TLSSocket; export function connect(port: number, options?: ConnectionOptions, secureConnectListener?: () => void): TLSSocket; @@ -6490,7 +6490,7 @@ declare module "http2" { export type ServerSessionOptions = SessionOptions; export interface SecureClientSessionOptions extends ClientSessionOptions, tls.ConnectionOptions { } - export interface SecureServerSessionOptions extends ServerSessionOptions, tls.TlsServerOptions { } + export interface SecureServerSessionOptions extends ServerSessionOptions, tls.TlsOptions { } export interface ServerOptions extends ServerSessionOptions { allowHTTP1?: boolean; diff --git a/types/nodemailer/lib/fetch/index.d.ts b/types/nodemailer/lib/fetch/index.d.ts index d0006cd4b7..8fc814c517 100644 --- a/types/nodemailer/lib/fetch/index.d.ts +++ b/types/nodemailer/lib/fetch/index.d.ts @@ -21,7 +21,7 @@ declare namespace fetch { userAgent?: string; body?: Buffer | string | { [key: string]: string }; contentType?: string | false; - tls?: tls.TlsServerOptions; + tls?: tls.TlsOptions; timeout?: ms; allowErrorResponse?: boolean; } diff --git a/types/pg/index.d.ts b/types/pg/index.d.ts index f91402efe1..384dd4b465 100644 --- a/types/pg/index.d.ts +++ b/types/pg/index.d.ts @@ -26,10 +26,10 @@ export interface Defaults extends ConnectionConfig { parseInt8?: boolean; } -import { TlsServerOptions } from "tls"; +import { TlsOptions } from "tls"; export interface ClientConfig extends ConnectionConfig { - ssl?: boolean | TlsServerOptions; + ssl?: boolean | TlsOptions; } export interface PoolConfig extends ClientConfig { diff --git a/types/pg/v6/index.d.ts b/types/pg/v6/index.d.ts index 48ae20133c..150dad74fa 100644 --- a/types/pg/v6/index.d.ts +++ b/types/pg/v6/index.d.ts @@ -29,10 +29,10 @@ export interface Defaults extends ConnectionConfig { parseInt8?: boolean; } -import { TlsServerOptions } from "tls"; +import { TlsOptions } from "tls"; export interface ClientConfig extends ConnectionConfig { - ssl?: boolean | TlsServerOptions; + ssl?: boolean | TlsOptions; } export interface PoolConfig extends ClientConfig { diff --git a/types/smtp-server/index.d.ts b/types/smtp-server/index.d.ts index c00faf431a..6e71373260 100644 --- a/types/smtp-server/index.d.ts +++ b/types/smtp-server/index.d.ts @@ -93,7 +93,7 @@ export interface SMTPServerSession { envelope: SMTPServerEnvelope; transmissionType: string; - tlsOptions: tls.TlsServerOptions; + tlsOptions: tls.TlsOptions; } export interface SMTPServerEnvelope { @@ -107,7 +107,7 @@ export interface SMTPServerEnvelope { rcptTo: SMTPServerAddress[]; } -export interface SMTPServerOptions extends tls.TlsServerOptions { +export interface SMTPServerOptions extends tls.TlsOptions { /** * if true, the connection will use TLS. The default is false. * If the server doesn't start in TLS mode, @@ -188,7 +188,7 @@ export interface SMTPServerOptions extends tls.TlsServerOptions { /** * optional Map or an object of TLS options for SNI where servername is the key. Overrided by SNICallback. */ - sniOptions?: { [servername: string]: tls.TlsServerOptions } | Map; + sniOptions?: { [servername: string]: tls.TlsOptions } | Map; /** * optional boolean, if set to true then upgrade sockets to TLS immediately after connection is established. Works with secure: true */ @@ -282,7 +282,7 @@ export class SMTPServer extends EventEmitter { /** Closes the server */ close(callback: (err?: Error | null) => void): void; - updateSecureContext(options: tls.TlsServerOptions): void; + updateSecureContext(options: tls.TlsOptions): void; /** Authentication handler. Override this */ onAuth(auth: SMTPServerAuthentication, session: SMTPServerSession, callback: (err: Error | null | undefined, response: SMTPServerAuthenticationResponse) => void): void; diff --git a/types/thrift/index.d.ts b/types/thrift/index.d.ts index 3905b40bfa..e4f0e3c1f9 100644 --- a/types/thrift/index.d.ts +++ b/types/thrift/index.d.ts @@ -236,7 +236,7 @@ export interface ServerOptions extends ServiceOptions; - tls?: tls.TlsServerOptions; + tls?: tls.TlsOptions; } export interface ConnectOptions { diff --git a/types/xmlrpc/index.d.ts b/types/xmlrpc/index.d.ts index 7cc76d9511..8425d4672c 100644 --- a/types/xmlrpc/index.d.ts +++ b/types/xmlrpc/index.d.ts @@ -9,7 +9,7 @@ declare module 'xmlrpc' { import { EventEmitter } from 'events'; import { Server as HttpServer } from 'http'; import { Server as HttpsServer } from 'https'; - import { TlsServerOptions } from 'tls'; + import { TlsOptions } from 'tls'; interface ClientOptions { host?: string; @@ -47,7 +47,7 @@ declare module 'xmlrpc' { function createSecureClient(options: string | ClientOptions): Client; function createServer(options: string | ServerOptions, callback: () => void): Server; - function createSecureServer(options: string | TlsServerOptions, callback: () => void): Server; + function createSecureServer(options: string | TlsOptions, callback: () => void): Server; interface Client { options: ClientOptions;