A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
Merge pull request #9351 from streetwriters/web/server-url-from-environment
01zulfi1157c6b7cd11
diff --git a/apps/web/src/common/db.ts b/apps/web/src/common/db.tsindex ecfabb944..391f171f0 100644--- a/apps/web/src/common/db.ts+++ b/apps/web/src/common/db.ts@@ -19,18 +19,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.import { EventSourcePolyfill as EventSource } from "event-source-polyfill";import { DatabasePersistence, NNStorage } from "../interfaces/storage";-import { logger } from "../utils/logger";-import {- database,- getFeature,- getFeatureLimit,- isFeatureAvailable-} from "@notesnook/common";+import { database, getFeature, getFeatureLimit } from "@notesnook/common";import { createDialect } from "./sqlite";import { isFeatureSupported } from "../utils/feature-check";import { generatePassword } from "../utils/password-generator";import { deriveKey, useKeyStore } from "../interfaces/key-store";import {+ hosts,logManager,SubscriptionPlan,SubscriptionStatus@@ -38,6 +33,11 @@ import {import Config from "../utils/config";import { FileStorage } from "../interfaces/fs";+function getHostUrl(hostUrl: keyof typeof hosts, defaultUrl: string) {+ const envValue = import.meta.env[`NN_${hostUrl}`];+ return envValue || defaultUrl;+}+const db = database;async function initializeDatabase(persistence: DatabasePersistence) {performance.mark("start:initializeDatabase");@@ -49,13 +49,16 @@ async function initializeDatabase(persistence: DatabasePersistence) {}db.host({- API_HOST: "https://api.notesnook.com",- AUTH_HOST: "https://auth.streetwriters.co",- SSE_HOST: "https://events.streetwriters.co",- ISSUES_HOST: "https://issues.streetwriters.co",- SUBSCRIPTIONS_HOST: "https://subscriptions.streetwriters.co",- MONOGRAPH_HOST: "https://monogr.ph",- NOTESNOOK_HOST: "https://notesnook.com",+ API_HOST: getHostUrl("API_HOST", "https://api.notesnook.com"),+ AUTH_HOST: getHostUrl("AUTH_HOST", "https://auth.streetwriters.co"),+ SSE_HOST: getHostUrl("SSE_HOST", "https://events.streetwriters.co"),+ ISSUES_HOST: getHostUrl("ISSUES_HOST", "https://issues.streetwriters.co"),+ SUBSCRIPTIONS_HOST: getHostUrl(+ "SUBSCRIPTIONS_HOST",+ "https://subscriptions.streetwriters.co"+ ),+ MONOGRAPH_HOST: getHostUrl("MONOGRAPH_HOST", "https://monogr.ph"),+ NOTESNOOK_HOST: getHostUrl("NOTESNOOK_HOST", "https://notesnook.com"),...Config.get("serverUrls", {})});