Skip to content

Commit a79297b

Browse files
committed
chore: Minor touchups
1 parent b96e5fd commit a79297b

2 files changed

Lines changed: 12 additions & 4 deletions

File tree

src/api/middleware/userSessionMiddleware.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ import { getUserData } from '../services/authentication/authentication';
1313
* @returns 403 if session not found, else proceed
1414
*/
1515
const checkUserSession = (req: Request, res: Response, next: NextFunction) => {
16-
Logger.debug(`checkUserSession: sessionID: ${req.sessionID}, sessionUserID: ${req.session?.userId}, sessionProvider: ${req.session?.provider}`);
16+
Logger.debug(
17+
`checkUserSession: sessionID: ${req.sessionID}, sessionUserID: ${req.session?.userId}, sessionProvider: ${req.session?.provider}`
18+
);
1719
getUserData(req.sessionID, req.session.userId || null, req.session.provider as string)
1820
.then((userData) => {
1921
if (!userData) {

src/api/services/authentication/authentication.ts

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,9 @@ const getUserData = async (sessionId: string, userId: string | null, provider: s
7777
const encryptedToken = await redisEphemeralClient.get(`${process.env.USER_TOKEN_PREFIX as string}:${sessionId}`);
7878
Logger.debug(`getUserData: sessionID: ${sessionId}, encryptedToken found: ${!!encryptedToken}`);
7979
const accessToken = encryptedToken ? decrypt(encryptedToken) : null;
80-
Logger.debug(`getUserData: sessionID: ${sessionId}, attempting to call getUserProviderDataFromProvider. AccessToken is null: ${!accessToken}`);
80+
Logger.debug(
81+
`getUserData: sessionID: ${sessionId}, attempting to call getUserProviderDataFromProvider. AccessToken is null: ${!accessToken}`
82+
);
8183
const userProviderData = await getUserProviderDataFromProvider(sessionId, userId, accessToken, provider);
8284
if (userProviderData) {
8385
// get user data, will create user if user does not exist
@@ -218,7 +220,9 @@ const getUserProviderDataFromProvider = async (
218220
provider: string
219221
) => {
220222
if (!accessToken) {
221-
Logger.debug(`getUserProviderDataFromProvider: sessionID: ${sessionId}, accessToken is null, attempting to call refreshProviderTokens.`);
223+
Logger.debug(
224+
`getUserProviderDataFromProvider: sessionID: ${sessionId}, accessToken is null, attempting to call refreshProviderTokens.`
225+
);
222226
const tokenResponse = await refreshProviderTokens(sessionId, userId, provider);
223227
accessToken = tokenResponse ? tokenResponse.accessToken : null;
224228
}
@@ -285,7 +289,9 @@ const refreshProviderTokens = async (sessionId: string, userId: string | null, p
285289
// save user tokens if response is valid
286290
if (tokenResponse) {
287291
const successfullySavedTokens = await saveUserTokens(sessionId, userId, tokenResponse);
288-
Logger.debug(`refreshProviderTokens: sessionID: ${sessionId}, successfullySavedTokens: ${successfullySavedTokens}`);
292+
Logger.debug(
293+
`refreshProviderTokens: sessionID: ${sessionId}, successfullySavedTokens: ${successfullySavedTokens}`
294+
);
289295
if (successfullySavedTokens) {
290296
return tokenResponse;
291297
}

0 commit comments

Comments
 (0)