lucid-package 0.0.24 → 0.0.27

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "lucid-package",
-    "version": "0.0.24",
+    "version": "0.0.27",
     "description": "",
     "main": "index.js",
     "bin": {

package/src/editorextension.js

@@ -138,6 +138,9 @@ async function debugEditorExtension(extensionNames, quiet = false) {
                 const credentials = JSON.parse((await fs.readFile(`${name}.credentials.local`)).toString());
                 res.send(JSON.stringify(Object.assign(Object.assign({}, provider), credentials)));
             }
+            else {
+                res.sendStatus(404);
+            }
         }
         else {
             res.sendStatus(404);

package/src/index.js

@@ -72,7 +72,7 @@ class LucidSuiteExtensionCLI {
         createShapeLibrary.add_argument('name');
         const parsed = parser.parse_args(args);
         //For internal development, creating and operating on a "test" package via bazel
-        const isInternalTesting = !!parsed['chdir'];
+        let isInternalTesting = !!parsed['chdir'];
         if (isInternalTesting) {
             if (parsed['project']) {
                 process.chdir(parsed['chdir'] + '/' + parsed['project']);
@@ -84,6 +84,11 @@ class LucidSuiteExtensionCLI {
         else if (parsed['project']) {
             process.chdir(parsed['project']);
         }
+        //If we've spawned a child process recursively calling a new lucid-package target,
+        //then we're still testing as long as it's originally triggered by Bazel.
+        if (process.env['BAZEL_TARGET']) {
+            isInternalTesting = true;
+        }
         switch (parsed['command']) {
             case 'create':
                 (0, package_1.createEmptyPackage)(parsed['name']);
@@ -157,6 +162,10 @@ class LucidSuiteExtensionCLI {
         }
     }
 }
-new LucidSuiteExtensionCLI()
-    .run(process.argv.slice(2))
-    .catch((reason) => console.error('Error running Lucid Suite Extension CLI', reason));
+new LucidSuiteExtensionCLI().run(process.argv.slice(2)).catch((reason) => {
+    let reasonMessage = reason;
+    if (reason instanceof Object && reason.toString) {
+        reasonMessage = reason.toString();
+    }
+    console.error('Error running Lucid Suite Extension CLI', reasonMessage);
+});

package/src/packagemanifest.js

@@ -60,12 +60,20 @@ function validateManifestOrThrow(manifest) {
             if (!(0, checks_1.isString)(provider['title'])) {
                 throw new Error('manifest.json: OAuth provider "title" must be a string');
             }
-            if (!(0, checks_1.isString)(provider['tokenUrl'])) {
-                throw new Error('manifest.json: OAuth provider "tokenUrl" must be a string');
+            if (provider['grantType'] &&
+                provider['grantType'] !== 'authorizationCode' &&
+                provider['grantType'] !== 'clientCredentials') {
+                throw new Error('manifest.json: OAuth provider "grantType" must be "authorizationCode" or "clientCredentials"');
             }
-            if (!(0, checks_1.isString)(provider['authorizationUrl'])) {
+            if (provider['grantType'] === 'authorizationCode' && !(0, checks_1.isString)(provider['authorizationUrl'])) {
                 throw new Error('manifest.json: OAuth provider "authorizationUrl" must be a string');
             }
+            if (provider['grantType'] === 'clientCredentials' && provider['authorizationUrl']) {
+                throw new Error('manifest.json: OAuth provider "authorizationUrl" must not be provided when grantType is "clientCredentials"');
+            }
+            if (!(0, checks_1.isString)(provider['tokenUrl'])) {
+                throw new Error('manifest.json: OAuth provider "tokenUrl" must be a string');
+            }
             if (!(0, checks_1.isTypedArray)(checks_1.isString)(provider['scopes'])) {
                 throw new Error('manifest.json: OAuth provider "scopes" must be a string array');
             }