Skip to content

Commit f24f0df

Browse files
committed
fix express tests
1 parent 14aa034 commit f24f0df

File tree

2 files changed

+20
-11
lines changed

2 files changed

+20
-11
lines changed

packages/asap-core/src/authenticator.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ export function createAsapAuthenticator({
127127
});
128128
}
129129

130-
const verifyOptions = {
130+
const verifyOptions: jsonWebToken.VerifyOptions = {
131131
algorithms: ALLOWED_ALGORITHMS,
132132
clockTolerance: CLOCK_TOLERANCE_SECONDS,
133133
audience: resourceServerAudience,

packages/express-asap/test/index_test.ts

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,22 @@ import createAsapAuthenticationMiddleware from '../src/middleware';
88
import createAsapIssuerWhitelistMiddleware from '../src/whitelist_middleware';
99

1010
const app = express();
11-
app.use(
12-
createAsapAuthenticationMiddleware({
13-
keyLoader: (_key: string) => Promise.resolve(publicKey),
14-
resourceServerAudience: 'test',
15-
maxLifeTimeSeconds: 60,
16-
})
17-
);
11+
app
12+
.use(
13+
createAsapAuthenticationMiddleware({
14+
keyLoader: (_key: string) => Promise.resolve(publicKey),
15+
resourceServerAudience: 'test',
16+
maxLifeTimeSeconds: 60,
17+
})
18+
)
19+
.use((req, res, next) => {
20+
// @ts-ignore
21+
if (req.headers.authorization && req.locals?.asapClaims === undefined) {
22+
res.status(401).send('Did not authenticate');
23+
} else {
24+
next();
25+
}
26+
});
1827

1928
app.get('/', (_req, res) => {
2029
res.status(200);
@@ -43,7 +52,7 @@ describe('middleware', () => {
4352
tokenExpiryMs: 60 * 1000,
4453
};
4554

46-
const authHeader = createAuthHeaderGenerator(jwtConfig)();
55+
const authHeader = createAuthHeaderGenerator(jwtConfig)({ admin: true });
4756
const res = await agent.get('/').set('Authorization', authHeader);
4857
expect(res.status).to.equal(200);
4958
expect(res.text).to.equal('OK');
@@ -58,7 +67,7 @@ describe('middleware', () => {
5867
tokenExpiryMs: 60 * 1000,
5968
};
6069

61-
const authHeader = createAuthHeaderGenerator(jwtConfig)();
70+
const authHeader = createAuthHeaderGenerator(jwtConfig)({ admin: true });
6271
const res = await agent.get('/').set('Authorization', authHeader);
6372
expect(res.status).to.equal(401);
6473
});
@@ -77,7 +86,7 @@ describe('middleware', () => {
7786
return res.send('OK');
7887
});
7988

80-
const authHeader = createAuthHeaderGenerator(jwtConfig)();
89+
const authHeader = createAuthHeaderGenerator(jwtConfig)({ admin: true });
8190
const res = await agent.get('/protected').set('Authorization', authHeader);
8291
expect(res.status).to.equal(401);
8392
});

0 commit comments

Comments
 (0)