Merge branch 'master' into feature/org-admin-refresh

apps/browser/jest.config.js

@@ -2,12 +2,12 @@ const { pathsToModuleNameMapper } = require("ts-jest");
 
 const { compilerOptions } = require("./tsconfig");
 
+const sharedConfig = require("../../libs/shared/jest.config.base");
+
 module.exports = {
-  collectCoverage: true,
-  coverageReporters: ["html", "lcov"],
-  coverageDirectory: "coverage",
-  setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
+  ...sharedConfig,
   preset: "jest-preset-angular",
+  setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
   moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
     prefix: "<rootDir>/",
   }),

apps/browser/tsconfig.spec.json

@@ -1,3 +1,4 @@
 {
-  "extends": "./tsconfig.json"
+  "extends": "./tsconfig.json",
+  "files": ["./test.setup.ts"]
 }

apps/cli/config/development.json

@@ -1,5 +1,3 @@
 {
-  "flags": {
-    "serve": true
-  }
+  "flags": {}
 }

apps/cli/config/production.json

@@ -1,5 +1,3 @@
 {
-  "flags": {
-    "serve": true
-  }
+  "flags": {}
 }

apps/cli/jest.config.js

@@ -2,13 +2,11 @@ const { pathsToModuleNameMapper } = require("ts-jest");
 
 const { compilerOptions } = require("./tsconfig");
 
+const sharedConfig = require("../../libs/shared/jest.config.base");
+
 module.exports = {
   preset: "ts-jest",
-  testMatch: ["**/+(*.)+(spec).+(ts)"],
-  setupFilesAfterEnv: ["<rootDir>/spec/test.setup.ts"],
-  collectCoverage: true,
-  coverageReporters: ["html", "lcov"],
-  coverageDirectory: "coverage",
+  setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
   moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
     prefix: "<rootDir>/",
   }),

apps/cli/src/commands/serve.command.ts

@@ -6,6 +6,7 @@ import * as koaBodyParser from "koa-bodyparser";
 import * as koaJson from "koa-json";
 
 import { KeySuffixOptions } from "@bitwarden/common/enums/keySuffixOptions";
+import { Utils } from "@bitwarden/common/misc/utils";
 import { Response } from "@bitwarden/node/cli/models/response";
 import { FileResponse } from "@bitwarden/node/cli/models/response/fileResponse";
 
