Syncing updates

Author: jeffwilcox

.eslintrc.js

@@ -41,5 +41,10 @@ module.exports = {
       },
     },
   ],
-  ignorePatterns: ['default-assets-package/thirdparty/**/*.js', 'dist/**/*.js', '**/vendor/**'],
+  ignorePatterns: [
+    'default-assets-package/thirdparty/**/*.js',
+    'dist/**/*.js',
+    'dist/**/*.d.ts',
+    '**/vendor/**',
+  ],
 };

.prettierrc.json

@@ -1,4 +1,5 @@
 {
   "singleQuote": true,
+  "trailingComma": "es5",
   "printWidth": 110
 }

.vscode/launch.json

@@ -47,8 +47,8 @@
       "console": "integratedTerminal",
       "env": {
         "NODE_ENV": "development",
-        "DEBUG": "startup,g:server,context,github:tokens",
-        "MORE_DEBUG": "appinsights,cache,restapi,pg,querycache,user,redis-cross-org,health"
+        "DEBUG": "startup,g:server,context",
+        "MORE_DEBUG": "appinsights,cache,restapi,pg,querycache,user,redis-cross-org,health,github:tokens"
       }
     },
     {

api/client/index.ts

@@ -87,7 +87,7 @@ router.get('/', (req: ReposAppRequest, res) => {
       appService: config?.webServer?.appService?.name
         ? {
             name: config?.webServer?.appService?.name,
-            slot: config?.webServer?.appService?.slot,
+            slot: config?.webServer?.appService?.advanced?.slotType || config?.webServer?.appService?.slot,
             region: config?.webServer?.appService?.region,
           }
         : undefined,

api/client/organization/repo.ts

@@ -8,7 +8,6 @@ import asyncHandler from 'express-async-handler';
 
 import { jsonError } from '../../../middleware';
 import { ErrorHelper, getProviders } from '../../../transitional';
-import { Repository } from '../../../business';
 import { IndividualContext } from '../../../business/user';
 import NewRepositoryLockdownSystem from '../../../features/newRepositories/newRepositoryLockdown';
 import {
@@ -19,16 +18,8 @@ import { renameRepositoryDefaultBranchEndToEnd } from '../../../routes/org/repos
 import getCompanySpecificDeployment from '../../../middleware/companySpecificDeployment';
 
 import RouteRepoPermissions from './repoPermissions';
-import {
-  ReposAppRequest,
-  LocalApiRepoAction,
-  getRepositoryMetadataProvider,
-  NoCacheNoBackground,
-} from '../../../interfaces';
-
-type RequestWithRepo = ReposAppRequest & {
-  repository: Repository;
-};
+import { LocalApiRepoAction, getRepositoryMetadataProvider, NoCacheNoBackground } from '../../../interfaces';
+import { RequestWithRepo } from '../../../middleware/business/repository';
 
 enum ArchivalAction {
   Archive,

api/client/organization/repos.ts

@@ -7,13 +7,15 @@ import { NextFunction, Response, Router } from 'express';
 import asyncHandler from 'express-async-handler';
 
 import { jsonError } from '../../../middleware';
-import { getProviders } from '../../../transitional';
+import { CreateError, getProviders } from '../../../transitional';
 import { Repository } from '../../../business';
 
-import RouteRepo from './repo';
 import JsonPager from '../jsonPager';
 import { ReposAppRequest, IProviders } from '../../../interfaces';
 import { sortRepositoriesByNameCaseInsensitive } from '../../../utils';
+import { apiMiddlewareRepositoriesToRepository } from '../../../middleware/business/repository';
+
+import routeRepo from './repo';
 
 const router: Router = Router();
 
@@ -236,21 +238,10 @@ export async function searchRepos(
 
 // --- End of search reimplementation ---
 
-router.use(
-  '/:repoName',
-  asyncHandler(async (req: ReposAppRequest, res: Response, next: NextFunction) => {
-    const { organization } = req;
-    const { repoName } = req.params;
-    // does not confirm the name
-    (req as any).repository = organization.repository(repoName);
-    return next();
-  })
-);
-
-router.use('/:repoName', RouteRepo);
+router.use('/:repoName', asyncHandler(apiMiddlewareRepositoriesToRepository), routeRepo);
 
 router.use('*', (req, res: Response, next: NextFunction) => {
-  return next(jsonError('no API or function available within this repos endpoint', 404));
+  return next(CreateError.NotFound('no API or function available within org/repos endpoint'));
 });
 
 export default router;

api/client/organizations.ts

@@ -7,25 +7,18 @@ import { NextFunction, Response, Router } from 'express';
 import asyncHandler from 'express-async-handler';
 
 import { jsonError } from '../../middleware';
-import { CreateError, ErrorHelper, getProviders } from '../../transitional';
+import { CreateError, getProviders } from '../../transitional';
 import { ReposAppRequest } from '../../interfaces';
 
 import RouteOrganization from './organization';
-import {
-  IReposAppRequestWithOrganizationManagementType,
-  OrganizationManagementType,
-} from '../../middleware/business/organization';
-
+import { apiMiddlewareOrganizationsToOrganization } from '../../middleware/business/organization';
 import type { GitHubOrganizationResponseSanitized } from '../../business';
 import {
   OrganizationAnnotation,
   OrganizationAnnotationProperty,
   scrubOrganizationAnnotation,
 } from '../../entities/organizationAnnotation';
-import {
-  getOrganizationProfileViaMemoryCache,
-  setOrganizationProfileForRequest,
-} from '../../middleware/github/ensureOrganizationProfile';
+import { getOrganizationProfileViaMemoryCache } from '../../middleware/github/ensureOrganizationProfile';
 
 const router: Router = Router();
 
@@ -128,46 +121,10 @@ router.get(
   })
 );
 
-router.use(
-  '/:orgName',
-  asyncHandler(
-    async (req: IReposAppRequestWithOrganizationManagementType, res: Response, next: NextFunction) => {
-      const { operations } = getProviders(req);
-      const { orgName } = req.params;
-      req.organizationName = orgName;
-      try {
-        const org = operations.getOrganization(orgName);
-        if (org) {
-          req.organizationManagementType = OrganizationManagementType.Managed;
-          req.organization = org;
-          return next();
-        }
-      } catch (orgNotFoundError) {
-        if (!ErrorHelper.IsNotFound(orgNotFoundError)) {
-          return next(orgNotFoundError);
-        }
-      }
-      try {
-        const org = operations.getUncontrolledOrganization(orgName);
-        req.organizationManagementType = OrganizationManagementType.Unmanaged;
-        req.organization = org;
-        await setOrganizationProfileForRequest(req);
-      } catch (orgProfileError) {
-        if (ErrorHelper.IsNotFound(orgProfileError)) {
-          return next(CreateError.NotFound(`The organization ${orgName} does not exist`));
-        } else {
-          return next(orgProfileError);
-        }
-      }
-      return next();
-    }
-  )
-);
-
-router.use('/:orgName', RouteOrganization);
+router.use('/:orgName', asyncHandler(apiMiddlewareOrganizationsToOrganization), RouteOrganization);
 
 router.use('*', (req: ReposAppRequest, res: Response, next: NextFunction) => {
-  return next(jsonError('orgs API not found', 404));
+  return next(CreateError.NotFound('orgs API not found'));
 });
 
 export default router;

business/collaborator.ts

@@ -4,6 +4,7 @@
 //
 
 import { GitHubRepositoryPermission, IGitHubCollaboratorPermissions } from '../interfaces';
+import { projectCollaboratorPermissionsObjectToGitHubRepositoryPermission } from '../transitional';
 import * as common from './common';
 
 // prettier-ignore
@@ -14,6 +15,19 @@ const memberPrimaryProperties = [
   'avatar_url',
 ];
 
+export type CollaboratorJson = {
+  avatar_url: string;
+  id: number;
+  login: string;
+  permissions: IGitHubCollaboratorPermissions;
+};
+
+export type CollaboratorAccount = Collaborator | { id: number; login: string };
+
+export function compareCollaborators(a: Collaborator, b: Collaborator) {
+  return a?.login.localeCompare(b?.login, 'en', { sensitivity: 'base' });
+}
+
 export class Collaborator {
   public static PrimaryProperties = memberPrimaryProperties;
 
@@ -28,7 +42,7 @@ export class Collaborator {
     }
   }
 
-  asJson() {
+  asJson(): CollaboratorJson {
     return {
       avatar_url: this.avatar_url,
       id: this._id,
@@ -45,15 +59,7 @@ export class Collaborator {
     if (!this._permissions) {
       return GitHubRepositoryPermission.None;
     }
-    const permissions = this._permissions;
-    if (permissions.admin) {
-      return GitHubRepositoryPermission.Admin;
-    } else if (permissions.push) {
-      return GitHubRepositoryPermission.Push;
-    } else if (permissions.pull) {
-      return GitHubRepositoryPermission.Pull;
-    }
-    throw new Error(`Unsupported permission type by getHighestPermission`);
+    return projectCollaboratorPermissionsObjectToGitHubRepositoryPermission(this._permissions);
   }
 
   get id(): number {

business/enterprise.ts

@@ -22,7 +22,11 @@ export type EnterpriseSamlExternalIdentityNode = {
 };
 
 export default class GitHubEnterprise {
-  constructor(private providers: IProviders, public slug: string, private administrativeToken: string) {}
+  constructor(
+    private providers: IProviders,
+    public slug: string,
+    private administrativeToken: string
+  ) {}
 
   async getGitHubLoginForUserPrincipalName(userPrincipalName: string): Promise<string> {
     const node = await this.getSamlNodeFromUserPrincipalName(userPrincipalName);

business/githubApps/index.ts

@@ -33,12 +33,19 @@ export abstract class CustomAppPurpose implements ICustomAppPurpose {
   get isCustomAppPurpose() {
     return true;
   }
-  constructor(public id: string, public name: string) {}
+  constructor(
+    public id: string,
+    public name: string
+  ) {}
 }
 
 export class CustomAppPurposeOrganizationVariance extends CustomAppPurpose {
   fallbackIfNotConfiguredOrganizationName = false;
-  constructor(public id: string, public name: string, private configurations: IGitHubAppConfiguration[]) {
+  constructor(
+    public id: string,
+    public name: string,
+    private configurations: IGitHubAppConfiguration[]
+  ) {
     super(id, name);
   }
   getForOrganizationName(organizationName: string) {
@@ -53,7 +60,11 @@ export class CustomAppPurposeOrganizationVariance extends CustomAppPurpose {
 }
 
 export class CustomAppPurposeSingleConfiguration extends CustomAppPurpose {
-  constructor(public id: string, public name: string, private configuration: IGitHubAppConfiguration) {
+  constructor(
+    public id: string,
+    public name: string,
+    private configuration: IGitHubAppConfiguration
+  ) {
     super(id, name);
   }