Skip to content

Commit

Permalink
Fixing consistent-return linter warnings.
Browse files Browse the repository at this point in the history
  • Loading branch information
filmaj committed Aug 25, 2021
1 parent a029318 commit e6b10eb
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 26 deletions.
33 changes: 19 additions & 14 deletions src/App.ts
Original file line number Diff line number Diff line change
Expand Up @@ -695,6 +695,8 @@ export default class App {
} catch (error) {
this.logger.warn('Authorization of incoming event did not succeed. No listeners will be called.');
error.code = 'slack_bolt_authorization_error';
// disabling due to https://github.com/typescript-eslint/typescript-eslint/issues/1277
// eslint-disable-next-line consistent-return
return this.handleError(error);
}

Expand Down Expand Up @@ -860,22 +862,23 @@ export default class App {
// Don't process the last item in the listenerMiddleware array - it shouldn't get a next fn
const listener = listenerMiddleware.pop();

if (listener !== undefined) {
return processMiddleware(
listenerMiddleware,
listenerArgs as AnyMiddlewareArgs,
if (listener === undefined) {
return undefined;
}
return processMiddleware(
listenerMiddleware,
listenerArgs as AnyMiddlewareArgs,
context,
client,
this.logger,
// When the listener middleware chain is done processing, call the listener without a next fn
async () => listener({
...(listenerArgs as AnyMiddlewareArgs),
context,
client,
this.logger,
// When the listener middleware chain is done processing, call the listener without a next fn
async () => listener({
...(listenerArgs as AnyMiddlewareArgs),
context,
client,
logger: this.logger,
}),
);
}
logger: this.logger,
}),
);
});

const settledListenerResults = await allSettled(listenerResults);
Expand All @@ -890,6 +893,8 @@ export default class App {
},
);
} catch (error) {
// disabling due to https://github.com/typescript-eslint/typescript-eslint/issues/1277
// eslint-disable-next-line consistent-return
return this.handleError(error);
}
}
Expand Down
12 changes: 6 additions & 6 deletions src/receivers/ExpressReceiver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -327,25 +327,25 @@ export default class ExpressReceiver implements Receiver {
return reject(new ReceiverInconsistentStateError(missingServerErrorDescription));
}

resolve(this.server);
return resolve(this.server);
});
});
}

// TODO: the arguments should be defined as the arguments to close() (which happen to be none), but for sake of
// generic types
public stop(): Promise<void> {
if (this.server === undefined) {
return Promise.reject(new ReceiverInconsistentStateError('The receiver cannot be stopped because it was not started.'));
}
return new Promise((resolve, reject) => {
if (this.server === undefined) {
return reject(new ReceiverInconsistentStateError('The receiver cannot be stopped because it was not started.'));
}
this.server.close((error) => {
this.server?.close((error) => {
if (error !== undefined) {
return reject(error);
}

this.server = undefined;
resolve();
return resolve();
});
});
}
Expand Down
12 changes: 6 additions & 6 deletions src/receivers/HTTPReceiver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -242,25 +242,25 @@ export default class HTTPReceiver implements Receiver {
return reject(new ReceiverInconsistentStateError(missingServerErrorDescription));
}

resolve(this.server);
return resolve(this.server);
});
});
}

// TODO: the arguments should be defined as the arguments to close() (which happen to be none), but for sake of
// generic types
public stop(): Promise<void> {
if (this.server === undefined) {
return Promise.reject(new ReceiverInconsistentStateError('The receiver cannot be stopped because it was not started.'));
}
return new Promise((resolve, reject) => {
if (this.server === undefined) {
return reject(new ReceiverInconsistentStateError('The receiver cannot be stopped because it was not started.'));
}
this.server.close((error) => {
this.server?.close((error) => {
if (error !== undefined) {
return reject(error);
}

this.server = undefined;
resolve();
return resolve();
});
});
}
Expand Down

0 comments on commit e6b10eb

Please sign in to comment.