@@ -167,7 +168,13 @@ export class ServeCommand {
       .use(async (ctx, next) => {
         if (protectOrigin && ctx.headers.origin != undefined) {
           ctx.status = 403;
-          this.main.logService.warning(`Blocking request from ${ctx.headers.origin}`);
+          this.main.logService.warning(
+            `Blocking request from "${
+              Utils.isNullOrEmpty(ctx.headers.origin)
+                ? "(Origin header value missing)"
+                : ctx.headers.origin
+            }"`
+          );
           return;
         }
         await next();

apps/cli/src/flags.ts

@@ -1,5 +1,5 @@
-export type Flags = {
-  serve?: boolean;
-};
+// Remove this linter hint if any flags exist
+// eslint-disable-next-line @typescript-eslint/ban-types
+export type Flags = {};
 
 export type FlagName = keyof Flags;

apps/cli/src/program.ts

@@ -470,36 +470,34 @@ export class Program extends BaseProgram {
         this.processResponse(response);
       });
 
-    if (CliUtils.flagEnabled("serve")) {
-      program
-        .command("serve")
-        .description("Start a RESTful API webserver.")
-        .option("--hostname <hostname>", "The hostname to bind your API webserver to.")
-        .option("--port <port>", "The port to run your API webserver on.")
-        .option(
-          "--disable-origin-protection",
-          "If set, allows requests with origin header. Not recommended!"
-        )
-        .on("--help", () => {
-          writeLn("\n  Notes:");
-          writeLn("");
-          writeLn("    Default hostname is `localhost`.");
-          writeLn("    Use hostname `all` for no hostname binding.");
-          writeLn("    Default port is `8087`.");
-          writeLn("");
-          writeLn("  Examples:");
-          writeLn("");
-          writeLn("    bw serve");
-          writeLn("    bw serve --port 8080");
-          writeLn("    bw serve --hostname bwapi.mydomain.com --port 80");
-          writeLn("", true);
-        })
-        .action(async (cmd) => {
-          await this.exitIfNotAuthed();
-          const command = new ServeCommand(this.main);
-          await command.run(cmd);
-        });
-    }
+    program
+      .command("serve")
+      .description("Start a RESTful API webserver.")
+      .option("--hostname <hostname>", "The hostname to bind your API webserver to.")
+      .option("--port <port>", "The port to run your API webserver on.")
+      .option(
+        "--disable-origin-protection",
+        "If set, allows requests with origin header. Not recommended!"
+      )
+      .on("--help", () => {
+        writeLn("\n  Notes:");
+        writeLn("");
+        writeLn("    Default hostname is `localhost`.");
+        writeLn("    Use hostname `all` for no hostname binding.");
+        writeLn("    Default port is `8087`.");
+        writeLn("");
+        writeLn("  Examples:");
+        writeLn("");
+        writeLn("    bw serve");
+        writeLn("    bw serve --port 8080");
+        writeLn("    bw serve --hostname bwapi.mydomain.com --port 80");
+        writeLn("", true);
+      })
+      .action(async (cmd) => {
+        await this.exitIfNotAuthed();
+        const command = new ServeCommand(this.main);
+        await command.run(cmd);
+      });
   }
 
   protected processResponse(response: Response, exitImmediately = false) {

apps/cli/tsconfig.spec.json

@@ -1,3 +1,4 @@
 {
-  "extends": "./tsconfig.json"
+  "extends": "./tsconfig.json",
+  "files": ["./test.setup.ts"]
 }

apps/web/jest.config.js

@@ -2,12 +2,12 @@ const { pathsToModuleNameMapper } = require("ts-jest");
 
 const { compilerOptions } = require("./tsconfig");
 
+const sharedConfig = require("../../libs/shared/jest.config.base");
+
 module.exports = {
-  collectCoverage: true,
-  coverageReporters: ["html", "lcov"],
-  coverageDirectory: "coverage",
+  ...sharedConfig,
   preset: "jest-preset-angular",
-  setupFilesAfterEnv: ["<rootDir>/test.config.ts"],
+  setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
   moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
     prefix: "<rootDir>/",
   }),

apps/web/src/app/accounts/trial-initiation/trial-initiation.component.spec.ts

@@ -12,6 +12,7 @@ import { I18nPipe } from "@bitwarden/angular/pipes/i18n.pipe";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
+import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction";
 import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
 import { StateService as BaseStateService } from "@bitwarden/common/abstractions/state.service";
 import { PlanType } from "@bitwarden/common/enums/planType";
@@ -75,6 +76,10 @@ describe("TrialInitiationComponent", () => {
         { provide: LogService, useClass: Substitute.for<LogService>() },
         { provide: I18nService, useClass: Substitute.for<I18nService>() },
         { provide: TitleCasePipe, useClass: Substitute.for<TitleCasePipe>() },
+        {
+          provide: PolicyApiServiceAbstraction,
+          useClass: Substitute.for<PolicyApiServiceAbstraction>(),
+        },
         {
           provide: VerticalStepperComponent,
           useClass: VerticalStepperStubComponent,

apps/web/tsconfig.json

@@ -16,5 +16,5 @@
     "preserveWhitespaces": true
   },
   "files": ["src/polyfills.ts", "src/main.ts", "../../bitwarden_license/bit-web/src/main.ts"],
-  "include": ["src/connectors/*.ts", "src/**/*.stories.ts"]
+  "include": ["src/connectors/*.ts", "src/**/*.stories.ts", "src/**/*.spec.ts"]
 }

apps/web/tsconfig.spec.json

@@ -1,3 +1,4 @@
 {
-  "extends": "./tsconfig.json"
+  "extends": "./tsconfig.json",
+  "files": ["./test.setup.ts"]
 }