neonctl 0.0.7 → 0.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "neonctl",
-    "version": "0.0.7",
+    "version": "0.1.0",
     "description": "CLI tool for NeonDB Cloud management",
     "main": "index.js",
     "author": "NeonDB",
@@ -27,7 +27,7 @@
     "scripts": {
         "dev": "node dev.js",
         "debug": "node --inspect-brk dev.js",
-        "build": "tsc && cp src/*.html dist/",
+        "build": "npm run clean && tsc && cp src/*.html dist/src/",
         "clean": "rm -rf dist",
         "start": "node index.js",
         "publizh": "npm run build && cd dist && npm publish"

package/src/auth.js

@@ -19,12 +19,10 @@ const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const open_1 = __importDefault(require("open"));
 const log_1 = require("./log");
-// what port to listen on for incoming requests
-const CONFIG_LISTEN_PORT = 5555;
 // oauth server timeouts
 const SERVER_TIMEOUT = 10000;
 // where to wait for incoming redirect request from oauth server to arrive
-const REDIRECT_URI = 'http://127.0.0.1:5555/callback';
+const REDIRECT_URI = (port) => `http://127.0.0.1:${port}/callback`;
 // These scopes cannot be cancelled, they are always needed.
 const DEFAULT_SCOPES = ['openid', 'offline'];
 const auth = ({ oauthHost, clientId }) => __awaiter(void 0, void 0, void 0, function* () {
@@ -33,10 +31,18 @@ const auth = ({ oauthHost, clientId }) => __awaiter(void 0, void 0, void 0, func
     });
     log_1.log.info('Discovering oauth server');
     const issuer = yield openid_client_1.Issuer.discover(oauthHost);
+    //
+    // Start HTTP server and wait till /callback is hit
+    //
+    const server = (0, node_http_1.createServer)();
+    server.listen(0, function () {
+        log_1.log.info(`Listening on port ${this.address().port}`);
+    });
+    const listen_port = server.address().port;
     const neonOAuthClient = new issuer.Client({
         token_endpoint_auth_method: 'none',
         client_id: clientId,
-        redirect_uris: [REDIRECT_URI],
+        redirect_uris: [REDIRECT_URI(listen_port)],
         response_types: ['code'],
     });
     // https://datatracker.ietf.org/doc/html/rfc6819#section-4.4.1.8
@@ -45,10 +51,7 @@ const auth = ({ oauthHost, clientId }) => __awaiter(void 0, void 0, void 0, func
     const codeVerifier = openid_client_1.generators.codeVerifier();
     const codeChallenge = openid_client_1.generators.codeChallenge(codeVerifier);
     return new Promise((resolve) => {
-        //
-        // Start HTTP server and wait till /callback is hit
-        //
-        const server = (0, node_http_1.createServer)((request, response) => __awaiter(void 0, void 0, void 0, function* () {
+        server.on('request', (request, response) => __awaiter(void 0, void 0, void 0, function* () {
             var _a;
             //
             // Wait for callback and follow oauth flow.
@@ -60,7 +63,7 @@ const auth = ({ oauthHost, clientId }) => __awaiter(void 0, void 0, void 0, func
             }
             log_1.log.info(`Callback received: ${request.url}`);
             const params = neonOAuthClient.callbackParams(request);
-            const tokenSet = yield neonOAuthClient.callback(REDIRECT_URI, params, {
+            const tokenSet = yield neonOAuthClient.callback(REDIRECT_URI(listen_port), params, {
                 code_verifier: codeVerifier,
                 state,
             });
@@ -69,9 +72,6 @@ const auth = ({ oauthHost, clientId }) => __awaiter(void 0, void 0, void 0, func
             resolve(tokenSet);
             server.close();
         }));
-        server.listen(CONFIG_LISTEN_PORT, () => {
-            log_1.log.info(`Listening on port ${CONFIG_LISTEN_PORT}`);
-        });
         //
         // Open browser to let user authenticate
         //