Skip to content

Commit 69f2997

Browse files
committed
Super verbose for early release debugging
1 parent a5bc769 commit 69f2997

File tree

1 file changed

+11
-22
lines changed

1 file changed

+11
-22
lines changed

src/auth.ts

+11-22
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ interface StoredElawayToken {
3737
}
3838

3939
async function getAuthorizationCode(page: Page): Promise<string | null> {
40+
console.info("Waiting for authorization code from redirect.");
4041
return new Promise((resolve, reject) => {
4142
page.on('response', async (response) => {
4243
try {
@@ -54,13 +55,15 @@ async function getAuthorizationCode(page: Page): Promise<string | null> {
5455
}
5556
}
5657
} catch (error) {
58+
console.error("Error in getAuthorizationCode:", error.message);
5759
reject(error);
5860
}
5961
});
6062
});
6163
}
6264

6365
async function exchangeCodeForIdAndAuthToken(code: string): Promise<IdTokenResponse> {
66+
console.info("Exchanging authorization code for access token and ID token.");
6467
const response = await axios.post(elawayTokenUrl, {
6568
grant_type: "authorization_code",
6669
client_id: config.clientId,
@@ -164,6 +167,8 @@ async function startOauth(): Promise<ElawayTokenResponse> {
164167
let accessIdResponse: null | IdTokenResponse = null;
165168
const authUrl = `${elawayAuthorizationUrl}?response_type=code&client_id=${encodeURIComponent(config.clientId)}&redirect_uri=${encodeURIComponent(redirectUri)}&scope=${encodeURIComponent(oauthScope)}&state=${encodeURIComponent(state)}`;
166169

170+
console.info("No valid bearer token found. Starting OAuth flow.");
171+
167172
const browser = await puppeteer.launch({ headless: true, args: ['--no-sandbox'] });
168173
const page = await browser.newPage();
169174

@@ -211,31 +216,15 @@ async function getValidCredentials(): Promise<StoredElawayToken> {
211216

212217
const validBearerToken = storedToken && storedToken.expires_at > Date.now();
213218

214-
// Sjekk om token går ut om mindre enn 5 minutter
215-
// Forleng tokenet
216-
217-
// const refreshedToken = await refreshAccessToken(storedToken.refresh_token);
218-
219-
220-
// if (storedToken && storedToken.expires_at - Date.now() < 5 * 60 * 1000) {
221-
// const refreshedToken = await refreshAccessToken(storedToken.refresh_token);
222-
// if (refreshedToken) {
223-
// saveTokens(refreshedToken);
224-
// }
225-
// }
219+
// TODO: Implement refresh token
226220

227-
if (validBearerToken) {
228-
console.info("Existing bearer token found and is valid.");
229-
return storedToken;
221+
if (!validBearerToken) {
222+
const newToken = await startOauth();
223+
return saveTokens(newToken);
230224
}
231225

232-
console.info("No valid bearer token found. Starting OAuth flow.");
233-
const newToken = await startOauth();
234-
235-
if (!newToken) {
236-
throw new Error("Could not get valid credentials");
237-
}
238-
return saveTokens(newToken);
226+
console.info("Using existing bearer token");
227+
return storedToken
239228
}
240229

241230
export { getValidCredentials };

0 commit comments

Comments
 (0)