sync with upstream

NIHGOV · Jan 18, 2024 · 1d8c66b · 1d8c66b
2 parents e8bb11c + 640542d
commit 1d8c66b
Show file tree

Hide file tree

Showing 306 changed files with 3,191 additions and 1,740 deletions.
diff --git a/.markdownlint-cli2.jsonc → .config/.markdownlint-cli2.jsonc b/.markdownlint-cli2.jsonc → .config/.markdownlint-cli2.jsonc
diff --git a/.cspell.json b/.cspell.json
@@ -33,6 +33,7 @@
     "aadname",
     "aadoid",
     "aadupn",
+    "accesslevel",
     "accountinfo",
     "accountinformation",
     "actionperms",
@@ -61,6 +62,7 @@
     "agreementversion",
     "alladmins",
     "allowunlock",
+    "alreadyrestored",
     "aosp",
     "apikey",
     "APPDIR",
@@ -94,6 +96,7 @@
     "blockui",
     "bootswatch",
     "bootup",
+    "branchname",
     "breakingchangereviewrequired",
     "browserconfig",
     "builddir",
@@ -112,8 +115,8 @@
     "CELA",
     "champscount",
     "champstatus",
-    "chromedriver",
     "checkmarks",
+    "chromedriver",
     "citus",
     "citusdata",
     "classificationdelegated",
@@ -144,6 +147,7 @@
     "codespace",
     "codespaces",
     "collab",
+    "collaboratorid",
     "collabs",
     "columnbreak",
     "commitcomment",
@@ -162,9 +166,9 @@
     "contributionshareoptin",
     "copilotaccess",
     "copilotagreement",
+    "copilotprod",
     "copilotrequest",
     "Copybara",
-    "countuse",
     "corpnet",
     "corporatealias",
     "corporatecount",
@@ -176,6 +180,7 @@
     "corporatename",
     "corporateprod",
     "corporateusername",
+    "countuse",
     "createdat",
     "creategithubaccount",
     "creds",
@@ -213,6 +218,7 @@
     "devstaging",
     "directoryname",
     "directowners",
+    "disablewave",
     "distributeonly",
     "distro",
     "divisionid",
@@ -347,6 +353,8 @@
     "hsts",
     "Hsts",
     "HSTS",
+    "hubber",
+    "hubbers",
     "hubot",
     "IAAD",
     "ictext",
@@ -384,9 +392,9 @@
     "issuecomment",
     "issuesopened",
     "istest",
+    "jabberpl",
     "jeffwilcox",
     "jitgrants",
-    "jabberpl",
     "joblog",
     "jobname",
     "json",
@@ -395,6 +403,7 @@
     "jwilcox",
     "jwks",
     "JWTs",
+    "keybytes",
     "keyout",
     "keyvault",
     "KEYVAULT",
@@ -409,6 +418,7 @@
     "leftouter",
     "legalcontact",
     "legalentities",
+    "libsodium",
     "lightup",
     "linkid",
     "linkmanager",
@@ -506,8 +516,8 @@
     "notifiedissueid",
     "npminitignore",
     "npminstallignore",
-    "npmrc",
     "npmjs",
+    "npmrc",
     "nums",
     "Nunit",
     "octicon",
@@ -674,6 +684,8 @@
     "removeothergithubaccount",
     "REPLYTO",
     "repocount",
+    "repodisablebranchprotections",
+    "repodisableoutsidecollaborators",
     "repoid",
     "repoidifyouhaveit",
     "repolockdown",
@@ -724,6 +736,7 @@
     "scansummary",
     "SCIM",
     "scorecardreprocessrequest",
+    "secretbox",
     "secretless",
     "secretscanningonpush",
     "secscandata",
@@ -774,13 +787,11 @@
     "specialteams",
     "SSIRP",
     "sslify",
-    "Sslify",
     "standardsredirect",
     "stargazerscount",
     "startclean",
-    "StartClean",
+    "startofday",
     "startright",
-    "StartRight",
     "startswith",
     "statechecked",
     "steelblue",
@@ -821,6 +832,7 @@
     "tlink",
     "tolower",
     "Toolset",
+    "toscalar",
     "totalcount",
     "touchedtime",
     "toupper",
@@ -893,9 +905,9 @@
     "welcomeemailsent",
     "whois",
     "Whois",
-    "withsource",
     "withmaintainers",
     "withservicetree",
+    "withsource",
     "wixtoolset",
     "xamarinhq",
     "Xcache",

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -19,15 +19,15 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         # Override language selection by uncommenting this and choosing your languages
         # with:
         #   languages: go, javascript, csharp, python, cpp, java
 
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+        uses: github/codeql-action/autobuild@v3
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -41,4 +41,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -13,7 +13,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@v9
         with:
           stale-issue-message: This issue has been identified as stale because it
             has gone 30 days with no activity.

