Patch to 0.3.6

NangoHQ · Nov 30, 2022 · b4785e4 · b4785e4
1 parent a6b7a09
commit b4785e4
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 20 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
     "name": "pizzly",
-    "version": "0.3.5",
+    "version": "0.3.6",
     "description": "Pizzly's CLI tool.",
     "type": "module",
     "main": "dist/index.js",

diff --git a/packages/frontend/package.json b/packages/frontend/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@nangohq/pizzly-frontend",
-    "version": "0.3.4",
+    "version": "0.3.6",
     "description": "Pizzly's frontend library for OAuth handling.",
     "type": "module",
     "main": "dist/index.js",

diff --git a/packages/server/lib/controllers/connection.controller.ts b/packages/server/lib/controllers/connection.controller.ts
@@ -3,15 +3,9 @@ import connectionService from '../services/connection.service.js';
 import type { NextFunction } from 'express';
 import configService from '../services/config.service.js';
 import { ProviderConfig, ProviderTemplate, Connection, ProviderAuthModes } from '../models.js';
-import yaml from 'js-yaml';
-import fs from 'fs';
 
 class ConnectionController {
-    templates: { [key: string]: ProviderTemplate };
-
-    constructor() {
-        this.templates = yaml.load(fs.readFileSync('./templates.yaml').toString()) as { string: ProviderTemplate };
-    }
+    templates: { [key: string]: ProviderTemplate } = configService.getTemplates();
 
     async getConnectionCredentials(req: Request, res: Response, next: NextFunction) {
         try {

diff --git a/packages/server/lib/controllers/oauth.contoller.ts b/packages/server/lib/controllers/oauth.contoller.ts
@@ -18,8 +18,6 @@ import {
 } from '../models.js';
 import logger from '../utils/logger.js';
 import type { NextFunction } from 'express';
-import yaml from 'js-yaml';
-import fs from 'fs';
 
 class OAuthController {
     sessionStore: OAuthSessionStore = {};
@@ -37,11 +35,7 @@ class OAuthController {
         callback_err: (err: string) => `Did not get oauth_token and/or oauth_verifier in the callback: ${err}.`
     };
     callbackUrl = getOauthCallbackUrl();
-    templates: { [key: string]: ProviderTemplate };
-
-    constructor() {
-        this.templates = yaml.load(fs.readFileSync('./templates.yaml').toString()) as { string: ProviderTemplate };
-    }
+    templates: { [key: string]: ProviderTemplate } = configService.getTemplates();
 
     public async oauthRequest(req: Request, res: Response, next: NextFunction) {
         try {

diff --git a/packages/server/lib/services/config.service.ts b/packages/server/lib/services/config.service.ts
@@ -1,7 +1,17 @@
-import type { ProviderConfig } from '../models.js';
+import type { ProviderConfig, ProviderTemplate } from '../models.js';
 import db from '../db/database.js';
+import yaml from 'js-yaml';
+import fs from 'fs';
 
 class ConfigService {
+    templates: { [key: string]: ProviderTemplate };
+
+    constructor() {
+        this.templates = yaml.load(
+            fs.readFileSync(process.env['PIZZLY_SERVER_RUN_MODE'] ? './packages/server/templates.yaml' : './templates.yaml').toString()
+        ) as { string: ProviderTemplate };
+    }
+
     async getProviderConfig(providerConfigKey: string): Promise<ProviderConfig | null> {
         let result = await db.knex.withSchema(db.schema()).select('*').from(`_pizzly_configs`).where({ unique_key: providerConfigKey });
 
@@ -32,6 +42,10 @@ class ConfigService {
             oauth_scopes: config.oauth_scopes
         });
     }
+
+    getTemplates(): { [key: string]: ProviderTemplate } {
+        return this.templates;
+    }
 }
 
 export default new ConfigService();
diff --git a/packages/server/package.json b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@nangohq/pizzly-server",
-    "version": "0.3.4",
+    "version": "0.3.6",
     "description": "Pizzly's server.",
     "type": "module",
     "main": "dist/server.js",