Revert "Revert "Allows an expiration date without using a refresh token""

This reverts commit 3af986de4eb59feb0ce86e8e9c608cb5f81adb3a.
Revert "Revert "Revert "Allows an expiration date without using a refresh token"""

This reverts commit a05440a0421888cbfac1d88c6a4a9d9461fd6621.
Revert "Revert "Allows an expiration date without using a refresh token""

This reverts commit 3af986de4eb59feb0ce86e8e9c608cb5f81adb3a.
Revert "Allows an expiration date without using a refresh token"

This reverts commit 2c39adb038d4f6592a9f5249ebf0aad035dab176.