diff --git a/.gitignore b/.gitignore
@@ -14,3 +14,4 @@ feedscan
 feedscan*
 ..prettierignore.swp
 scripts/localCodespace.ts
+junit.xml
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -18,6 +18,22 @@
         "MORE_DEBUG": "appinsights,cache,restapi,pg,querycache,user,redis-cross-org"
       }
     },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Launch site :4000 as-is",
+      "program": "${workspaceFolder}/dist/bin/www.js",
+      "cwd": "${workspaceFolder}/dist",
+      "preLaunchTask": "tsbuild",
+      "sourceMaps": true,
+      "console": "integratedTerminal",
+      "env": {
+        "NODE_ENV": "development",
+        "PORT": "4000",
+        "DEBUG": "startup,g:server,context,*simple-oauth2*,appinsights,insights,appinsights",
+        "_DEBUG": "cosmosdb,cache"
+      }
+    },
     {
       "type": "node",
       "request": "launch",
@@ -138,6 +154,21 @@
         "EXIT_IMMEDIATELY": "1"
       }
     },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "66: Order 66 Terminations",
+      "program": "${workspaceRoot}/dist/microsoft/jobs/terminations.js",
+      "args": ["all"],
+      "cwd": "${workspaceRoot}/dist",
+      "preLaunchTask": "tsbuild",
+      "sourceMaps": true,
+      "console": "integratedTerminal",
+      "env": {
+        "NODE_ENV": "development",
+        "DEBUG": "startup,appinsights"
+      }
+    },
     {
       "type": "node",
       "request": "launch",
@@ -327,6 +358,20 @@
         "DEBUG": "startup"
       }
     },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Job: Cleanup team requests (18)",
