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

Revert "Refresh auth token" #77

Merged
merged 1 commit into from
Mar 19, 2024
Merged

Revert "Refresh auth token" #77

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
27 changes: 1 addition & 26 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,19 +65,6 @@ async function getAccessToken(code, verifier, callbackUrl) {
})
}

async function refreshAccessToken(refreshToken) {
const params = new URLSearchParams()
params.append('client_id', process.env.OAUTH_CLIENT_ID)
params.append('grant_type', 'refresh_token')
params.append('refresh_token')

return await apiRequest(process.env.OAUTH_TOKEN_URI, {
method: 'POST',
headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
body: params,
})
}

async function getUserInfo(accessToken) {
return await apiRequest(process.env.OAUTH_USERINFO_URI, {
method: 'GET',
Expand Down Expand Up @@ -111,24 +98,12 @@ async function getSubscriberToken(reference, password) {
)
}

function updateSessionToken(session, tokenData) {
const tokenExpires = Math.floor(Date.now() / 1000 + (tokenData.expires_in || 0))
session.token = tokenData.access_token
session.refreshToken = tokenData.refresh_token
session.tokenExpires = tokenExpires
}

app.get('/', async (req, res) => {
let token
let user
if (req.session && req.session.token) {
token = req.session.token
user = req.session.user

if (Date.now() < req.session.tokenExpires * 1000) {
const tokenData = await refreshAccessToken(req.session.refreshToken)
updateSessionToken(req.session, tokenData)
}
}

res.render('index', {
Expand Down Expand Up @@ -187,7 +162,7 @@ app.get('/callback', async (req, res) => {
try {
const tokenData = await getAccessToken(req.query.code, req.session.verifier, callbackUrl)
const token = tokenData.access_token
updateSessionToken(req.session, tokenData)
req.session.token = token

const userInfo = await getUserInfo(token)
req.session.user = userInfo
Expand Down