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

fix: in case there is a port number other than 80 or 443 #713

Closed
wants to merge 1 commit into from
Closed

fix: in case there is a port number other than 80 or 443 #713

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
12 changes: 11 additions & 1 deletion src/passport.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,17 @@ export class Strategy implements passport.Strategy {
* callbackURL was specified in the Strategy constructor
*/
currentUrl(req: express.Request): URL {
return new URL(`${req.protocol}://${req.host}${req.url}`)
const DEFAULT_PORTS = [80, 443, 0];
let port = req.port || '0';
let portNumber = parseInt(port, 10);
if(portNumber === 0) {
const host = req.headers.host;
const portFromHost = host.split(':').pop();
portNumber = parseInt(portFromHost, 10) || 0;
}
port = DEFAULT_PORTS.includes(portNumber) ? '' : `:${portNumber}`;
const urlString = `${req.protocol}://${req.host}${port}${req.url}`;
return new URL(urlString);
}

authenticate<
Expand Down