From 604dbdbbd1c300cd99ec3be5e4678416570e419d Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Tue, 24 Jan 2023 11:21:58 -0500 Subject: [PATCH] Move files to features/ to simplify structure Signed-off-by: Sebastian Malton --- .../common}/inject-system-cas.injectable.ts | 0 .../common}/request-system-cas-token.ts | 0 .../main}/request-system-cas.injectable.darwin.ts | 8 ++++---- .../main}/request-system-cas.injectable.linux.ts | 2 +- .../main}/request-system-cas.injectable.testing-env.ts | 2 +- .../main}/request-system-cas.injectable.win32.ts | 6 +++--- .../runnables/setup-system-ca.injectable.ts | 2 +- .../frames/root-frame/setup-system-ca.injectable.ts | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) rename src/{common/certificate-authorities => features/certificate-authorities/common}/inject-system-cas.injectable.ts (100%) rename src/{common/certificate-authorities => features/certificate-authorities/common}/request-system-cas-token.ts (100%) rename src/{common/certificate-authorities => features/certificate-authorities/main}/request-system-cas.injectable.darwin.ts (86%) rename src/{common/certificate-authorities => features/certificate-authorities/main}/request-system-cas.injectable.linux.ts (83%) rename src/{common/certificate-authorities => features/certificate-authorities/main}/request-system-cas.injectable.testing-env.ts (83%) rename src/{common/certificate-authorities => features/certificate-authorities/main}/request-system-cas.injectable.win32.ts (87%) diff --git a/src/common/certificate-authorities/inject-system-cas.injectable.ts b/src/features/certificate-authorities/common/inject-system-cas.injectable.ts similarity index 100% rename from src/common/certificate-authorities/inject-system-cas.injectable.ts rename to src/features/certificate-authorities/common/inject-system-cas.injectable.ts diff --git a/src/common/certificate-authorities/request-system-cas-token.ts b/src/features/certificate-authorities/common/request-system-cas-token.ts similarity index 100% rename from src/common/certificate-authorities/request-system-cas-token.ts rename to src/features/certificate-authorities/common/request-system-cas-token.ts diff --git a/src/common/certificate-authorities/request-system-cas.injectable.darwin.ts b/src/features/certificate-authorities/main/request-system-cas.injectable.darwin.ts similarity index 86% rename from src/common/certificate-authorities/request-system-cas.injectable.darwin.ts rename to src/features/certificate-authorities/main/request-system-cas.injectable.darwin.ts index c471c954e4..62cf75f6ff 100644 --- a/src/common/certificate-authorities/request-system-cas.injectable.darwin.ts +++ b/src/features/certificate-authorities/main/request-system-cas.injectable.darwin.ts @@ -3,10 +3,10 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import execFileInjectable from "../fs/exec-file.injectable"; -import loggerInjectable from "../logger.injectable"; -import type { AsyncResult } from "../utils/async-result"; -import { requestSystemCAsInjectionToken } from "./request-system-cas-token"; +import execFileInjectable from "../../../common/fs/exec-file.injectable"; +import loggerInjectable from "../../../common/logger.injectable"; +import type { AsyncResult } from "../../../common/utils/async-result"; +import { requestSystemCAsInjectionToken } from "../common/request-system-cas-token"; // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions/Cheatsheet#other_assertions const certSplitPattern = /(?=-----BEGIN\sCERTIFICATE-----)/g; diff --git a/src/common/certificate-authorities/request-system-cas.injectable.linux.ts b/src/features/certificate-authorities/main/request-system-cas.injectable.linux.ts similarity index 83% rename from src/common/certificate-authorities/request-system-cas.injectable.linux.ts rename to src/features/certificate-authorities/main/request-system-cas.injectable.linux.ts index 1d7bf10350..cffd0d172a 100644 --- a/src/common/certificate-authorities/request-system-cas.injectable.linux.ts +++ b/src/features/certificate-authorities/main/request-system-cas.injectable.linux.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { requestSystemCAsInjectionToken } from "./request-system-cas-token"; +import { requestSystemCAsInjectionToken } from "../common/request-system-cas-token"; const requestSystemCAsInjectable = getInjectable({ id: "request-system-cas", diff --git a/src/common/certificate-authorities/request-system-cas.injectable.testing-env.ts b/src/features/certificate-authorities/main/request-system-cas.injectable.testing-env.ts similarity index 83% rename from src/common/certificate-authorities/request-system-cas.injectable.testing-env.ts rename to src/features/certificate-authorities/main/request-system-cas.injectable.testing-env.ts index 1d7bf10350..cffd0d172a 100644 --- a/src/common/certificate-authorities/request-system-cas.injectable.testing-env.ts +++ b/src/features/certificate-authorities/main/request-system-cas.injectable.testing-env.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { requestSystemCAsInjectionToken } from "./request-system-cas-token"; +import { requestSystemCAsInjectionToken } from "../common/request-system-cas-token"; const requestSystemCAsInjectable = getInjectable({ id: "request-system-cas", diff --git a/src/common/certificate-authorities/request-system-cas.injectable.win32.ts b/src/features/certificate-authorities/main/request-system-cas.injectable.win32.ts similarity index 87% rename from src/common/certificate-authorities/request-system-cas.injectable.win32.ts rename to src/features/certificate-authorities/main/request-system-cas.injectable.win32.ts index 4940aa2a7b..9e5d5d8caf 100644 --- a/src/common/certificate-authorities/request-system-cas.injectable.win32.ts +++ b/src/features/certificate-authorities/main/request-system-cas.injectable.win32.ts @@ -3,9 +3,9 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import execFileInjectable from "../fs/exec-file.injectable"; -import loggerInjectable from "../logger.injectable"; -import { requestSystemCAsInjectionToken } from "./request-system-cas-token"; +import execFileInjectable from "../../../common/fs/exec-file.injectable"; +import loggerInjectable from "../../../common/logger.injectable"; +import { requestSystemCAsInjectionToken } from "../common/request-system-cas-token"; const pemEncoding = (hexEncodedCert: String) => { const certData = Buffer.from(hexEncodedCert, "hex").toString("base64"); diff --git a/src/main/start-main-application/runnables/setup-system-ca.injectable.ts b/src/main/start-main-application/runnables/setup-system-ca.injectable.ts index b5219dbf4f..e819c42596 100644 --- a/src/main/start-main-application/runnables/setup-system-ca.injectable.ts +++ b/src/main/start-main-application/runnables/setup-system-ca.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { beforeApplicationIsLoadingInjectionToken } from "../runnable-tokens/before-application-is-loading-injection-token"; -import injectSystemCAsInjectable from "../../../common/certificate-authorities/inject-system-cas.injectable"; +import injectSystemCAsInjectable from "../../../features/certificate-authorities/common/inject-system-cas.injectable"; const setupSystemCaInjectable = getInjectable({ id: "setup-system-ca", diff --git a/src/renderer/frames/root-frame/setup-system-ca.injectable.ts b/src/renderer/frames/root-frame/setup-system-ca.injectable.ts index 557d87c81f..4fe4d07758 100644 --- a/src/renderer/frames/root-frame/setup-system-ca.injectable.ts +++ b/src/renderer/frames/root-frame/setup-system-ca.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { beforeFrameStartsSecondInjectionToken } from "../../before-frame-starts/tokens"; -import injectSystemCAsInjectable from "../../../common/certificate-authorities/inject-system-cas.injectable"; +import injectSystemCAsInjectable from "../../../features/certificate-authorities/common/inject-system-cas.injectable"; const setupSystemCaInjectable = getInjectable({ id: "setup-system-ca",