Skip to content

Commit 2f1feba

Browse files
committed
fix: auth strategy
1 parent 8d748d3 commit 2f1feba

File tree

1 file changed

+23
-3
lines changed

1 file changed

+23
-3
lines changed

src/frameworks/auth/auth.strategy.ts

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,29 @@ const { fromExtractors, fromAuthHeaderAsBearerToken } = ExtractJwt;
1616
export class AuthStrategy extends PassportStrategy(Strategy) {
1717
constructor() {
1818
super({
19-
jwtFromRequest:
20-
fromExtractors([cookieExtractor, fromAuthHeaderAsBearerToken()]) ??
21-
ExtractJwt.fromAuthHeaderAsBearerToken(),
19+
jwtFromRequest: (request) => {
20+
// Check if it's an RPC request
21+
if (request?.getType?.() === 'rpc') {
22+
const data = request.getData();
23+
const headers = request.getContext()?.getHeaders?.();
24+
25+
// Try to get token from RPC data or headers
26+
return (
27+
data?.accessToken ||
28+
data?.token ||
29+
headers?.authorization?.split(' ')[1] ||
30+
headers?.['x-access-token'] ||
31+
headers?.['access-token']
32+
);
33+
}
34+
35+
// For HTTP requests, use the default extractors
36+
return (
37+
fromExtractors([cookieExtractor, fromAuthHeaderAsBearerToken()])(
38+
request,
39+
) ?? ExtractJwt.fromAuthHeaderAsBearerToken()(request)
40+
);
41+
},
2242
secretOrKey: baseConfig.jwt.secret,
2343
});
2444
}

0 commit comments

Comments
 (0)