@fonoster/apiserver 0.9.7 → 0.9.8

package/dist/core/httpBridge.d.ts

@@ -1,5 +1,6 @@
 import { Readable } from "stream";
-declare function httpBridge(params: {
+import { IdentityConfig } from "@fonoster/identity";
+declare function httpBridge(identityConfig: IdentityConfig, params: {
     port: number;
 }): {
     addStream: (id: string, stream: Readable) => void;

package/dist/core/httpBridge.js

@@ -16,11 +16,10 @@ exports.httpBridge = httpBridge;
 const identity_1 = require("@fonoster/identity");
 const logger_1 = require("@fonoster/logger");
 const express_1 = __importDefault(require("express"));
-const identityConfig_1 = require("./identityConfig");
 const envs_1 = require("../envs");
 const logger = (0, logger_1.getLogger)({ service: "apiserver", filePath: __filename });
 const CONTENT_TYPE = "audio/L16;rate=16000;channels=1";
-function httpBridge(params) {
+function httpBridge(identityConfig, params) {
     const { port } = params;
     const app = (0, express_1.default)();
     const streamMap = new Map();
@@ -46,12 +45,12 @@ function httpBridge(params) {
     });
     app.get("/api/identity/accept-invite", (req, res) => __awaiter(this, void 0, void 0, function* () {
         try {
-            yield (0, identity_1.createUpdateMembershipStatus)(identityConfig_1.identityConfig)(req.query.token);
+            yield (0, identity_1.createUpdateMembershipStatus)(identityConfig)(req.query.token);
             res.redirect(envs_1.APP_URL);
         }
         catch (error) {
             logger.verbose("error updating membership status", error);
-            res.redirect(envs_1.IDENTITY_WORKSPACE_INVITATION_FAIL_URL);
+            res.redirect(identityConfig.workspaceInviteFailUrl);
         }
     }));
     app.listen(port, () => {

package/dist/core/identityConfig.d.ts

@@ -1,4 +1,5 @@
 declare const identityConfig: {
+    dbUrl: string;
     issuer: string;
     audience: string;
     privateKey: string;
@@ -7,6 +8,10 @@ declare const identityConfig: {
     accessTokenExpiresIn: string;
     refreshTokenExpiresIn: string;
     idTokenExpiresIn: string;
+    workspaceInviteExpiration: string;
+    workspaceInviteUrl: string;
+    workspaceInviteFailUrl: string;
+    userVerificationRequired: boolean;
     smtpConfig: {
         host: string;
         port: number;

package/dist/core/identityConfig.js

@@ -21,6 +21,7 @@ exports.identityConfig = void 0;
  */
 const envs_1 = require("../envs");
 const identityConfig = {
+    dbUrl: envs_1.IDENTITY_DATABASE_URL,
     issuer: envs_1.IDENTITY_ISSUER,
     audience: envs_1.IDENTITY_AUDIENCE,
     privateKey: envs_1.IDENTITY_PRIVATE_KEY,
@@ -29,6 +30,10 @@ const identityConfig = {
     accessTokenExpiresIn: envs_1.IDENTITY_ACCESS_TOKEN_EXPIRES_IN,
     refreshTokenExpiresIn: envs_1.IDENTITY_REFRESH_TOKEN_EXPIRES_IN,
     idTokenExpiresIn: envs_1.IDENTITY_ID_TOKEN_EXPIRES_IN,
+    workspaceInviteExpiration: envs_1.IDENTITY_WORKSPACE_INVITE_EXPIRATION,
+    workspaceInviteUrl: envs_1.IDENTITY_WORKSPACE_INVITE_URL,
+    workspaceInviteFailUrl: envs_1.IDENTITY_WORKSPACE_INVITE_FAIL_URL,
+    userVerificationRequired: envs_1.IDENTITY_USER_VERIFICATION_REQUIRED,
     smtpConfig: {
         host: envs_1.SMTP_HOST,
         port: envs_1.SMTP_PORT,

package/dist/core/runServices.js

@@ -75,6 +75,7 @@ const runCallManager_1 = require("../calls/runCallManager");
 const envs_1 = require("../envs");
 const connectToAri_1 = require("../voice/connectToAri");
 const authz_1 = require("@fonoster/authz");
+const identityConfig_1 = require("./identityConfig");
 const logger = (0, logger_1.getLogger)({ service: "apiserver", filePath: __filename });
 const authorization = (0, common_1.createAuthInterceptor)(envs_1.IDENTITY_PUBLIC_KEY, allowList_1.allowList);
 const checkMethodAuthorized = (0, authz_1.createCheckMethodAuthorized)(`${envs_1.AUTHZ_SERVICE_HOST}:${envs_1.AUTHZ_SERVICE_PORT}`, envs_1.AUTHZ_SERVICE_METHODS);
@@ -91,7 +92,7 @@ function runServices() {
         // Load the remaining services
         (0, loadServices_1.default)(server, yield services_1.default);
         // Connecting to Asterisk ARI
-        yield (0, connectToAri_1.connectToAri)((0, httpBridge_1.httpBridge)({ port: envs_1.HTTP_BRIDGE_PORT }));
+        yield (0, connectToAri_1.connectToAri)((0, httpBridge_1.httpBridge)(identityConfig_1.identityConfig, { port: envs_1.HTTP_BRIDGE_PORT }));
         // Additional Call Managers subscriber may be added here to handle call events
         yield (0, runCallManager_1.createCreateCallSubscriber)({
             natsUrl: envs_1.NATS_URL,

package/dist/envs.d.ts

@@ -22,7 +22,10 @@ export declare const IDENTITY_OAUTH2_GITHUB_CLIENT_SECRET: string;
 export declare const IDENTITY_PRIVATE_KEY: string;
 export declare const IDENTITY_PUBLIC_KEY: string;
 export declare const IDENTITY_REFRESH_TOKEN_EXPIRES_IN: string;
-export declare const IDENTITY_WORKSPACE_INVITATION_FAIL_URL: string;
+export declare const IDENTITY_WORKSPACE_INVITE_FAIL_URL: string;
+export declare const IDENTITY_WORKSPACE_INVITE_EXPIRATION: string;
+export declare const IDENTITY_WORKSPACE_INVITE_URL: string;
+export declare const IDENTITY_DATABASE_URL: string;
 export declare const AUTHZ_SERVICE_ENABLED: boolean;
 export declare const AUTHZ_SERVICE_HOST: string;
 export declare const AUTHZ_SERVICE_PORT: string | number;

package/dist/envs.js

@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SMTP_SENDER = exports.SMTP_SECURE = exports.SMTP_PORT = exports.SMTP_HOST = exports.SMTP_AUTH_USER = exports.SMTP_AUTH_PASS = exports.ROUTR_DEFAULT_PEER_USERNAME = exports.ROUTR_DEFAULT_PEER_PASSWORD = exports.ROUTR_DEFAULT_PEER_NAME = exports.ROUTR_DEFAULT_PEER_AOR = exports.ROUTR_API_ENDPOINT = exports.OWNER_PASSWORD = exports.OWNER_NAME = exports.OWNER_EMAIL = exports.NATS_URL = exports.INTEGRATIONS_FILE = exports.INFLUXDB_USERNAME = exports.INFLUXDB_URL = exports.INFLUXDB_TOKEN = exports.INFLUXDB_PASSWORD = exports.INFLUXDB_ORG = exports.AUTHZ_SERVICE_METHODS = exports.AUTHZ_SERVICE_PORT = exports.AUTHZ_SERVICE_HOST = exports.AUTHZ_SERVICE_ENABLED = exports.IDENTITY_WORKSPACE_INVITATION_FAIL_URL = exports.IDENTITY_REFRESH_TOKEN_EXPIRES_IN = exports.IDENTITY_PUBLIC_KEY = exports.IDENTITY_PRIVATE_KEY = exports.IDENTITY_OAUTH2_GITHUB_CLIENT_SECRET = exports.IDENTITY_OAUTH2_GITHUB_CLIENT_ID = exports.IDENTITY_OAUTH2_GITHUB_ENABLED = exports.IDENTITY_USER_VERIFICATION_REQUIRED = exports.IDENTITY_ISSUER = exports.IDENTITY_ID_TOKEN_EXPIRES_IN = exports.IDENTITY_AUDIENCE = exports.IDENTITY_ACCESS_TOKEN_EXPIRES_IN = exports.HTTP_BRIDGE_PORT = exports.DEFAULT_NATS_QUEUE_GROUP = exports.CLOAK_ENCRYPTION_KEY = exports.CALLS_TRACK_CALL_SUBJECT = exports.CALLS_CREATE_SUBJECT = exports.ASTERISK_TRUNK = exports.ASTERISK_SYSTEM_DOMAIN = exports.ASTERISK_ARI_USERNAME = exports.ASTERISK_ARI_SECRET = exports.ASTERISK_ARI_PROXY_URL = exports.APP_URL = exports.APISERVER_HOST = exports.APISERVER_BIND_ADDR = void 0;
-exports.TWILIO_PHONE_NUMBER = exports.TWILIO_AUTH_TOKEN = exports.TWILIO_ACCOUNT_SID = exports.TEMPLATES_DIR = void 0;
+exports.SMTP_HOST = exports.SMTP_AUTH_USER = exports.SMTP_AUTH_PASS = exports.ROUTR_DEFAULT_PEER_USERNAME = exports.ROUTR_DEFAULT_PEER_PASSWORD = exports.ROUTR_DEFAULT_PEER_NAME = exports.ROUTR_DEFAULT_PEER_AOR = exports.ROUTR_API_ENDPOINT = exports.OWNER_PASSWORD = exports.OWNER_NAME = exports.OWNER_EMAIL = exports.NATS_URL = exports.INTEGRATIONS_FILE = exports.INFLUXDB_USERNAME = exports.INFLUXDB_URL = exports.INFLUXDB_TOKEN = exports.INFLUXDB_PASSWORD = exports.INFLUXDB_ORG = exports.AUTHZ_SERVICE_METHODS = exports.AUTHZ_SERVICE_PORT = exports.AUTHZ_SERVICE_HOST = exports.AUTHZ_SERVICE_ENABLED = exports.IDENTITY_DATABASE_URL = exports.IDENTITY_WORKSPACE_INVITE_URL = exports.IDENTITY_WORKSPACE_INVITE_EXPIRATION = exports.IDENTITY_WORKSPACE_INVITE_FAIL_URL = exports.IDENTITY_REFRESH_TOKEN_EXPIRES_IN = exports.IDENTITY_PUBLIC_KEY = exports.IDENTITY_PRIVATE_KEY = exports.IDENTITY_OAUTH2_GITHUB_CLIENT_SECRET = exports.IDENTITY_OAUTH2_GITHUB_CLIENT_ID = exports.IDENTITY_OAUTH2_GITHUB_ENABLED = exports.IDENTITY_USER_VERIFICATION_REQUIRED = exports.IDENTITY_ISSUER = exports.IDENTITY_ID_TOKEN_EXPIRES_IN = exports.IDENTITY_AUDIENCE = exports.IDENTITY_ACCESS_TOKEN_EXPIRES_IN = exports.HTTP_BRIDGE_PORT = exports.DEFAULT_NATS_QUEUE_GROUP = exports.CLOAK_ENCRYPTION_KEY = exports.CALLS_TRACK_CALL_SUBJECT = exports.CALLS_CREATE_SUBJECT = exports.ASTERISK_TRUNK = exports.ASTERISK_SYSTEM_DOMAIN = exports.ASTERISK_ARI_USERNAME = exports.ASTERISK_ARI_SECRET = exports.ASTERISK_ARI_PROXY_URL = exports.APP_URL = exports.APISERVER_HOST = exports.APISERVER_BIND_ADDR = void 0;
+exports.TWILIO_PHONE_NUMBER = exports.TWILIO_AUTH_TOKEN = exports.TWILIO_ACCOUNT_SID = exports.TEMPLATES_DIR = exports.SMTP_SENDER = exports.SMTP_SECURE = exports.SMTP_PORT = void 0;
 /*
  * Copyright (C) 2025 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/fonoster
@@ -44,7 +44,8 @@ const e = process.env;
     "APISERVER_SMTP_AUTH_PASS",
     "APISERVER_IDENTITY_ISSUER",
     "APISERVER_IDENTITY_DATABASE_URL",
-    "APISERVER_IDENTITY_WORKSPACE_INVITATION_FAIL_URL",
+    "APISERVER_IDENTITY_WORKSPACE_INVITE_URL",
+    "APISERVER_IDENTITY_WORKSPACE_INVITE_FAIL_URL",
     "APISERVER_DATABASE_URL",
     "APISERVER_INFLUXDB_URL",
     "APISERVER_INFLUXDB_INIT_USERNAME",
@@ -84,7 +85,10 @@ exports.IDENTITY_OAUTH2_GITHUB_CLIENT_SECRET = e.APISERVER_IDENTITY_OAUTH2_GITHU
 exports.IDENTITY_PRIVATE_KEY = fs_1.default.readFileSync(IDENTITY_PRIVATE_KEY_PATH, "utf8");
 exports.IDENTITY_PUBLIC_KEY = fs_1.default.readFileSync(IDENTITY_PUBLIC_KEY_PATH, "utf8");
 exports.IDENTITY_REFRESH_TOKEN_EXPIRES_IN = e.APISERVER_IDENTITY_REFRESH_TOKEN_EXPIRES_IN || "24h";
-exports.IDENTITY_WORKSPACE_INVITATION_FAIL_URL = e.APISERVER_IDENTITY_WORKSPACE_INVITATION_FAIL_URL;
+exports.IDENTITY_WORKSPACE_INVITE_FAIL_URL = e.APISERVER_IDENTITY_WORKSPACE_INVITE_FAIL_URL;
+exports.IDENTITY_WORKSPACE_INVITE_EXPIRATION = e.APISERVER_IDENTITY_WORKSPACE_INVITE_EXPIRATION || "1d";
+exports.IDENTITY_WORKSPACE_INVITE_URL = e.APISERVER_IDENTITY_WORKSPACE_INVITE_URL;
+exports.IDENTITY_DATABASE_URL = e.APISERVER_IDENTITY_DATABASE_URL;
 if (e.APISERVER_IDENTITY_OAUTH2_GITHUB_ENABLED === "true") {
     (0, common_1.assertEnvsAreSet)([
         "APISERVER_IDENTITY_OAUTH2_GITHUB_CLIENT_ID",

package/dist/index.js

@@ -73,6 +73,7 @@ const createInfluxDbPub_1 = require("./events/createInfluxDbPub");
 const nats_1 = require("./events/nats");
 const transformEvent_1 = require("./events/transformEvent");
 const common_1 = require("@fonoster/common");
+const identityConfig_1 = require("./core/identityConfig");
 Promise.resolve().then(() => __importStar(require("./core/removeSwaggerNotice")));
 function main() {
     return __awaiter(this, void 0, void 0, function* () {
@@ -82,7 +83,7 @@ function main() {
                 email: envs_1.OWNER_EMAIL,
                 password: envs_1.OWNER_PASSWORD
             };
-            yield (0, identity_1.upsertDefaultUser)(user);
+            yield (0, identity_1.upsertDefaultUser)(identityConfig_1.identityConfig, user);
         }
         // Upsert a Peer for the default region, if it doesn't already exist
         yield (0, upsertDefaultPeer_1.upsertDefaultPeer)();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fonoster/apiserver",
-  "version": "0.9.7",
+  "version": "0.9.8",
   "description": "APIServer for Fonoster",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/fonoster#readme",
@@ -21,11 +21,11 @@
   },
   "dependencies": {
     "@deepgram/sdk": "^3.5.1",
-    "@fonoster/authz": "^0.9.7",
+    "@fonoster/authz": "^0.9.8",
     "@fonoster/common": "^0.9.7",
-    "@fonoster/identity": "^0.9.7",
+    "@fonoster/identity": "^0.9.8",
     "@fonoster/logger": "^0.9.7",
-    "@fonoster/sipnet": "^0.9.7",
+    "@fonoster/sipnet": "^0.9.8",
     "@fonoster/streams": "^0.9.7",
     "@fonoster/types": "^0.9.0",
     "@google-cloud/speech": "^6.6.0",
@@ -73,5 +73,5 @@
     "@types/uuid": "^10.0.0",
     "@types/validator": "^13.12.0"
   },
-  "gitHead": "58373b604b2e29bcfc6b88a2f30ae45afb4e97a7"
+  "gitHead": "ce8a2ea35fa85d494b158ddb8e61bd92ff2af00b"
 }