Fix journal commands

Author: ad-m

extensions/cli-ext-insight-journal/logger.js

@@ -28,8 +28,9 @@ export default new Command({
     ],
     handler: async (opts) => {
         const optsAll = opts._all || opts;
-        const log = await opts.api
+        const logResp = await opts.api
             .get(openapi.getUrl(`/insight/pl-waw-1/project/${optsAll.project}/journal/${optsAll.journal}`));
+        const log = logResp.bodyJson;
         const token = await opts.auth.getToken(log.fqdn);
         const logFile = optsAll['log-file'] == 'stdin' ? process.stdin : fs.createReadStream(optsAll['log-file']);
         const inStream = logFile

extensions/cli-ext-insight-journal/stream.js

@@ -28,15 +28,16 @@ export default new Command({
     ],
     handler: async (opts) => {
         const optsAll = opts._all || opts;
-        const log = await opts.api
+        const logResp = await opts.api
             .get(openapi.getUrl(`/insight/pl-waw-1/project/${optsAll.project}/journal/${optsAll.journal}`));
+        const log = logResp.bodyJson;
         const token = await opts.auth.getToken(log.fqdn);
 
         const stream = await opts.http.get(`http://${log.fqdn}/log`, {
             headers: { authorization: `Bearer ${token}` },
         });
         let lines = 0;
-        const logFile = optsAll['log-file'] == 'stdout' ? process.stdout : fs.createReadStream(optsAll['log-file']);
+        const logFile = optsAll['log-file-output'] == 'stdout' ? process.stdout : fs.createWriteStream(optsAll['log-file-output']);
         return new Promise((resolve, reject) => stream.body
             .on('error', err => {
                 logFile.close();

packages/cli-core/lib/auth.js

@@ -82,16 +82,13 @@ export default ({ http, logger, config, passport, as, defaultAudience }) => {
 
         if (as) {
             logger.debug(`Use delegate to switch actor to '${as}'`);
-            const body = await exchange(access_token, {
-                audience,
+            const body = await exchange(audience, access_token, {
                 resource: as,
             });
             return body.access_token;
         } else if (!passport && audience && defaultAudience !== audience) {
             logger.debug(`Update audience as '${audience}'`);
-            const body = await exchange(access_token, {
-                audience,
-            });
+            const body = await exchange(audience, access_token);
             return body.access_token;
         }