From 2c8a090c8f767a14e14cff84a671cb5c2408fb17 Mon Sep 17 00:00:00 2001 From: Artem Bulgakov Date: Fri, 21 Jun 2024 22:52:47 +0300 Subject: [PATCH] chore: do not spawn errors on extensions page --- src/features/autologin/background.ts | 6 +++--- src/features/courses/background.ts | 15 ++++++++++----- src/shared/moodle-ws-api/token-for-session.ts | 14 ++++++++++++-- 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/src/features/autologin/background.ts b/src/features/autologin/background.ts index 1587c37..1acd1a9 100644 --- a/src/features/autologin/background.ts +++ b/src/features/autologin/background.ts @@ -6,13 +6,13 @@ export async function autoLogIn() { console.debug('Auto logging in...') const privateToken = await getStored('privateToken') if (!privateToken) { - console.error('No private token found') + console.log('Warning: No private token found') return false } const userId = await getStored('userId') if (!userId) { - console.error('No user ID found') + console.log('Warning: No user ID found') return false } @@ -30,7 +30,7 @@ export async function autoLogIn() { return true } catch (e) { - console.error('Auto login failed', e) + console.log('Warning: Auto login failed', e) return false } } diff --git a/src/features/courses/background.ts b/src/features/courses/background.ts index a6f61fe..c905646 100644 --- a/src/features/courses/background.ts +++ b/src/features/courses/background.ts @@ -10,9 +10,14 @@ export async function fetchCourses(force: boolean = false) { } console.log('Fetching courses') - const { courses } = await moodle.core.course.getEnrolledCoursesByTimelineClassification({ - classification: 'inprogress', - }) - await setStored('courses', courses) - await setStored('coursesLastUpdateMS', Date.now()) + try { + const { courses } = await moodle.core.course.getEnrolledCoursesByTimelineClassification({ + classification: 'inprogress', + }) + await setStored('courses', courses) + await setStored('coursesLastUpdateMS', Date.now()) + } + catch (e) { + console.log('Error: Couldn\'t fetch courses') + } } diff --git a/src/shared/moodle-ws-api/token-for-session.ts b/src/shared/moodle-ws-api/token-for-session.ts index e579ddc..0619c59 100644 --- a/src/shared/moodle-ws-api/token-for-session.ts +++ b/src/shared/moodle-ws-api/token-for-session.ts @@ -38,12 +38,22 @@ export async function obtainMobileToken(options: { useSSO?: boolean } = { useSSO const plainToken = atob(encodedToken) const [_, token, privateToken] = plainToken.split(':::') as [string, string, string | undefined] + if (token === undefined) { + console.log('Warning: Couldn\'t get mobile_app token') + } + else if (privateToken === undefined) { + console.log('Warning: Got token, but no privateToken') + } + else { + console.log('Got token and privateToken') + } + return { token, privateToken } } catch (e) { - console.error('Couldn\'t get mobile_app token') + console.log('Warning: Couldn\'t get mobile_app token') if (options.useSSO) { - console.error('Trying without SSO...') + console.log('Warning: Trying without SSO...') return await obtainMobileToken({ useSSO: false }) } }