wgc 0.48.0 → 0.49.1

package/CHANGELOG.md

@@ -4,6 +4,16 @@ Binaries are attached to the github release otherwise all images can be found [h
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.49.1](https://github.com/wundergraph/cosmo/compare/wgc@0.49.0...wgc@0.49.1) (2024-03-21)
+
+**Note:** Version bump only for package wgc
+
+# [0.49.0](https://github.com/wundergraph/cosmo/compare/wgc@0.48.0...wgc@0.49.0) (2024-03-20)
+
+### Features
+
+* show warning when both auth methods are used ([#654](https://github.com/wundergraph/cosmo/issues/654)) ([0ee7d3c](https://github.com/wundergraph/cosmo/commit/0ee7d3ce3ed1d3dbd2c6558492cf96d05fa453b9)) (@StarpTech)
+
 # [0.48.0](https://github.com/wundergraph/cosmo/compare/wgc@0.47.0...wgc@0.48.0) (2024-03-20)
 
 ### Features

package/dist/core/config.js

@@ -1,7 +1,8 @@
-var _a, _b;
+var _a, _b, _c;
 import { readFileSync } from 'node:fs';
 import { readFile } from 'node:fs/promises';
 import path from 'node:path';
+import pc from 'picocolors';
 import yaml from 'js-yaml';
 import envPaths from 'env-paths';
 const info = JSON.parse(await readFile(new URL('../../package.json', import.meta.url), {
@@ -20,10 +21,13 @@ const getLoginDetails = () => {
         return null;
     }
 };
+if (process.env.COSMO_API_KEY && ((_a = getLoginDetails()) === null || _a === void 0 ? void 0 : _a.accessToken)) {
+    console.log(`${pc.yellow('Warning')} ${pc.dim('Both COSMO_API_KEY and login credentials found. Environment variable has precedence.\n')}`);
+}
 export const config = {
     baseURL: process.env.COSMO_API_URL || 'https://cosmo-cp.wundergraph.com',
     // environment var first to allow overriding
-    apiKey: process.env.COSMO_API_KEY || ((_a = getLoginDetails()) === null || _a === void 0 ? void 0 : _a.accessToken),
+    apiKey: process.env.COSMO_API_KEY || ((_b = getLoginDetails()) === null || _b === void 0 ? void 0 : _b.accessToken),
     kcApiURL: process.env.KC_API_URL || 'https://accounts.wundergraph.com/auth',
     webURL: process.env.COSMO_WEB_URL || 'https://cosmo.wundergraph.com',
     kcClientId: process.env.KC_CLIENT_ID || 'cosmo-cli',
@@ -35,6 +39,6 @@ export const config = {
 export const baseHeaders = {
     'user-agent': `cosmo-cli/${info.version}`,
     authorization: 'Bearer ' + config.apiKey,
-    'cosmo-org-slug': ((_b = getLoginDetails()) === null || _b === void 0 ? void 0 : _b.organizationSlug) || '',
+    'cosmo-org-slug': ((_c = getLoginDetails()) === null || _c === void 0 ? void 0 : _c.organizationSlug) || '',
 };
 //# sourceMappingURL=config.js.map

package/dist/core/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/core/config.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,IAAI,MAAM,SAAS,CAAC;AAC3B,OAAO,QAAQ,MAAM,WAAW,CAAC;AAEjC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CACrB,MAAM,QAAQ,CAAC,IAAI,GAAG,CAAC,oBAAoB,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;IAC7D,QAAQ,EAAE,MAAM;CACjB,CAAC,CACH,CAAC;AAEF,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;AAChD,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC;AACtC,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;AAE9D,MAAM,eAAe,GAAG,GAA6D,EAAE;IACrF,IAAI;QACF,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;QACzD,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;QACnD,OAAO,EAAE,WAAW,EAAE,SAAS,CAAC,WAAW,EAAE,gBAAgB,EAAE,SAAS,CAAC,gBAAgB,EAAE,CAAC;KAC7F;IAAC,MAAM;QACN,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,kCAAkC;IACxE,4CAA4C;IAC5C,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa,KAAI,MAAA,eAAe,EAAE,0CAAE,WAAW,CAAA;IACnE,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,uCAAuC;IAC3E,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,+BAA+B;IACpE,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,WAAW;IACnD,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,OAAO;IACxC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,mCAAmC;IAClE,OAAO,EAAE,IAAI,CAAC,OAAO;IACrB,kBAAkB,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,OAAO;CAChE,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAgB;IACtC,YAAY,EAAE,aAAa,IAAI,CAAC,OAAO,EAAE;IACzC,aAAa,EAAE,SAAS,GAAG,MAAM,CAAC,MAAM;IACxC,gBAAgB,EAAE,CAAA,MAAA,eAAe,EAAE,0CAAE,gBAAgB,KAAI,EAAE;CAC5D,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/core/config.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,IAAI,MAAM,SAAS,CAAC;AAC3B,OAAO,QAAQ,MAAM,WAAW,CAAC;AAEjC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CACrB,MAAM,QAAQ,CAAC,IAAI,GAAG,CAAC,oBAAoB,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;IAC7D,QAAQ,EAAE,MAAM;CACjB,CAAC,CACH,CAAC;AAEF,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;AAChD,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC;AACtC,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;AAE9D,MAAM,eAAe,GAAG,GAA6D,EAAE;IACrF,IAAI;QACF,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;QACzD,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;QACnD,OAAO,EAAE,WAAW,EAAE,SAAS,CAAC,WAAW,EAAE,gBAAgB,EAAE,SAAS,CAAC,gBAAgB,EAAE,CAAC;KAC7F;IAAC,MAAM;QACN,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAC;AAEF,IAAI,OAAO,CAAC,GAAG,CAAC,aAAa,KAAI,MAAA,eAAe,EAAE,0CAAE,WAAW,CAAA,EAAE;IAC/D,OAAO,CAAC,GAAG,CACT,GAAG,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,GAAG,CAC/B,wFAAwF,CACzF,EAAE,CACJ,CAAC;CACH;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,kCAAkC;IACxE,4CAA4C;IAC5C,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa,KAAI,MAAA,eAAe,EAAE,0CAAE,WAAW,CAAA;IACnE,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,uCAAuC;IAC3E,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,+BAA+B;IACpE,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,WAAW;IACnD,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,OAAO;IACxC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,mCAAmC;IAClE,OAAO,EAAE,IAAI,CAAC,OAAO;IACrB,kBAAkB,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,OAAO;CAChE,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAgB;IACtC,YAAY,EAAE,aAAa,IAAI,CAAC,OAAO,EAAE;IACzC,aAAa,EAAE,SAAS,GAAG,MAAM,CAAC,MAAM;IACxC,gBAAgB,EAAE,CAAA,MAAA,eAAe,EAAE,0CAAE,gBAAgB,KAAI,EAAE;CAC5D,CAAC"}