Compute proper JWT expiry date.

The current version produces an expiry_date which is:

now + token_expires + 1

This fixes it to use the already computed expiry date in token_expires.