Moving files

.cspell.json

@@ -58,6 +58,7 @@
     "agreementversion",
     "alladmins",
     "allowunlock",
+    "alreadyrestored",
     "aosp",
     "apikey",
     "APPDIR",
@@ -90,6 +91,7 @@
     "blockui",
     "bootswatch",
     "bootup",
+    "branchname",
     "breakingchangereviewrequired",
     "browserconfig",
     "builddir",
@@ -106,8 +108,8 @@
     "CELA",
     "champscount",
     "champstatus",
-    "chromedriver",
     "checkmarks",
+    "chromedriver",
     "citus",
     "citusdata",
     "classificationdelegated",
@@ -159,7 +161,6 @@
     "copilotprod",
     "copilotrequest",
     "Copybara",
-    "countuse",
     "corpnet",
     "corporatealias",
     "corporatecount",
@@ -171,6 +172,7 @@
     "corporatename",
     "corporateprod",
     "corporateusername",
+    "countuse",
     "createdat",
     "creategithubaccount",
     "creds",
@@ -208,6 +210,7 @@
     "devstaging",
     "directoryname",
     "directowners",
+    "disablewave",
     "distributeonly",
     "distro",
     "divisionid",
@@ -378,9 +381,9 @@
     "issuecomment",
     "issuesopened",
     "istest",
+    "jabberpl",
     "jeffwilcox",
     "jitgrants",
-    "jabberpl",
     "joblog",
     "jobname",
     "json",
@@ -500,8 +503,8 @@
     "notifiedissueid",
     "npminitignore",
     "npminstallignore",
-    "npmrc",
     "npmjs",
+    "npmrc",
     "nums",
     "Nunit",
     "octicon",
@@ -667,6 +670,7 @@
     "repoid",
     "repoidifyouhaveit",
     "repolockdown",
+    "repolockdownbranchprotections",
     "repolockdownmember",
     "repolockdownmembers",
     "repolockdownteam",
@@ -879,9 +883,9 @@
     "welcomeemailsent",
     "whois",
     "Whois",
-    "withsource",
     "withmaintainers",
     "withservicetree",
+    "withsource",
     "wixtoolset",
     "xamarinhq",
     "Xcache",

.gitignore

@@ -14,3 +14,4 @@ feedscan
 feedscan*
 ..prettierignore.swp
 scripts/localCodespace.ts
