caprover-api 0.0.22 → 0.0.24

package/dist/api/ApiManager.js

@@ -78,12 +78,19 @@ class ApiManager {
     }
     saveTheme(oldName, theme) {
         const http = this.http;
-        return Promise.resolve() //
-            .then(http.fetch(http.POST, '/user/system/themes/update', {
+        const payload = {
             oldName,
             name: theme.name,
             content: theme.content,
-        }));
+        };
+        if (theme.extra !== undefined) {
+            payload.extra = theme.extra;
+        }
+        if (theme.headEmbed !== undefined) {
+            payload.headEmbed = theme.headEmbed;
+        }
+        return Promise.resolve() //
+            .then(http.fetch(http.POST, '/user/system/themes/update', payload));
     }
     deleteTheme(themeName) {
         const http = this.http;

package/dist/models/OneClickAppDefinitionResponse.d.ts

@@ -1,3 +1,4 @@
+import { IOneClickTemplate } from './IOneClickAppModels';
 export default interface OneClickAppDefinitionResponse {
-    appTemplate: string;
+    appTemplate: IOneClickTemplate;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "caprover-api",
-    "version": "0.0.22",
+    "version": "0.0.24",
     "description": "API client for CapRover",
     "types": "dist/index.d.ts",
     "main": "dist/index.js",
@@ -9,7 +9,8 @@
         "formatter-write": "prettier --write './src/**/*.ts*'",
         "tslint": "tslint -c tslint.json -p tsconfig.json",
         "tslint-fix": "tslint --fix -c tslint.json -p tsconfig.json",
-        "test": "npm run build && node --test test/*.test.js",
+        "test": "npm run build && npm run test-types && node --test test/*.test.js",
+        "test-types": "npx tsc --noEmit --strict --skipLibCheck --target ES2020 --module commonjs --moduleResolution Node test/*.test.ts",
         "build": "rm -rf ./dist && npm run tslint && npx tsc && chmod +x ./dist -R",
         "dev": "rm -rf ./dist && npx tsc && node ./dist/example.js",
         "generate-barrels": "rm ./src/models/index.ts && barrelsby --directory src/models"

package/src/api/ApiManager.ts

@@ -145,15 +145,28 @@ export default class ApiManager {
 
     saveTheme(oldName: string, theme: CapRoverTheme): Promise<{}> {
         const http = this.http
-
-        return Promise.resolve() //
-            .then(
-                http.fetch(http.POST, '/user/system/themes/update', {
-                    oldName,
-                    name: theme.name,
-                    content: theme.content,
-                })
-            )
+        const payload: {
+            oldName: string
+            name: string
+            content: string
+            extra?: string
+            headEmbed?: string
+        } = {
+            oldName,
+            name: theme.name,
+            content: theme.content,
+        }
+
+        if (theme.extra !== undefined) {
+            payload.extra = theme.extra
+        }
+
+        if (theme.headEmbed !== undefined) {
+            payload.headEmbed = theme.headEmbed
+        }
+
+        return Promise.resolve() //
+            .then(http.fetch(http.POST, '/user/system/themes/update', payload))
     }
 
     deleteTheme(themeName: string): Promise<{}> {

package/src/models/OneClickAppDefinitionResponse.ts

@@ -1,3 +1,5 @@
+import { IOneClickTemplate } from './IOneClickAppModels'
+
 export default interface OneClickAppDefinitionResponse {
-    appTemplate: string
+    appTemplate: IOneClickTemplate
 }

package/test/ApiManager.test.js

@@ -5,7 +5,7 @@ const ApiManagerModule = require('../dist/api/ApiManager')
 const ApiManager = ApiManagerModule.default
 const { SimpleAuthenticationProvider } = ApiManagerModule
 
-function createApiWithRequestRecorder() {
+function createApiWithRequestRecorder(response = {}) {
     const api = new ApiManager(
         'https://captain.example.com',
         new SimpleAuthenticationProvider(() =>
@@ -21,7 +21,7 @@ function createApiWithRequestRecorder() {
         FORM_DATA: 'form-data',
         fetch(method, endpoint, data, bodyType = 'json') {
             requests.push({ method, endpoint, data, bodyType })
-            return () => Promise.resolve({})
+            return () => Promise.resolve(response)
         },
     }
 
@@ -101,3 +101,84 @@ test('executeGenericApiCommand accepts PATCH', async () => {
 
     assert.equal(requests[0].method, 'PATCH')
 })
+
+test('saveTheme sends supplied writable theme fields', async () => {
+    const { api, requests } = createApiWithRequestRecorder()
+
+    await api.saveTheme('old-theme', {
+        name: 'new-theme',
+        content: 'theme-content',
+        extra: '{"siderTheme":"dark"}',
+        headEmbed: '<meta name="theme-marker" content="test">',
+        builtIn: true,
+    })
+
+    assert.deepEqual(requests, [
+        {
+            method: 'POST',
+            endpoint: '/user/system/themes/update',
+            data: {
+                oldName: 'old-theme',
+                name: 'new-theme',
+                content: 'theme-content',
+                extra: '{"siderTheme":"dark"}',
+                headEmbed: '<meta name="theme-marker" content="test">',
+            },
+            bodyType: 'json',
+        },
+    ])
+})
+
+test('saveTheme omits unspecified optional theme fields', async () => {
+    const { api, requests } = createApiWithRequestRecorder()
+
+    await api.saveTheme('old-theme', {
+        name: 'new-theme',
+        content: 'theme-content',
+    })
+
+    assert.deepEqual(requests[0].data, {
+        oldName: 'old-theme',
+        name: 'new-theme',
+        content: 'theme-content',
+    })
+    assert.equal('extra' in requests[0].data, false)
+    assert.equal('headEmbed' in requests[0].data, false)
+    assert.equal(JSON.stringify(requests[0].data).includes('undefined'), false)
+})
+
+test('getOneClickAppByName returns the parsed template object', async () => {
+    const appTemplate = {
+        services: {
+            'srv-captain--demo': {
+                image: 'nginx:alpine',
+            },
+        },
+        captainVersion: 4,
+        caproverOneClickApp: {
+            instructions: {
+                start: 'Start instructions',
+                end: 'End instructions',
+            },
+            displayName: 'Demo',
+            variables: [],
+        },
+    }
+    const { api, requests } = createApiWithRequestRecorder({ appTemplate })
+
+    const response = await api.getOneClickAppByName(
+        'demo',
+        'https://repo.example.com'
+    )
+
+    assert.deepEqual(requests[0], {
+        method: 'GET',
+        endpoint: '/user/oneclick/template/app',
+        data: {
+            appName: 'demo',
+            baseDomain: 'https://repo.example.com',
+        },
+        bodyType: 'json',
+    })
+    assert.strictEqual(response.appTemplate, appTemplate)
+})

package/test/OneClickAppDefinitionResponse.test.ts

@@ -0,0 +1,11 @@
+import type CapRoverAPI from '../dist'
+import type { CapRoverModels } from '../dist'
+
+type OneClickAppDefinitionResponse = Awaited<
+    ReturnType<CapRoverAPI['getOneClickAppByName']>
+>
+
+declare const response: OneClickAppDefinitionResponse
+const appTemplate: CapRoverModels.IOneClickTemplate = response.appTemplate
+
+void appTemplate