From 9adaa35c586a91bfef4b8cac74646d24dbd042bd Mon Sep 17 00:00:00 2001
From: Borys Kupar <kupar.b@gmail.com>
Date: Tue, 9 Oct 2018 20:38:03 +0200
Subject: [PATCH] [jsforce] Add LimitsInfo, Fix logout (#29435)

---
 types/jsforce/connection.d.ts  |  5 ++++
 types/jsforce/index.d.ts       |  1 +
 types/jsforce/limits-info.d.ts | 48 ++++++++++++++++++++++++++++++++++
 3 files changed, 54 insertions(+)
 create mode 100644 types/jsforce/limits-info.d.ts

diff --git a/types/jsforce/connection.d.ts b/types/jsforce/connection.d.ts
index 60716753ae..3bd0ea177b 100644
--- a/types/jsforce/connection.d.ts
+++ b/types/jsforce/connection.d.ts
@@ -12,6 +12,7 @@ import { Bulk } from './bulk';
 import { Cache } from './cache'
 import { OAuth2, Streaming } from '.';
 import { HttpApiOptions } from './http-api'
+import { LimitsInfo } from './limits-info';
 
 export type Callback<T> = (err: Error | null, result: T) => void;
 // The type for these options was determined by looking at the usage
@@ -160,9 +161,13 @@ export class Connection extends BaseConnection {
     login(user: string, password: string, callback?: (err: Error, res: UserInfo) => void): Promise<UserInfo>;
     loginByOAuth2(user: string, password: string, callback?: (err: Error, res: UserInfo) => void): Promise<UserInfo>;
     loginBySoap(user: string, password: string, callback?: (err: Error, res: UserInfo) => void): Promise<UserInfo>;
+    logout(revoke: boolean, callback?: (err: Error, res: undefined) => void): Promise<void>;
     logout(callback?: (err: Error, res: undefined) => void): Promise<void>;
+    logoutByOAuth2(revoke: boolean, callback?: (err: Error, res: undefined) => void): Promise<void>;
     logoutByOAuth2(callback?: (err: Error, res: undefined) => void): Promise<void>;
+    logoutBySoap(revoke: boolean, callback?: (err: Error, res: undefined) => void): Promise<void>;
     logoutBySoap(callback?: (err: Error, res: undefined) => void): Promise<void>;
+    limits(callback?: (err: Error, res: undefined) => void): Promise<LimitsInfo>;
 }
 
 export class Tooling extends BaseConnection {
diff --git a/types/jsforce/index.d.ts b/types/jsforce/index.d.ts
index c36f39095a..65d5159f61 100644
--- a/types/jsforce/index.d.ts
+++ b/types/jsforce/index.d.ts
@@ -30,3 +30,4 @@ export * from './salesforce-id';
 export * from './salesforce-object';
 export * from './streaming';
 export * from './topic';
+export * from './limits-info';
diff --git a/types/jsforce/limits-info.d.ts b/types/jsforce/limits-info.d.ts
new file mode 100644
index 0000000000..bfeeabe0c3
--- /dev/null
+++ b/types/jsforce/limits-info.d.ts
@@ -0,0 +1,48 @@
+export interface Limit {
+    Max: number;
+    Remaining: number;
+}
+
+export interface PermissionSets extends Limit {
+    CreateCustom: Limit;
+}
+
+export interface DailyApiRequests extends Limit {
+    'Chatter Desktop': Limit;
+    'Chatter Mobile for BlackBerry': Limit;
+    'Salesforce Files': Limit;
+    'Salesforce Marketing Cloud': Limit;
+    'Salesforce for Android': Limit;
+    'Salesforce for iOS': Limit;
+    'SalesforceA': Limit;
+}
+
+export interface LimitsInfo {
+    ConcurrentAsyncGetReportInstances: Limit;
+    ConcurrentSyncReportRuns: Limit;
+    DailyAnalyticsDataflowJobExecutions: Limit;
+    DailyApiRequests: DailyApiRequests;
+    DailyAsyncApexExecutions: Limit;
+    DailyBulkApiRequests: DailyApiRequests;
+    DailyDurableGenericStreamingApiEvents: Limit;
+    DailyDurableStreamingApiEvents: Limit;
+    DailyGenericStreamingApiEvents: DailyApiRequests;
+    DailyStreamingApiEvents: DailyApiRequests;
+    DailyWorkflowEmails: Limit;
+    DataStorageMB: Limit;
+    DurableStreamingApiConcurrentClients: Limit;
+    FileStorageMB: Limit;
+    HourlyAsyncReportRuns: Limit;
+    HourlyDashboardRefreshes: Limit;
+    HourlyDashboardResults: Limit;
+    HourlyDashboardStatuses: Limit;
+    HourlyODataCallout: Limit;
+    HourlySyncReportRuns: Limit;
+    HourlyTimeBasedWorkflow: Limit;
+    MassEmail: Limit;
+    MonthlyPlatformEvents: Limit;
+    Package2VersionCreates: Limit;
+    PermissionSets: PermissionSets;
+    SingleEmail: Limit;
+    StreamingApiConcurrentClients: Limit;
+}