Upgrading dependencies (dependabot)

.github/workflows/alpha.yml

@@ -2,7 +2,7 @@ name: 'Alpha Build'
 
 on:
   push:
-    branches: [v4180/merge]
+    branches: [v4180/deps2]
 
 jobs:
   build:

backend/package.json

@@ -19,6 +19,7 @@
     "copy-templates": "copyfiles -u 0 src/**/*.html dist/"
   },
   "dependencies": {
+    "@passport-js/passport-twitter": "1.0.7",
     "@sendgrid/mail": "7.7.0",
     "@sentry/node": "7.22.0",
     "@types/bcryptjs": "2.4.2",
@@ -73,8 +74,7 @@
     "passport-local": "1.0.0",
     "passport-microsoft": "1.0.0",
     "passport-okta-oauth20": "1.1.0",
-    "passport-slack-oauth2": "^1.1.1",
-    "passport-twitter": "1.0.4",
+    "passport-slack-oauth2": "1.1.1",
     "pg": "8.8.0",
     "prettier": "2.8.0",
     "rate-limiter-flexible": "2.4.1",

backend/src/auth/config.ts

@@ -1,4 +1,4 @@
-import { IStrategyOption } from 'passport-twitter';
+import { IStrategyOption } from '@passport-js/passport-twitter';
 import { StrategyOptions as GoogleStrategyOptions } from 'passport-google-oauth20';
 import { StrategyOptions as GitHubStrategy } from 'passport-github2';
 import { MicrosoftStrategyOptions } from 'passport-microsoft';

backend/src/auth/passport.ts

@@ -1,6 +1,6 @@
 import passport from 'passport';
 import { Strategy as LocalStrategy, IVerifyOptions } from 'passport-local';
-import { Strategy as TwitterStrategy } from 'passport-twitter';
+import { Strategy as TwitterStrategy } from '@passport-js/passport-twitter';
 import { Strategy as GoogleStrategy } from 'passport-google-oauth20';
 import { Strategy as GithubStrategy } from 'passport-github2';
 import { Strategy as SlackStrategy } from 'passport-slack-oauth2';

backend/src/typings/typings.d.ts

@@ -17,3 +17,60 @@ declare namespace Express {
 
 declare module 'freemail';
 declare module 'passport-slack-oauth2';
+declare module '@passport-js/passport-twitter' {
+  interface IStrategyOptionBase {
+    consumerKey: string;
+    consumerSecret: string;
+    callbackURL: string;
+
+    includeEmail?: boolean | undefined;
+    includeStatus?: boolean | undefined;
+    includeEntities?: boolean | undefined;
+
+    requestTokenURL?: string | undefined;
+    accessTokenURL?: string | undefined;
+    userAuthorizationURL?: string | undefined;
+    sessionKey?: string | undefined;
+
+    forceLogin?: boolean | undefined;
+    screenName?: string | undefined;
+
+    userProfileURL?: string | undefined;
+    skipExtendedUserProfile?: boolean | undefined;
+  }
+
+  interface IStrategyOption extends IStrategyOptionBase {
+    passReqToCallback?: false | undefined;
+  }
+
+  interface IStrategyOptionWithRequest extends IStrategyOptionBase {
+    passReqToCallback: true;
+  }
+
+  declare class Strategy extends passport.Strategy {
+    constructor(
+      options: IStrategyOption,
+      verify: (
+        accessToken: string,
+        refreshToken: string,
+        profile: Profile,
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        done: (error: any, user?: any) => void
+      ) => void
+    );
+    constructor(
+      options: IStrategyOptionWithRequest,
+      verify: (
+        req: express.Request,
+        accessToken: string,
+        refreshToken: string,
+        profile: Profile,
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        done: (error: any, user?: any) => void
+      ) => void
+    );
+
+    name: string;
+    authenticate(req: express.Request, options?: unknown): void;
+  }
+}

backend/yarn.lock

@@ -646,6 +646,21 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
+"@passport-js/[email protected]":
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/@passport-js/passport-twitter/-/passport-twitter-1.0.7.tgz#c07ac04c849145b64786cb8060fd664103ba9945"
+  integrity sha512-BeESbSjAxd484+YtBJO7sKxdid7ZYedOjzlybYoshqCVfM0O+vKi9/+J8UBIpvfBj840a9fS3nH4ugoCJTbPRA==
+  dependencies:
+    "@passport-js/xtraverse" "^0.1.2"
+    passport-oauth1 "1.x.x"
+
+"@passport-js/xtraverse@^0.1.2":
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/@passport-js/xtraverse/-/xtraverse-0.1.2.tgz#0e67cee27bc1ac13c642d50c14658e3056835587"
+  integrity sha512-eoRvGo9Er7gLMUA6ayriky0fkFnaFArvJOY+ozQsaP8yu+TKg77BX8EBDDL7eAkLR4XxiRKrAiq+kWiJIOa8rA==
+  dependencies:
+    xmldom "0.6.x"
+
 "@sendgrid/client@^7.7.0":
   version "7.7.0"
   resolved "https://registry.yarnpkg.com/@sendgrid/client/-/client-7.7.0.tgz#f8f67abd604205a0d0b1af091b61517ef465fdbf"
@@ -3599,7 +3614,7 @@ [email protected]:
     node-fetch "^2.6.1"
     passport-oauth2 "^1.6.1"
 
-passport-slack-oauth2@^1.1.1:
+[email protected]:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/passport-slack-oauth2/-/passport-slack-oauth2-1.1.1.tgz#d831ffc3f1e968fcc3622e6ecf41643c8d8f9cbc"
   integrity sha512-xC+yMKFXximP5TzSNt4lr9TP78MMos5B+acC7bJNCxBAVNyL9e02AEpVpVtyMIqHv4nNZnv1vyoOb50J8VCcZQ==
@@ -3612,14 +3627,6 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/passport-strategy/-/passport-strategy-1.0.0.tgz#b5539aa8fc225a3d1ad179476ddf236b440f52e4"
   integrity sha512-CB97UUvDKJde2V0KDWWB3lyf6PC3FaZP7YxZ2G8OAtn9p4HI9j9JLP9qjOGZFvyl8uwNT8qM+hGnz/n16NI7oA==
 
-[email protected]:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/passport-twitter/-/passport-twitter-1.0.4.tgz#01a799e1f760bf2de49f2ba5fba32282f18932d7"
-  integrity sha512-qvdauqCqCJJci82mJ9hZZQ6nAv7aSHV31svL8+9H7mRlDdXCdfU6AARQrmmJu3DRmv9fvIebM7zzxR7mVufN3A==
-  dependencies:
-    passport-oauth1 "1.x.x"
-    xtraverse "0.1.x"
-
 [email protected]:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/passport/-/passport-0.5.0.tgz#7914aaa55844f9dce8c3aa28f7d6b73647ee0169"
@@ -4651,23 +4658,16 @@ xmlbuilder@~11.0.0:
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
   integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
 
-xmldom@0.1.x:
-  version "0.1.31"
-  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.31.tgz#b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff"
-  integrity sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==
+xmldom@0.6.x:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.6.0.tgz#43a96ecb8beece991cef382c08397d82d4d0c46f"
+  integrity sha512-iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg==
 
 xtend@^4.0.0, xtend@~4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
-[email protected]:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/xtraverse/-/xtraverse-0.1.0.tgz#b741bad018ef78d8a9d2e83ade007b3f7959c732"
-  integrity sha512-MANQdlG2hl1nQobxz1Rv8hsS1RuBS0C1N6qTOupv+9vmfrReePdxhmB2ecYjvsp4stJ80HD7erjkoF1Hd/FK9A==
-  dependencies:
-    xmldom "0.1.x"
-
 y18n@^5.0.5:
   version "5.0.8"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"

docs/yarn.lock

@@ -3778,9 +3778,9 @@ debug@^4.1.0, debug@^4.1.1:
     ms "2.1.2"
 
 decode-uri-component@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
-  integrity sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
+  integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
 
 decompress-response@^3.3.0:
   version "3.3.0"
@@ -5337,9 +5337,9 @@ loader-runner@^4.2.0:
   integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==
 
 loader-utils@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129"
-  integrity sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c"
+  integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==
   dependencies:
     big.js "^5.2.2"
     emojis-list "^3.0.0"

frontend/yarn.lock

@@ -4186,9 +4186,9 @@ decode-named-character-reference@^1.0.0:
     character-entities "^2.0.0"
 
 decode-uri-component@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
-  integrity sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
+  integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
 
 dedent@^0.7.0:
   version "0.7.0"
@@ -6927,9 +6927,9 @@ loader-runner@^4.2.0:
   integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==
 
 loader-utils@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129"
-  integrity sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c"
+  integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==
   dependencies:
     big.js "^5.2.2"
     emojis-list "^3.0.0"