Skip to content
Open
Changes from all commits
Commits
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
14 changes: 10 additions & 4 deletions packages/apps/src/app.oauth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ export async function onTokenExchange<TPlugin extends IPlugin>(
this: App<TPlugin>,
ctx: contexts.IActivityContext<ISignInTokenExchangeInvokeActivity>
) {
const { api, activity, log } = ctx;

const { api, activity, log, next } = ctx;
if (this.oauth.defaultConnectionName !== activity.value.connectionName) {
log.warn(
`default connection name "${this.oauth.defaultConnectionName}" does not match activity connection name "${activity.value.connectionName}"`
Expand All @@ -40,6 +39,10 @@ export async function onTokenExchange<TPlugin extends IPlugin>(
);

this.events.emit('signin', { ...ctx, token, isSignedIn: true });
const nextResult = await next();
if (nextResult && nextResult.status !== 200) {
log.warn('Expecting token exchange to return 200, but got:', nextResult.status);
}
return { status: 200 };
} catch (error) {
if (error instanceof AxiosError) {
Expand All @@ -64,8 +67,7 @@ export async function onVerifyState<TPlugin extends IPlugin>(
this: App<TPlugin>,
ctx: contexts.IActivityContext<ISignInVerifyStateInvokeActivity>
) {
const { log, api, activity } = ctx;

const { log, api, activity, next } = ctx;
try {
if (!activity.value.state) {
log.warn(
Expand All @@ -88,6 +90,10 @@ export async function onVerifyState<TPlugin extends IPlugin>(
);

this.events.emit('signin', { ...ctx, token, isSignedIn: true });
const nextResult = await next();
if (nextResult && nextResult.status !== 200) {
log.warn('Expecting verify-state to return 200, but got:', nextResult.status);
}
return { status: 200 };
} catch (error) {
if (error instanceof AxiosError) {
Expand Down