Fix a couple of typos that snuck in #434

Azure · Nov 29, 2018 · 978e014 · 978e014
1 parent 80f14df
commit 978e014
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/common/core/src/promise_utils.ts b/common/core/src/promise_utils.ts
@@ -69,8 +69,6 @@ export type HttpResponseCallback<TResult> = TripleValueCallback<TResult, any>;
  * const param = 42;
  * callbackToPromise((_callback) => foo(param, _callback)).then(result => { console.log(result); }, error => { console.error(error); });
  */
-export function callbackToPromise<TResult>(callBackOperation: (callback: Callback<TResult>) => void, userCallback: Callback<TResult>): void;
-export function callbackToPromise<TResult>(callBackOperation: (callback: Callback<TResult>) => void): Promise<TResult>;
 export function callbackToPromise<TResult>(callBackOperation: (callback: Callback<TResult>) => void, userCallback?: Callback<TResult>): Promise<TResult> | void {
   if (userCallback) {
     if (!(typeof userCallback === 'function')) {

diff --git a/provisioning/service/src/provisioningserviceclient.ts b/provisioning/service/src/provisioningserviceclient.ts
@@ -64,7 +64,7 @@ export class ProvisioningServiceClient {
    */
   public deleteIndividualEnrollment(enrollmentOrId: string | IndividualEnrollment, etag: string, deleteCallback: ErrorCallback): void;
   public deleteIndividualEnrollment(enrollmentOrId: string | IndividualEnrollment, deleteCallback: ErrorCallback): void;
-  public deleteIndividualEnrollment(enrollmentOrId: string | IndividualEnrollment, etagOr: string): Promise<void>;
+  public deleteIndividualEnrollment(enrollmentOrId: string | IndividualEnrollment, etag: string): Promise<void>;
   public deleteIndividualEnrollment(enrollmentOrId: string | IndividualEnrollment): Promise<void>;
   public deleteIndividualEnrollment(enrollmentOrId: string | IndividualEnrollment, etagOrCallback?: string | ErrorCallback, deleteCallback?: ErrorCallback): Promise<void> | void {
     if (deleteCallback && !(typeof deleteCallback === 'function')) {
@@ -254,7 +254,7 @@ export class ProvisioningServiceClient {
    */
   public deleteDeviceRegistrationState(idOrRegistrationState: string | DeviceRegistrationState, etag: string, deleteCallback: ErrorCallback): void;
   public deleteDeviceRegistrationState(idOrRegistrationState: string | DeviceRegistrationState, deleteCallback: ErrorCallback): void;
-  public deleteDeviceRegistrationState(idOrRegistrationState: string | DeviceRegistrationState, etagOrCallback: string): Promise<void>;
+  public deleteDeviceRegistrationState(idOrRegistrationState: string | DeviceRegistrationState, etag: string): Promise<void>;
   public deleteDeviceRegistrationState(idOrRegistrationState: string | DeviceRegistrationState): Promise<void>;
   public deleteDeviceRegistrationState(idOrRegistrationState: string | DeviceRegistrationState, etagOrCallback?: string | ErrorCallback, deleteCallback?: ErrorCallback): Promise<void> | void {
     if (deleteCallback && !(typeof deleteCallback === 'function')) {

diff --git a/security/tpm/src/tpm_authentication_provider.ts b/security/tpm/src/tpm_authentication_provider.ts
@@ -3,7 +3,7 @@ const debug = dbg('azure-iot-device:TPMAuthenticationProvider');
 
 import { EventEmitter } from 'events';
 import * as machina from 'machina';
-import { AuthenticationType, SharedAccessSignature, errors, TransportConfig, AuthenticationProvider } from 'azure-iot-common';
+import { AuthenticationType, SharedAccessSignature, errors, TransportConfig, AuthenticationProvider, Callback, callbackToPromise } from 'azure-iot-common';
 import { TpmSecurityClient } from './tpm';
 
 /**
@@ -106,8 +106,12 @@ export class TpmAuthenticationProvider extends EventEmitter implements Authentic
     });
   }
 
-  getDeviceCredentials(callback: (err: Error, credentials?: TransportConfig) => void): void {
-    this._fsm.handle('getDeviceCredentials', callback);
+  getDeviceCredentials(): Promise<TransportConfig>;
+  getDeviceCredentials(callback: Callback<TransportConfig>): void;
+  getDeviceCredentials(callback?: Callback<TransportConfig>): void | Promise<TransportConfig> {
+    return callbackToPromise((_callback) => {
+      this._fsm.handle('getDeviceCredentials', _callback);
+    }, callback);
   }
 
   updateSharedAccessSignature(sharedAccessSignature: string): void {

diff --git a/service/src/job_client.ts b/service/src/job_client.ts
@@ -266,7 +266,7 @@ export class JobClient {
   scheduleTwinUpdate(jobId: string | number, queryCondition: string, patch: any, jobStartTime: Date, maxExecutionTimeInSeconds: number, done: TripleValueCallback<any, any>): void;
   scheduleTwinUpdate(jobId: string | number, queryCondition: string, patch: any, jobStartTime: Date, done: TripleValueCallback<any, any>): void;
   scheduleTwinUpdate(jobId: string | number, queryCondition: string, patch: any, done: TripleValueCallback<any, any>): void;
-  scheduleTwinUpdate(jobId: string | number, queryCondition: string, patch: any, jobStartTime: Date, maxExecutionTimeInSeconds?: number | TripleValueCallback<any, any>): Promise<JobStatusResponse>;
+  scheduleTwinUpdate(jobId: string | number, queryCondition: string, patch: any, jobStartTime: Date, maxExecutionTimeInSeconds?: number): Promise<JobStatusResponse>;
   scheduleTwinUpdate(jobId: string | number, queryCondition: string, patch: any, jobStartTime: Date): Promise<JobStatusResponse>;
   scheduleTwinUpdate(jobId: string | number, queryCondition: string, patch: any): Promise<JobStatusResponse>;
   scheduleTwinUpdate(jobId: string | number, queryCondition: string, patch: any, jobStartTime?: Date | TripleValueCallback<any, any>, maxExecutionTimeInSeconds?: number | TripleValueCallback<any, any>, done?: TripleValueCallback<any, any>): Promise<JobStatusResponse> | void {

diff --git a/service/src/registry.ts b/service/src/registry.ts
@@ -410,7 +410,7 @@ export class Registry {
    *                                              an error happened, (null otherwise) and the job status that can be used to track progress of the devices export.
    * @returns {Promise<Registry.JobStatus> | void} Promise if no callback function was passed, void otherwise.
    */
-  exportDevicesToBlob(outputBlobContainerUri: string, excludeKeys: boolean, done: Callback<Registry.JobStatus>):  void;
+  exportDevicesToBlob(outputBlobContainerUri: string, excludeKeys: boolean, done: Callback<Registry.JobStatus>): void;
   exportDevicesToBlob(outputBlobContainerUri: string, excludeKeys: boolean): Promise<Registry.JobStatus>;
   exportDevicesToBlob(outputBlobContainerUri: string, excludeKeys: boolean, done?: Callback<Registry.JobStatus>): Promise<Registry.JobStatus> | void {
     return callbackToPromise((_callback) => {