Merge pull request #17 from wildbit/feature/override-base-uri

Feature/override base uri

package.json

@@ -1,6 +1,6 @@
 {
   "name": "postmark-cli",
-  "version": "1.1.2",
+  "version": "1.2.2",
   "description": "A CLI tool for managing templates, sending emails, and fetching servers on Postmark.",
   "main": "./dist/index.js",
   "dependencies": {

src/commands/email/raw.ts

@@ -10,6 +10,10 @@ export const builder = {
     type: 'string',
     hidden: true,
   },
+  'request-host': {
+    type: 'string',
+    hidden: true,
+  },
   from: {
     type: 'string',
     describe:
@@ -54,10 +58,13 @@ const exec = (args: RawEmailArguments): Promise<void> => {
  * Execute send command in shell
  */
 const sendCommand = (serverToken: string, args: RawEmailArguments): void => {
-  const { from, to, subject, html, text } = args
+  const { from, to, subject, html, text, requestHost } = args
   const command: CommandResponse = new CommandResponse()
   command.initResponse('Sending an email')
   const client = new ServerClient(serverToken)
+  if (requestHost !== undefined && requestHost !== '') {
+    client.clientOptions.requestHost = requestHost
+  }
 
   sendEmail(client, from, to, subject, html, text)
     .then(response => {

src/commands/email/template.ts

@@ -10,6 +10,10 @@ export const builder = {
     type: 'string',
     hidden: true,
   },
+  'request-host': {
+    type: 'string',
+    hidden: true,
+  },
   id: {
     type: 'string',
     describe: 'Template ID. Required if a template alias is not specified.',
@@ -56,10 +60,13 @@ const exec = (args: TemplatedEmailArguments) => {
  * Execute templated email send command in shell
  */
 const sendCommand = (serverToken: string, args: TemplatedEmailArguments) => {
-  const { id, alias, from, to, model } = args
+  const { id, alias, from, to, model, requestHost } = args
   const command: CommandResponse = new CommandResponse()
   command.initResponse('Sending an email')
   const client = new ServerClient(serverToken)
+  if (requestHost !== undefined && requestHost !== '') {
+    client.clientOptions.requestHost = requestHost
+  }
 
   sendEmailWithTemplate(client, id, alias, from, to, model)
     .then((response: any) => {

src/commands/servers/list.ts

@@ -12,6 +12,10 @@ export const builder = {
     type: 'string',
     hidden: true,
   },
+  'request-host': {
+    type: 'string',
+    hidden: true,
+  },
   count: {
     type: 'number',
     describe: 'Number of servers to return',
@@ -55,10 +59,13 @@ const exec = (args: ServerListArguments): Promise<void> => {
  * Get list of servers
  */
 const listCommand = (accountToken: string, args: ServerListArguments): void => {
-  const { count, offset, name, showTokens } = args
+  const { count, offset, name, showTokens, requestHost } = args
   const command: CommandResponse = new CommandResponse()
   command.initResponse('Fetching servers...')
   const client = new AccountClient(accountToken)
+  if (requestHost !== undefined && requestHost !== '') {
+    client.clientOptions.requestHost = requestHost
+  }
 
   getServers(client, count, offset, name)
     .then(response => {

src/commands/templates/pull.ts

@@ -21,6 +21,10 @@ export const builder = {
     type: 'string',
     hidden: true,
   },
+  'request-host': {
+    type: 'string',
+    hidden: true,
+  },
   overwrite: {
     type: 'boolean',
     alias: 'o',
@@ -45,23 +49,28 @@ const exec = (args: TemplatePullArguments) => {
  * Begin pulling the templates
  */
 const pull = (serverToken: string, args: TemplatePullArguments) => {
-  const { outputdirectory, overwrite } = args
+  const { outputdirectory, overwrite, requestHost } = args
 
   // Check if directory exists
   if (existsSync(untildify(outputdirectory)) && !overwrite) {
-    return overwritePrompt(serverToken, outputdirectory)
+    return overwritePrompt(serverToken, outputdirectory, requestHost)
   }
 
   return fetchTemplateList({
     sourceServer: serverToken,
     outputDir: outputdirectory,
+    requestHost: requestHost,
   })
 }
 
 /**
  * Ask user to confirm overwrite
  */
-const overwritePrompt = (serverToken: string, outputdirectory: string) => {
+const overwritePrompt = (
+  serverToken: string,
+  outputdirectory: string,
+  requestHost: string
+) => {
   return prompt([
     {
       type: 'confirm',
@@ -74,6 +83,7 @@ const overwritePrompt = (serverToken: string, outputdirectory: string) => {
       return fetchTemplateList({
         sourceServer: serverToken,
         outputDir: outputdirectory,
+        requestHost: requestHost,
       })
     }
   })
@@ -83,9 +93,12 @@ const overwritePrompt = (serverToken: string, outputdirectory: string) => {
  * Fetch template list from PM
  */
 const fetchTemplateList = (options: TemplateListOptions) => {
-  const { sourceServer, outputDir } = options
+  const { sourceServer, outputDir, requestHost } = options
   const spinner = ora('Pulling templates from Postmark...').start()
   const client = new ServerClient(sourceServer)
+  if (requestHost !== undefined && requestHost !== '') {
+    client.clientOptions.requestHost = requestHost
+  }
 
   client
     .getTemplates()
@@ -129,9 +142,7 @@ const processTemplates = (options: ProcessTemplatesOptions) => {
     if (!template.Alias) {
       requestCount++
       log(
-        `Template named "${
-          template.Name
-        }" will not be downloaded because it is missing an alias.`,
+        `Template named "${template.Name}" will not be downloaded because it is missing an alias.`,
         { warn: true }
       )
 

src/commands/templates/push.ts

@@ -29,6 +29,10 @@ export const builder = {
     type: 'string',
     hidden: true,
   },
+  'request-host': {
+    type: 'string',
+    hidden: true,
+  },
   force: {
     type: 'boolean',
     describe: 'Disable confirmation before pushing templates',
@@ -70,10 +74,13 @@ const validateDirectory = (
  * Begin pushing the templates
  */
 const push = (serverToken: string, args: TemplatePushArguments) => {
-  const { templatesdirectory, force } = args
+  const { templatesdirectory, force, requestHost } = args
   const spinner = ora('Fetching templates...').start()
   const manifest = createManifest(templatesdirectory)
   const client = new ServerClient(serverToken)
+  if (requestHost !== undefined && requestHost !== '') {
+    client.clientOptions.requestHost = requestHost
+  }
 
   // Make sure manifest isn't empty
   if (manifest.length > 0) {

src/types/Email.ts

@@ -1,5 +1,6 @@
 interface EmailArguments {
   serverToken: string
+  requestHost: string
   from: string
   to: string
 }

src/types/Server.ts

@@ -1,5 +1,6 @@
 export interface ServerListArguments {
   accountToken: string
+  requestHost: string
   count: number
   offset: number
   name: string

src/types/Template.ts

@@ -51,17 +51,20 @@ export interface ProcessTemplatesOptions {
 
 export interface TemplateListOptions {
   sourceServer: string
+  requestHost: string
   outputDir: string
 }
 
 export interface TemplatePullArguments {
   serverToken: string
+  requestHost: string
   outputdirectory: string
   overwrite: boolean
 }
 
 export interface TemplatePushArguments {
   serverToken: string
+  requestHost: string
   templatesdirectory: string
   force: boolean
 }