Merge pull request #332 from osu-wams/DD-1517-security-updates

DD-1517 security updates

src/api/announcements.ts

@@ -1,8 +1,8 @@
 /**
  * /api/announcements
  */
-import { Router, Request, Response } from 'express'; // eslint-disable-line no-unused-vars
 import { isNullOrUndefined } from 'util';
+import { Router, Request, Response } from 'express'; // eslint-disable-line no-unused-vars
 import logger from '../logger';
 import { getAnnouncements } from './modules/dx';
 import { asyncTimedFunction } from '../tracer';

src/api/modules/__tests__/canvas.test.ts

@@ -1,7 +1,7 @@
 /* eslint-disable no-unused-vars */
 
-import { rest } from 'msw';
 import querystring from 'querystring';
+import { rest } from 'msw';
 import { server } from '@src/mocks/server';
 import { getPlannerItems, refreshOAuthToken, postRequest, CANVAS_OAUTH_TOKEN_URL } from '../canvas';
 

src/api/modules/cache.ts

@@ -1,7 +1,7 @@
+import { promisify } from 'util';
 import request from 'node-fetch';
 import redis from 'redis';
 import config from 'config';
-import { promisify } from 'util';
 import logger from '../../logger';
 
 const DEFAULT_DB: number = 1;

src/api/modules/canvas.ts

@@ -1,6 +1,6 @@
+import querystring from 'querystring';
 import request from 'node-fetch';
 import config from 'config';
-import querystring from 'querystring';
 import { format } from 'date-fns';
 import { utcToZonedTime } from 'date-fns-tz';
 import { Types } from '@osu-wams/lib'; // eslint-disable-line no-unused-vars

src/logger.ts

@@ -1,7 +1,7 @@
-import winston, { createLogger, format, transports, config as winstonConfig } from 'winston'; // eslint-disable-line no-unused-vars
-import expressWinston, { LoggerOptionsWithTransports } from 'express-winston'; // eslint-disable-line no-unused-vars
 import path from 'path';
 import fs from 'fs';
+import winston, { createLogger, format, transports, config as winstonConfig } from 'winston'; // eslint-disable-line no-unused-vars
+import expressWinston, { LoggerOptionsWithTransports } from 'express-winston'; // eslint-disable-line no-unused-vars
 import config from 'config';
 import { Format } from 'logform'; // eslint-disable-line no-unused-vars
 import { Request, Response, NextFunction } from 'express'; // eslint-disable-line no-unused-vars

src/utils/auth.ts

@@ -1,5 +1,5 @@
-import { Request, Response, NextFunction } from 'express'; // eslint-disable-line no-unused-vars
 import crypto from 'crypto';
+import { Request, Response, NextFunction } from 'express'; // eslint-disable-line no-unused-vars
 import jwt from 'jsonwebtoken';
 import { User as UserLib } from '@osu-wams/lib';
 import { ENV, GROUPS, IV_LENGTH } from '../constants';

src/utils/jestSetup.ts

@@ -1,4 +1,5 @@
 import { beforeEach, beforeAll, afterEach, afterAll, jest } from '@jest/globals'; // eslint-disable-line
+import redis from 'redis';
 import { server } from '@src/mocks/server';
 import { dynamoDbHandler } from '@src/mocks/handlers';
 import TrendingResource from '@src/api/models/trendingResource';
@@ -7,7 +8,6 @@ import User from '@src/api/models/user';
 import { fromDynamoDb } from '@src/mocks/google/trendingResources';
 import { mockDynamoDbUser } from '@src/api/models/__mocks__/user';
 import { mockDynamoDbFavoriteResource } from '@src/api/models/__mocks__/favoriteResource';
-import redis from 'redis';
 
 jest.mock('redis', () => jest.requireActual('redis-mock'));