@positronic/cli 0.0.58 → 0.0.60

package/dist/src/commands/helpers.js

@@ -233,7 +233,7 @@ import * as https from 'https';
 import { URL } from 'url';
 import { createRequire } from 'module';
 import * as dotenv from 'dotenv';
-import { maybeSignRequest } from '../lib/request-signer.js';
+import { getAuthHeader } from '../lib/jwt-auth.js';
 // API client configuration
 var apiBaseUrl = null;
 var isLocalDevMode = true;
@@ -267,44 +267,55 @@ var isLocalDevMode = true;
 export var apiClient = {
     fetch: function(apiPath, options) {
         return _async_to_generator(function() {
-            var baseUrl, port, fullUrl, requestOptions, method, existingHeaders, headersObj, signatureHeaders;
+            var baseUrl, port, fullUrl, requestOptions, existingHeaders, headersObj, authHeader;
             return _ts_generator(this, function(_state) {
-                if (apiBaseUrl) {
-                    baseUrl = apiBaseUrl;
-                } else {
-                    // Fallback to localhost (for backwards compatibility and testing)
-                    port = process.env.POSITRONIC_PORT || '8787';
-                    baseUrl = "http://localhost:".concat(port);
-                }
-                fullUrl = "".concat(baseUrl).concat(apiPath.startsWith('/') ? apiPath : '/' + apiPath);
-                // Sign requests when not in local dev mode
-                requestOptions = options || {};
-                if (!isLocalDevMode) {
-                    method = ((options === null || options === void 0 ? void 0 : options.method) || 'GET').toUpperCase();
-                    existingHeaders = (options === null || options === void 0 ? void 0 : options.headers) || {};
-                    headersObj = {};
-                    // Convert headers to plain object
-                    if (_instanceof(existingHeaders, Headers)) {
-                        existingHeaders.forEach(function(value, key) {
-                            headersObj[key] = value;
-                        });
-                    } else if (Array.isArray(existingHeaders)) {
-                        existingHeaders.forEach(function(param) {
-                            var _param = _sliced_to_array(param, 2), key = _param[0], value = _param[1];
-                            headersObj[key] = value;
+                switch(_state.label){
+                    case 0:
+                        if (apiBaseUrl) {
+                            baseUrl = apiBaseUrl;
+                        } else {
+                            // Fallback to localhost (for backwards compatibility and testing)
+                            port = process.env.POSITRONIC_PORT || '8787';
+                            baseUrl = "http://localhost:".concat(port);
+                        }
+                        fullUrl = "".concat(baseUrl).concat(apiPath.startsWith('/') ? apiPath : '/' + apiPath);
+                        // Add auth header when not in local dev mode
+                        requestOptions = options || {};
+                        if (!!isLocalDevMode) return [
+                            3,
+                            2
+                        ];
+                        existingHeaders = (options === null || options === void 0 ? void 0 : options.headers) || {};
+                        headersObj = {};
+                        // Convert headers to plain object
+                        if (_instanceof(existingHeaders, Headers)) {
+                            existingHeaders.forEach(function(value, key) {
+                                headersObj[key] = value;
+                            });
+                        } else if (Array.isArray(existingHeaders)) {
+                            existingHeaders.forEach(function(param) {
+                                var _param = _sliced_to_array(param, 2), key = _param[0], value = _param[1];
+                                headersObj[key] = value;
+                            });
+                        } else {
+                            Object.assign(headersObj, existingHeaders);
+                        }
+                        return [
+                            4,
+                            getAuthHeader()
+                        ];
+                    case 1:
+                        authHeader = _state.sent();
+                        requestOptions = _object_spread_props(_object_spread({}, options), {
+                            headers: _object_spread({}, headersObj, authHeader)
                         });
-                    } else {
-                        Object.assign(headersObj, existingHeaders);
-                    }
-                    signatureHeaders = maybeSignRequest(method, fullUrl, headersObj);
-                    requestOptions = _object_spread_props(_object_spread({}, options), {
-                        headers: _object_spread({}, headersObj, signatureHeaders)
-                    });
+                        _state.label = 2;
+                    case 2:
+                        return [
+                            2,
+                            fetch(fullUrl, requestOptions)
+                        ];
                 }
-                return [
-                    2,
-                    fetch(fullUrl, requestOptions)
-                ];
             });
         })();
     },

package/dist/src/components/auth-login.js

@@ -47,7 +47,7 @@ function _unsupported_iterable_to_array(o, minLen) {
 import React, { useState } from 'react';
 import { Box, Text, useApp } from 'ink';
 import { discoverSSHKeys, expandPath } from '../lib/ssh-key-utils.js';
-import { resetRequestSigner } from '../lib/request-signer.js';
+import { resetJwtAuthProvider } from '../lib/jwt-auth.js';
 import { SelectList } from './select-list.js';
 import { existsSync } from 'fs';
 export var AuthLogin = function(param) {
@@ -103,7 +103,7 @@ export var AuthLogin = function(param) {
             configManager.setDefaultPrivateKeyPath(keyPath);
         }
         // Reset request signer to use new key
-        resetRequestSigner();
+        resetJwtAuthProvider();
         return /*#__PURE__*/ React.createElement(Box, {
             flexDirection: "column",
             paddingTop: 1,
@@ -163,7 +163,7 @@ export var AuthLogin = function(param) {
                 configManager.setDefaultPrivateKeyPath(displayPath);
             }
             // Reset request signer to use new key
-            resetRequestSigner();
+            resetJwtAuthProvider();
             setSelectedPath(displayPath);
             setState('success');
         };

package/dist/src/components/auth-logout.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Box, Text } from 'ink';
-import { resetRequestSigner } from '../lib/request-signer.js';
+import { resetJwtAuthProvider } from '../lib/jwt-auth.js';
 export var AuthLogout = function(param) {
     var configManager = param.configManager, forProject = param.forProject;
     var currentProject = configManager.getCurrentProject();
@@ -33,7 +33,7 @@ export var AuthLogout = function(param) {
             }, "Nothing to clear.")));
         }
         configManager.clearProjectPrivateKeyPath(currentProject.name);
-        resetRequestSigner();
+        resetJwtAuthProvider();
         return /*#__PURE__*/ React.createElement(Box, {
             flexDirection: "column",
             paddingTop: 1,
@@ -60,7 +60,7 @@ export var AuthLogout = function(param) {
         }, "Nothing to clear.")));
     }
     configManager.clearDefaultPrivateKeyPath();
-    resetRequestSigner();
+    resetJwtAuthProvider();
     return /*#__PURE__*/ React.createElement(Box, {
         flexDirection: "column",
         paddingTop: 1,