+      "program": "${workspaceRoot}/dist/jobs/cleanupTeamRequests.js",
+      "cwd": "${workspaceRoot}/dist",
+      "preLaunchTask": "tsbuild",
+      "sourceMaps": true,
+      "console": "integratedTerminal",
+      "env": {
+        "NODE_ENV": "development",
+        "DEBUG": "startup"
+      }
+    },
     {
       "type": "node",
       "request": "launch",

diff --git a/Dockerfile b/Dockerfile
@@ -61,4 +61,7 @@ COPY --from=build /build/package.json ./package.json
 # Only if needed, copy our environment
 # COPY --from=build /build/.environment ./.environment
 
+# Only if needed, binary resources
+# COPY --from=build /build/microsoft/assets ./microsoft/assets
+
 ENTRYPOINT ["npm", "run-script", "start-in-container"]
diff --git a/api/client/banner.ts b/api/client/banner.ts
@@ -7,7 +7,7 @@ import { NextFunction, Response, Router } from 'express';
 import { ReposAppRequest } from '../../interfaces';
 
 import { jsonError } from '../../middleware';
-import { getProviders } from '../../transitional';
+import { getProviders } from '../../lib/transitional';
 
 const router: Router = Router();
 

diff --git a/api/client/context/administration/app.ts b/api/client/context/administration/app.ts
@@ -7,12 +7,12 @@ import { NextFunction, Response, Router } from 'express';
 import asyncHandler from 'express-async-handler';
 
 import { ReposAppRequest } from '../../../../interfaces';
-import { CreateError, getProviders } from '../../../../transitional';
+import { CreateError, getProviders } from '../../../../lib/transitional';
 
 import routeIndividualApp from './app';
 import GitHubApplication from '../../../../business/application';
-import { OrganizationSetting } from '../../../../entities/organizationSettings/organizationSetting';
-import { sortByCaseInsensitive } from '../../../../utils';
+import { OrganizationSetting } from '../../../../business/entities/organizationSettings/organizationSetting';
+import { sortByCaseInsensitive } from '../../../../lib/utils';
 import routeApplicationInstallation from './appInstallation';
 import { ApiRequestWithGitHubApplication, RequestWithInstallation } from './types';
 

diff --git a/api/client/context/administration/appInstallation.ts b/api/client/context/administration/appInstallation.ts
@@ -6,8 +6,8 @@
 import { NextFunction, Response, Router } from 'express';
 import asyncHandler from 'express-async-handler';
 
-import { CreateError, getProviders } from '../../../../transitional';
-import { OrganizationSetting } from '../../../../entities/organizationSettings/organizationSetting';
+import { CreateError, getProviders } from '../../../../lib/transitional';
+import { OrganizationSetting } from '../../../../business/entities/organizationSettings/organizationSetting';
 import { AdministrativeGitHubAppInstallationResponse, RequestWithInstallation } from './types';
 
 const router: Router = Router();

diff --git a/api/client/context/administration/apps.ts b/api/client/context/administration/apps.ts
@@ -7,11 +7,11 @@ import { NextFunction, Response, Router } from 'express';
 import asyncHandler from 'express-async-handler';
 
 import { ReposAppRequest } from '../../../../interfaces';
-import { CreateError, getProviders } from '../../../../transitional';
+import { CreateError, getProviders } from '../../../../lib/transitional';
 
 import routeIndividualApp from './app';
 import GitHubApplication from '../../../../business/application';
-import { sortByCaseInsensitive } from '../../../../utils';
+import { sortByCaseInsensitive } from '../../../../lib/utils';
 import {
   ApiRequestWithGitHubApplication,
   ManagedOrganizationAppConfigurationsByOrgView,

diff --git a/api/client/context/administration/index.ts b/api/client/context/administration/index.ts
@@ -10,7 +10,7 @@ import { Organization } from '../../../../business/organization';
 import { ReposAppRequest } from '../../../../interfaces';
 import { getIsCorporateAdministrator, jsonError } from '../../../../middleware';
 import getCompanySpecificDeployment from '../../../../middleware/companySpecificDeployment';
-import { ErrorHelper, getProviders } from '../../../../transitional';
+import { ErrorHelper, getProviders } from '../../../../lib/transitional';
 
 import routeIndividualOrganization from './organization';
 import routeApps from './apps';

diff --git a/api/client/context/administration/organization/settings.ts b/api/client/context/administration/organization/settings.ts
@@ -6,10 +6,10 @@
 import { NextFunction, Response, Router } from 'express';
 import asyncHandler from 'express-async-handler';
 
-import { OrganizationSetting } from '../../../../../entities/organizationSettings/organizationSetting';
+import { OrganizationSetting } from '../../../../../business/entities/organizationSettings/organizationSetting';
 import { ReposAppRequest } from '../../../../../interfaces';
 import { jsonError } from '../../../../../middleware';
-import { CreateError, ErrorHelper, getProviders } from '../../../../../transitional';
+import { CreateError, ErrorHelper, getProviders } from '../../../../../lib/transitional';
 
 const router: Router = Router();
 

diff --git a/api/client/context/administration/types.ts b/api/client/context/administration/types.ts
@@ -4,7 +4,7 @@
 //
 
 import GitHubApplication, { type GitHubAppDefinition } from '../../../../business/application';
-import { OrganizationSetting } from '../../../../entities/organizationSettings/organizationSetting';
+import { OrganizationSetting } from '../../../../business/entities/organizationSettings/organizationSetting';
 import type { IGitHubAppInstallation, ReposAppRequest } from '../../../../interfaces';
 
 export type ApiRequestWithGitHubApplication = ReposAppRequest & {

diff --git a/api/client/context/approvals.ts b/api/client/context/approvals.ts
@@ -7,7 +7,7 @@ import { NextFunction, Response, Router } from 'express';
 import asyncHandler from 'express-async-handler';
 
 import { Team, Organization } from '../../../business';
-import { TeamJoinApprovalEntity } from '../../../entities/teamJoinApproval/teamJoinApproval';
+import { TeamJoinApprovalEntity } from '../../../business/entities/teamJoinApproval/teamJoinApproval';
 import { TeamJsonFormat, ReposAppRequest } from '../../../interfaces';
 import { jsonError } from '../../../middleware';
 import {
@@ -16,7 +16,7 @@ import {
   Approvals_getUserRequests,
   closeOldRequest,
 } from '../../../routes/settings/approvals';
-import { getProviders } from '../../../transitional';
+import { getProviders } from '../../../lib/transitional';
 import { IndividualContext } from '../../../business/user';
 
 const router: Router = Router();

diff --git a/api/client/context/index.ts b/api/client/context/index.ts
@@ -11,7 +11,7 @@ import { IProviders, ReposAppRequest } from '../../../interfaces';
 
 import { jsonError } from '../../../middleware';
 import getCompanySpecificDeployment from '../../../middleware/companySpecificDeployment';
-import { ErrorHelper, getProviders } from '../../../transitional';
+import { ErrorHelper, getProviders } from '../../../lib/transitional';
 import { IndividualContext } from '../../../business/user';
 
 import routeApprovals from './approvals';

diff --git a/api/client/context/organization/index.ts b/api/client/context/organization/index.ts
@@ -19,7 +19,7 @@ import { IndividualContext } from '../../../../business/user';
 
 import routeRepos from './repos';
 import routeTeams from './teams';
-import { CreateError } from '../../../../transitional';
+import { CreateError } from '../../../../lib/transitional';
 
 const router: Router = Router();