+junit.xml

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();
 

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';
 

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();

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,

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';

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();
 

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 & {

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();

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';

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();
 

api/client/context/organization/repoForkUnlock.ts

@@ -11,8 +11,8 @@ import { getRepositoryMetadataProvider, ReposAppRequest } from '../../../../inte
 import { Organization } from '../../../../business';
 import { getContextualRepository } from '../../../../middleware/github/repoPermissions';
 import { IndividualContext } from '../../../../business/user';
-import { ErrorHelper, getProviders } from '../../../../transitional';
-import NewRepositoryLockdownSystem from '../../../../features/newRepositories/newRepositoryLockdown';
+import { ErrorHelper, getProviders } from '../../../../lib/transitional';
+import NewRepositoryLockdownSystem from '../../../../business/features/newRepositories/newRepositoryLockdown';
 
 const router: Router = Router();
 

api/client/context/organization/team.ts

@@ -6,7 +6,7 @@
 import { NextFunction, Response, Router } from 'express';
 import asyncHandler from 'express-async-handler';
 
-import { TeamJoinApprovalEntity } from '../../../../entities/teamJoinApproval/teamJoinApproval';
+import { TeamJoinApprovalEntity } from '../../../../business/entities/teamJoinApproval/teamJoinApproval';
 import {
   ReposAppRequest,
   OrganizationMembershipState,
@@ -24,7 +24,7 @@ import {
 import { submitTeamJoinRequest } from '../../../../routes/org/team';
 import { postActionDecision, TeamApprovalDecision } from '../../../../routes/org/team/approval';
 import { PermissionWorkflowEngine } from '../../../../routes/org/team/approvals';
-import { CreateError, getProviders } from '../../../../transitional';
+import { CreateError, getProviders } from '../../../../lib/transitional';
 import { IndividualContext } from '../../../../business/user';
 import getCompanySpecificDeployment from '../../../../middleware/companySpecificDeployment';
 

api/client/context/sample.ts

@@ -9,7 +9,7 @@ import asyncHandler from 'express-async-handler';
 import { sendLinkedAccountMail } from '../../../business/operations/link';
 import { ReposAppRequest } from '../../../interfaces';
 import { jsonError } from '../../../middleware';
-import { CreateError, getProviders } from '../../../transitional';
+import { CreateError, getProviders } from '../../../lib/transitional';
 import { IndividualContext } from '../../../business/user';
 
 const router: Router = Router();

api/client/context/settings.ts

@@ -7,7 +7,7 @@ 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 { getUserSettings } from '../../../middleware/business/userSettings';
 
 import type { ReposAppRequestWithUserSettings } from '../../../interfaces/middleware';

api/client/index.ts

@@ -14,7 +14,7 @@ import {
   jsonError,
   requireAuthenticatedUserOrSignIn,
 } from '../../middleware';
-import { getProviders } from '../../transitional';
+import { getProviders } from '../../lib/transitional';
 
 import getCompanySpecificDeployment from '../../middleware/companySpecificDeployment';
 

api/client/linking.ts

@@ -8,7 +8,7 @@ import asyncHandler from 'express-async-handler';
 
 import { IndividualContext } from '../../business/user';
 import { jsonError } from '../../middleware';
-import { ErrorHelper, getProviders } from '../../transitional';
+import { ErrorHelper, getProviders } from '../../lib/transitional';
 import { unlinkInteractive } from '../../routes/unlink';
 import { interactiveLinkUser } from '../../routes/link';
 import { ReposAppRequest } from '../../interfaces';

api/client/newOrgRepo.ts

@@ -9,7 +9,7 @@ import { NextFunction, Response, Router } from 'express';
 import asyncHandler from 'express-async-handler';
 const router: Router = Router();
 
-import { getProviders } from '../../transitional';
+import { getProviders } from '../../lib/transitional';
 import { jsonError } from '../../middleware/jsonError';
 import { IndividualContext } from '../../business/user';
 import { Organization } from '../../business/organization';

api/client/newRepo.ts

@@ -6,7 +6,7 @@
 import { NextFunction, Response, Router } from 'express';
 const router: Router = Router();
 
-import { getProviders } from '../../transitional';
+import { getProviders } from '../../lib/transitional';
 import { jsonError } from '../../middleware/jsonError';
 
 import newOrgRepo from './newOrgRepo';

api/client/news.ts

@@ -7,7 +7,7 @@ import { NextFunction, Response, Router } from 'express';
 import asyncHandler from 'express-async-handler';
 
 import { jsonError } from '../../middleware';
-import { getProviders } from '../../transitional';
+import { getProviders } from '../../lib/transitional';
 import { ReposAppRequest } from '../../interfaces';
 
 const router: Router = Router();

api/client/organization/annotations.ts

@@ -20,8 +20,8 @@ import {
   IOrganizationAnnotationChange,
   OrganizationAnnotation,
   getOrganizationAnnotationRestrictedPropertyNames,
-} from '../../../entities/organizationAnnotation';
-import { CreateError, ErrorHelper, getProviders } from '../../../transitional';
+} from '../../../business/entities/organizationAnnotation';
+import { CreateError, ErrorHelper, getProviders } from '../../../lib/transitional';
 import { IndividualContext } from '../../../business/user';
 import { IProviders } from '../../../interfaces';
 import { ensureOrganizationProfileMiddleware } from '../../../middleware/github/ensureOrganizationProfile';

api/client/organization/index.ts

@@ -9,7 +9,7 @@ import asyncHandler from 'express-async-handler';
 import { ReposAppRequest } from '../../../interfaces';
 import { jsonError } from '../../../middleware';
 import getCompanySpecificDeployment from '../../../middleware/companySpecificDeployment';
-import { getProviders } from '../../../transitional';
+import { getProviders } from '../../../lib/transitional';
 import {
   blockIfUnmanagedOrganization,
   IReposAppRequestWithOrganizationManagementType,

api/client/organization/people.ts

@@ -7,7 +7,7 @@ import { NextFunction, Response, Router } from 'express';
 import asyncHandler from 'express-async-handler';
 
 import { jsonError } from '../../../middleware';
-import { getProviders } from '../../../transitional';
+import { getProviders } from '../../../lib/transitional';
 import LeakyLocalCache, { getLinksLightCache } from '../leakyLocalCache';
 import JsonPager from '../jsonPager';
 import {

api/client/organization/repo.ts

@@ -7,9 +7,9 @@ import { NextFunction, Response, Router } from 'express';
 import asyncHandler from 'express-async-handler';
 
 import { jsonError } from '../../../middleware';
-import { CreateError, ErrorHelper, getProviders } from '../../../transitional';
+import { CreateError, ErrorHelper, getProviders } from '../../../lib/transitional';
 import { IndividualContext } from '../../../business/user';
-import NewRepositoryLockdownSystem from '../../../features/newRepositories/newRepositoryLockdown';
+import NewRepositoryLockdownSystem from '../../../business/features/newRepositories/newRepositoryLockdown';
 import {
   AddRepositoryPermissionsToRequest,
   getContextualRepositoryPermissions,

api/client/organization/repos.ts

@@ -7,12 +7,12 @@ import { NextFunction, Response, Router } from 'express';
 import asyncHandler from 'express-async-handler';
 
 import { jsonError } from '../../../middleware';
-import { CreateError, getProviders } from '../../../transitional';
+import { CreateError, getProviders } from '../../../lib/transitional';
 import { Repository } from '../../../business';
 
 import JsonPager from '../jsonPager';
 import { ReposAppRequest, IProviders } from '../../../interfaces';
-import { sortRepositoriesByNameCaseInsensitive } from '../../../utils';
+import { sortRepositoriesByNameCaseInsensitive } from '../../../lib/utils';
 import { apiMiddlewareRepositoriesToRepository } from '../../../middleware/business/repository';
 
 import routeRepo from './repo';

api/client/organization/team.ts

@@ -9,13 +9,13 @@ import asyncHandler from 'express-async-handler';
 import { getContextualTeam } from '../../../middleware/github/teamPermissions';
 
 import { jsonError } from '../../../middleware';
-import { getProviders } from '../../../transitional';
+import { getProviders } from '../../../lib/transitional';
 import JsonPager from '../jsonPager';
 import { getLinksLightCache } from '../leakyLocalCache';
 import { equivalentLegacyPeopleSearch } from './people';
 import { TeamRepositoryPermission, OrganizationMember, corporateLinkToJson } from '../../../business';
 import { ReposAppRequest, TeamJsonFormat, NoCacheNoBackground, ICorporateLink } from '../../../interfaces';
-import { sortRepositoriesByNameCaseInsensitive } from '../../../utils';
+import { sortRepositoriesByNameCaseInsensitive } from '../../../lib/utils';
 import getCompanySpecificDeployment from '../../../middleware/companySpecificDeployment';
 
 const router: Router = Router();

api/client/organizations.ts

@@ -8,7 +8,7 @@ import asyncHandler from 'express-async-handler';
 import throat from 'throat';
 
 import { getIsCorporateAdministrator, jsonError } from '../../middleware';
-import { CreateError, getProviders } from '../../transitional';
+import { CreateError, getProviders } from '../../lib/transitional';
 import { ReposAppRequest } from '../../interfaces';
 
 import RouteOrganization from './organization';
@@ -18,7 +18,7 @@ import {
   OrganizationAnnotation,
   OrganizationAnnotationProperty,
   getOrganizationAnnotationRestrictedPropertyNames,
-} from '../../entities/organizationAnnotation';
+} from '../../business/entities/organizationAnnotation';
 import { getOrganizationProfileViaMemoryCache } from '../../middleware/github/ensureOrganizationProfile';
 
 const router: Router = Router();