Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

support pass verifyToken to MessengerBot or MessengerConnector #204

Merged
merged 1 commit into from
Mar 12, 2018
Merged

support pass verifyToken to MessengerBot or MessengerConnector #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/bot/MessengerBot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,20 @@ export default class MessengerBot extends Bot {
sessionStore,
sync,
mapPageToAccessToken,
verifyToken,
}: {
accessToken: string,
appSecret: string,
sessionStore: SessionStore,
sync?: boolean,
mapPageToAccessToken?: (pageId: string) => Promise<string>,
verifyToken?: string,
}) {
const connector = new MessengerConnector({
accessToken,
appSecret,
mapPageToAccessToken,
verifyToken,
});
super({ connector, sessionStore, sync });
}
Expand Down
8 changes: 8 additions & 0 deletions src/bot/MessengerConnector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,23 +78,27 @@ type ConstructorOptions = {|
appSecret?: string,
client?: MessengerClient,
mapPageToAccessToken?: (pageId: string) => Promise<string>,
verifyToken?: ?string,
|};

export default class MessengerConnector
implements Connector<MessengerRequestBody> {
_client: MessengerClient;
_appSecret: string;
_mapPageToAccessToken: ?(pageId: string) => ?Promise<string>;
_verifyToken: ?string;

constructor({
accessToken,
appSecret,
client,
mapPageToAccessToken,
verifyToken,
}: ConstructorOptions) {
this._client = client || MessengerClient.connect(accessToken || '');
this._appSecret = appSecret || '';
this._mapPageToAccessToken = mapPageToAccessToken;
this._verifyToken = verifyToken;
if (!this._appSecret) {
warning(
false,
Expand Down Expand Up @@ -161,6 +165,10 @@ export default class MessengerConnector
return this._client;
}

get verifyToken(): ?string {
return this._verifyToken;
}

getUniqueSessionKey(body: MessengerRequestBody): ?string {
const rawEvent = this._getRawEventsFromRequest(body)[0];
if (
Expand Down
16 changes: 15 additions & 1 deletion src/bot/__tests__/MessengerConnector.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,10 +164,11 @@ const webhookTestRequest = {
};

function setup(
{ accessToken, appSecret, mapPageToAccessToken } = {
{ accessToken, appSecret, mapPageToAccessToken, verifyToken } = {
accessToken: ACCESS_TOKEN,
appSecret: APP_SECRET,
mapPageToAccessToken: jest.fn(),
verifyToken: undefined,
}
) {
const mockGraphAPIClient = {
Expand All @@ -181,6 +182,7 @@ function setup(
accessToken,
appSecret,
mapPageToAccessToken,
verifyToken,
}),
};
}
Expand All @@ -202,6 +204,18 @@ describe('#platform', () => {
});
});

describe('#verifyToken', () => {
it('should be undefined when not be provided', () => {
const { connector } = setup();
expect(connector.verifyToken).toBe(undefined);
});

it('should equal when be provided', () => {
const { connector } = setup({ verifyToken: '1234' });
expect(connector.verifyToken).toBe('1234');
});
});

describe('#client', () => {
it('should be client', () => {
const { connector, mockGraphAPIClient } = setup();
Expand Down
3 changes: 2 additions & 1 deletion src/express/registerRoutes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ function registerRoutes(server, bot, config = {}) {
const middleware = config.webhookMiddleware ? [config.webhookMiddleware] : [];

if (bot.connector.platform === 'messenger') {
verifyToken = config.verifyToken || shortid.generate();
verifyToken =
config.verifyToken || bot.connector.verifyToken || shortid.generate();
server.get(path, verifyMessengerWebhook({ verifyToken }));
middleware.unshift(verifyMessengerSignature(bot));
} else if (bot.connector.platform === 'slack') {
Expand Down
3 changes: 2 additions & 1 deletion src/koa/registerRoutes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ function registerRoutes(server, bot, config = {}) {
const middleware = config.webhookMiddleware ? [config.webhookMiddleware] : [];

if (bot.connector.platform === 'messenger') {
verifyToken = config.verifyToken || shortid.generate();
verifyToken =
config.verifyToken || bot.connector.verifyToken || shortid.generate();
router.get(path, verifyMessengerWebhook({ verifyToken }));
middleware.unshift(verifyMessengerSignature(bot));
} else if (bot.connector.platform === 'slack') {
Expand Down
3 changes: 2 additions & 1 deletion src/micro/createServer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import connectNgrok from '../connectNgrok';
import createRequestHandler from './createRequestHandler';

function createServer(bot, config = {}) {
config.verifyToken = config.verifyToken || shortid.generate();
config.verifyToken =
config.verifyToken || bot.connector.verifyToken || shortid.generate();

const server = micro(createRequestHandler(bot, config));

Expand Down
3 changes: 2 additions & 1 deletion src/restify/registerRoutes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ function registerRoutes(server, bot, config = {}) {
const middleware = config.webhookMiddleware ? [config.webhookMiddleware] : [];

if (bot.connector.platform === 'messenger') {
verifyToken = config.verifyToken || shortid.generate();
verifyToken =
config.verifyToken || bot.connector.verifyToken || shortid.generate();
server.get(path, verifyMessengerWebhook({ verifyToken }));
middleware.unshift(verifyMessengerSignature(bot));
} else if (bot.connector.platform === 'slack') {
Expand Down