ag-awsauth 0.0.2 → 0.0.5

package/dist/config.d.ts

@@ -1,8 +1,12 @@
 export declare const logPath = "log.txt";
 export declare const stsDurationSeconds: number;
 export declare const nativeStsDurationSeconds: number;
-export declare const identityCenterRegion: () => string;
-export declare const ssoStartUrl: () => string;
-export declare const targetRegion: () => string;
+export declare let basePath: string;
+export declare const setBasePath: (bp: string) => void;
+export declare let identityCenterRegion: string;
+export declare let ssoStartUrl: string;
+export declare let targetRegion: string;
 export declare const validateConfig: () => boolean;
+export declare const setConfig: () => void;
 export declare const runConfig: () => void;
+export declare const timeoutMs = 10000;

package/dist/config.js

@@ -3,28 +3,37 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runConfig = exports.validateConfig = exports.targetRegion = exports.ssoStartUrl = exports.identityCenterRegion = exports.nativeStsDurationSeconds = exports.stsDurationSeconds = exports.logPath = void 0;
+exports.timeoutMs = exports.runConfig = exports.setConfig = exports.validateConfig = exports.targetRegion = exports.ssoStartUrl = exports.identityCenterRegion = exports.setBasePath = exports.basePath = exports.nativeStsDurationSeconds = exports.stsDurationSeconds = exports.logPath = void 0;
 const envfile_1 = require("envfile");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 exports.logPath = 'log.txt';
 exports.stsDurationSeconds = 60 * 60 * 4; //4h
 exports.nativeStsDurationSeconds = 60 * 60 * 1; //1h
-const identityCenterRegion = () => process.env.identityCenterRegion;
-exports.identityCenterRegion = identityCenterRegion;
-const ssoStartUrl = () => process.env.ssoStartUrl;
-exports.ssoStartUrl = ssoStartUrl;
-const targetRegion = () => process.env.targetRegion;
-exports.targetRegion = targetRegion;
+exports.basePath = '';
+const setBasePath = (bp) => {
+    exports.basePath = bp;
+};
+exports.setBasePath = setBasePath;
+exports.identityCenterRegion = '';
+exports.ssoStartUrl = '';
+exports.targetRegion = '';
 const validateConfig = () => {
-    if (!(0, exports.identityCenterRegion)() || !(0, exports.ssoStartUrl)() || !(0, exports.targetRegion)()) {
+    (0, exports.setConfig)();
+    if (!exports.identityCenterRegion || !exports.ssoStartUrl || !exports.targetRegion) {
         return false;
     }
     return true;
 };
 exports.validateConfig = validateConfig;
+const setConfig = () => {
+    exports.identityCenterRegion = process.env.identityCenterRegion;
+    exports.ssoStartUrl = process.env.ssoStartUrl;
+    exports.targetRegion = process.env.targetRegion;
+};
+exports.setConfig = setConfig;
 const runConfig = () => {
-    const pn = path_1.default.resolve(__dirname + '/../.env');
+    const pn = path_1.default.resolve(exports.basePath + '/.env');
     if (!fs_1.default.existsSync(pn)) {
         fs_1.default.writeFileSync(pn, '');
     }
@@ -43,3 +52,4 @@ const runConfig = () => {
     require('child_process').exec(`start "" "${pn}"`);
 };
 exports.runConfig = runConfig;
+exports.timeoutMs = 10000;

package/dist/direct.js

@@ -1,6 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const dotenv_1 = require("dotenv");
 const _1 = require(".");
-(0, dotenv_1.config)();
 void (0, _1.run)();

package/dist/helpers/browser.js

@@ -13,6 +13,8 @@ exports.getMFA = exports.goToPage = exports.launchBrowser = exports.closeBrowser
 const log_1 = require("ag-common/dist/common/helpers/log");
 const sleep_1 = require("ag-common/dist/common/helpers/sleep");
 const puppeteer_1 = require("puppeteer");
+const __1 = require("..");
+const config_1 = require("../config");
 const input_1 = require("./input");
 let browser;
 const closeBrowser = () => __awaiter(void 0, void 0, void 0, function* () {
@@ -31,7 +33,7 @@ exports.closeBrowser = closeBrowser;
 const launchBrowser = () => __awaiter(void 0, void 0, void 0, function* () {
     const opt = {
         defaultViewport: { height: 1000, width: 500 },
-        headless: true,
+        headless: !(__1.globalargs === null || __1.globalargs === void 0 ? void 0 : __1.globalargs.verbose),
         ignoreHTTPSErrors: true,
         devtools: false,
     };
@@ -61,7 +63,7 @@ const goToPage = (url) => __awaiter(void 0, void 0, void 0, function* () {
         const page = yield browser.newPage();
         yield page.goto(url, {
             waitUntil: ['networkidle2'],
-            timeout: 10000,
+            timeout: config_1.timeoutMs,
         });
         return page;
     }
@@ -79,13 +81,13 @@ function getMFA(p) {
         (0, log_1.info)('start mfa');
         const page = yield (0, exports.goToPage)(p.verificationUriComplete);
         (0, log_1.info)('username block');
-        yield page.waitForSelector('#username-input');
+        yield page.waitForSelector('#username-input', { timeout: config_1.timeoutMs });
         yield page.focus('#username-input input');
         yield page.keyboard.type(p.creds.username);
         yield page.$eval('#username-submit-button button', (el) => el.click());
         //
         (0, log_1.info)('password block');
-        yield page.waitForSelector('#password-input');
+        yield page.waitForSelector('#password-input', { timeout: config_1.timeoutMs });
         yield page.focus('#password-input input');
         yield page.keyboard.type(p.creds.password);
         yield page.$eval('#password-submit-button button', (el) => el.click());
@@ -94,7 +96,7 @@ function getMFA(p) {
         //
         try {
             const messageDiv = yield page.waitForSelector('.awsui-alert-message', {
-                timeout: 2000,
+                timeout: 2000, //can be short
             });
             const value = yield page.evaluate((el) => { var _a; return (_a = el === null || el === void 0 ? void 0 : el.textContent) !== null && _a !== void 0 ? _a : ''; }, messageDiv);
             if (value) {
@@ -114,7 +116,7 @@ function getMFA(p) {
         do {
             (0, log_1.info)('mfa block');
             const { mfa } = (0, input_1.enterMFA)();
-            yield page.waitForSelector('#input-0');
+            yield page.waitForSelector('#input-0', { timeout: config_1.timeoutMs });
             yield page.focus('#input-0 input');
             yield page.keyboard.type(mfa);
             yield page.$eval('.awsui-signin-button-container button', (el) => el.click());
@@ -123,7 +125,7 @@ function getMFA(p) {
                 yield (0, sleep_1.sleep)(250);
                 yield page.waitForNetworkIdle({ idleTime: 250 });
                 const messageDiv = yield page.waitForSelector('.awsui-alert-message', {
-                    timeout: 2000,
+                    timeout: 2000, // can be short
                 });
                 const value = yield page.evaluate((el) => { var _a; return (_a = el === null || el === void 0 ? void 0 : el.textContent) !== null && _a !== void 0 ? _a : ''; }, messageDiv);
                 if (value) {
@@ -145,11 +147,13 @@ function getMFA(p) {
         //
         yield (0, sleep_1.sleep)(3000);
         yield page.waitForNetworkIdle({ idleTime: 250 });
-        yield page.waitForSelector('#cli_login_button', { timeout: 5000 });
+        yield page.waitForSelector('#cli_login_button', { timeout: config_1.timeoutMs });
         yield page.$eval('#cli_login_button', (el) => el.click());
         yield (0, sleep_1.sleep)(250);
         yield page.waitForNetworkIdle({ idleTime: 250 });
-        yield page.waitForSelector('.awsui-icon-variant-success', { timeout: 5000 });
+        yield page.waitForSelector('.awsui-icon-variant-success', {
+            timeout: config_1.timeoutMs,
+        });
         (0, log_1.warn)('mfa success');
         const cookies = yield (page === null || page === void 0 ? void 0 : page.cookies());
         const ssoAuthn = (_a = cookies === null || cookies === void 0 ? void 0 : cookies.find((c) => c.name === 'x-amz-sso_authn')) === null || _a === void 0 ? void 0 : _a.value;

package/dist/helpers/input.js

@@ -52,15 +52,24 @@ function readArguments() {
             type: 'string',
             description: 'Will select account that matches passed in string',
         })
-            .boolean('verbose')
-            .alias('v', 'verbose')
-            .default('verbose', true)
-            .boolean('wipe')
-            .alias('w', 'wipe')
-            .default('wipe', false)
-            .boolean('config')
-            .alias('c', 'config')
-            .default('config', false)
+            .option('verbose', {
+            alias: 'v',
+            type: 'boolean',
+            description: 'Run with verbose logging',
+            default: false,
+        })
+            .option('wipe', {
+            alias: 'w',
+            type: 'boolean',
+            description: 'Clear previously saved session details and quit',
+            default: false,
+        })
+            .option('config', {
+            alias: 'c',
+            type: 'boolean',
+            description: 'Configure application settings',
+            default: false,
+        })
             .parse();
         return { applicationfilter, verbose, wipe, config };
     });

package/dist/helpers/oidc.js

@@ -71,7 +71,7 @@ function requestMFA(p) {
         return {
             accessToken,
             ssoAuthn,
-            region: (0, config_1.identityCenterRegion)(),
+            region: config_1.identityCenterRegion,
             accessKeyId: '',
             secretAccessKey: '',
             sessionToken: '',

package/dist/helpers/sso.js

@@ -22,7 +22,7 @@ const awsconfig_1 = require("./awsconfig");
 const sts_1 = require("./sts");
 const getAssumedRole = (p) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b, _c, _d;
-    const sso = new client_sso_1.SSOClient({ region: (0, config_1.identityCenterRegion)() });
+    const sso = new client_sso_1.SSOClient({ region: config_1.identityCenterRegion });
     let accountId = p.accountId;
     if (!accountId) {
         const accounts = yield sso.send(new client_sso_1.ListAccountsCommand({ accessToken: p.accessToken }));
@@ -50,7 +50,7 @@ const getAssumedRole = (p) => __awaiter(void 0, void 0, void 0, function* () {
 });
 exports.getAssumedRole = getAssumedRole;
 const getOIDCCredentialsFromAccessToken = (p) => __awaiter(void 0, void 0, void 0, function* () {
-    const sso = new client_sso_1.SSOClient({ region: (0, config_1.identityCenterRegion)() });
+    const sso = new client_sso_1.SSOClient({ region: config_1.identityCenterRegion });
     const role = yield (0, exports.getAssumedRole)({ accessToken: p.accessToken });
     const ssoResp = yield sso.send(new client_sso_1.GetRoleCredentialsCommand(Object.assign(Object.assign({}, role), { accessToken: p.accessToken })));
     const rc = ssoResp.roleCredentials;
@@ -60,12 +60,12 @@ const getOIDCCredentialsFromAccessToken = (p) => __awaiter(void 0, void 0, void
         !(rc === null || rc === void 0 ? void 0 : rc.sessionToken)) {
         throw new Error('role creds undefined:' + JSON.stringify(rc, null, 2));
     }
-    return Object.assign(Object.assign({}, p), { accessKeyId: rc.accessKeyId, secretAccessKey: rc.secretAccessKey, sessionToken: rc.sessionToken, region: (0, config_1.identityCenterRegion)() });
+    return Object.assign(Object.assign({}, p), { accessKeyId: rc.accessKeyId, secretAccessKey: rc.secretAccessKey, sessionToken: rc.sessionToken, region: config_1.identityCenterRegion });
 });
 exports.getOIDCCredentialsFromAccessToken = getOIDCCredentialsFromAccessToken;
 function appInstances(p) {
     return __awaiter(this, void 0, void 0, function* () {
-        const ai = (yield (yield (0, node_fetch_1.default)(`https://portal.sso.${(0, config_1.identityCenterRegion)()}.amazonaws.com/instance/appinstances`, { headers: { 'x-amz-sso_bearer_token': p.ssoAuthn } })).json());
+        const ai = (yield (yield (0, node_fetch_1.default)(`https://portal.sso.${config_1.identityCenterRegion}.amazonaws.com/instance/appinstances`, { headers: { 'x-amz-sso_bearer_token': p.ssoAuthn } })).json());
         if (!(ai === null || ai === void 0 ? void 0 : ai.result)) {
             throw new Error('appinstance error' + JSON.stringify(ai, null, 2));
         }
@@ -76,7 +76,7 @@ exports.appInstances = appInstances;
 function getSamlAssertion(p, instance) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
-        const det = (yield (yield (0, node_fetch_1.default)(`https://portal.sso.${(0, config_1.identityCenterRegion)()}.amazonaws.com/instance/appinstance/${instance.id}/profiles`, { headers: { 'x-amz-sso_bearer_token': p.ssoAuthn } })).json());
+        const det = (yield (yield (0, node_fetch_1.default)(`https://portal.sso.${config_1.identityCenterRegion}.amazonaws.com/instance/appinstance/${instance.id}/profiles`, { headers: { 'x-amz-sso_bearer_token': p.ssoAuthn } })).json());
         const asserturl = (_b = (_a = det === null || det === void 0 ? void 0 : det.result) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.url;
         if (!asserturl) {
             throw new Error('assertion url cant be found');
@@ -105,7 +105,7 @@ const tryExistingCredentials = () => __awaiter(void 0, void 0, void 0, function*
         sessionToken: credraw.default.aws_session_token,
         accessToken: credraw.default.aws_access_token,
         ssoAuthn: credraw.default.aws_sso_authn,
-        region: (0, config_1.identityCenterRegion)(),
+        region: config_1.identityCenterRegion,
     };
     const v = yield (0, sts_1.validateCredentials)(credentials);
     if (v) {
@@ -128,7 +128,7 @@ const tryExistingCredentials = () => __awaiter(void 0, void 0, void 0, function*
     return {
         accessToken: '',
         ssoAuthn: '',
-        region: (0, config_1.identityCenterRegion)(),
+        region: config_1.identityCenterRegion,
         accessKeyId: '',
         secretAccessKey: '',
         sessionToken: '',

package/dist/index.d.ts

@@ -1,3 +1,4 @@
 import { IApplicationArgs } from './types';
+export declare let globalargs: IApplicationArgs | undefined;
 export declare function main(args: IApplicationArgs): Promise<void>;
 export declare function run(): Promise<void>;

package/dist/index.js

@@ -12,23 +12,31 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.run = exports.main = void 0;
+exports.run = exports.main = exports.globalargs = void 0;
 /* eslint-disable padding-line-between-statements */
 const log_1 = require("ag-common/dist/common/helpers/log");
 const dotenv_1 = require("dotenv");
 const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
 const config_1 = require("./config");
 const awsconfig_1 = require("./helpers/awsconfig");
 const input_1 = require("./helpers/input");
 const oidc_1 = require("./helpers/oidc");
 const sso_1 = require("./helpers/sso");
 const sts_1 = require("./helpers/sts");
-(0, dotenv_1.config)();
+if (__dirname.endsWith('dist')) {
+    (0, config_1.setBasePath)(path_1.default.resolve(__dirname, '../'));
+}
+else {
+    (0, config_1.setBasePath)(__dirname);
+}
+(0, dotenv_1.config)({ path: config_1.basePath + '/.env' });
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const beep = require('node-beep');
 function main(args) {
     return __awaiter(this, void 0, void 0, function* () {
-        (0, log_1.SetLogLevel)(args.verbose ? 'INFO' : 'WARN');
+        exports.globalargs = args;
+        (0, log_1.SetLogLevel)(args.verbose ? 'TRACE' : 'WARN');
         (0, log_1.SetLogShim)((...a1) => {
             // eslint-disable-next-line no-console
             console.log(...a1);
@@ -44,22 +52,23 @@ function main(args) {
             (0, config_1.runConfig)();
             return;
         }
-        if (!(0, config_1.validateConfig)()) {
-            console.error('please run config (-c)');
-            return;
-        }
         if (args.wipe) {
             (0, log_1.info)('wiping args');
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             yield (0, awsconfig_1.updateAwsCredentials)(undefined);
             return;
         }
+        if (!(0, config_1.validateConfig)()) {
+            // eslint-disable-next-line no-console
+            console.error('please run config (-c)');
+            return;
+        }
         let credentials = yield (0, sso_1.tryExistingCredentials)();
         if (!(credentials === null || credentials === void 0 ? void 0 : credentials.accessToken) || !(credentials === null || credentials === void 0 ? void 0 : credentials.ssoAuthn)) {
             (0, log_1.info)('no creds, get access token through manual sign in');
             credentials = yield (0, oidc_1.requestMFA)({
-                identityCenterRegion: (0, config_1.identityCenterRegion)(),
-                ssoStartUrl: (0, config_1.ssoStartUrl)(),
+                identityCenterRegion: config_1.identityCenterRegion,
+                ssoStartUrl: config_1.ssoStartUrl,
             });
             (0, log_1.info)('get oidc creds');
             credentials = yield (0, sso_1.getOIDCCredentialsFromAccessToken)(credentials);
@@ -75,7 +84,7 @@ function main(args) {
             (0, log_1.info)('account is native aws, directly  connecting');
             credentials = yield (0, sts_1.directStsAssume)({
                 credentials,
-                targetRegion: (0, config_1.targetRegion)(),
+                targetRegion: config_1.targetRegion,
                 metadata: instance.searchMetadata,
             });
             debugRole = instance.searchMetadata.AccountId;
@@ -83,7 +92,7 @@ function main(args) {
         else {
             (0, log_1.info)('account is external app, getting saml');
             const samlDetails = yield (0, sso_1.getSamlAssertion)(credentials, instance);
-            credentials = yield (0, sts_1.getApplicationCreds)(Object.assign(Object.assign({}, samlDetails), { originCreds: credentials, targetRegion: (0, config_1.targetRegion)() }));
+            credentials = yield (0, sts_1.getApplicationCreds)(Object.assign(Object.assign({}, samlDetails), { originCreds: credentials, targetRegion: config_1.targetRegion }));
             debugRole = samlDetails.roleArn;
         }
         yield (0, awsconfig_1.updateAwsCredentials)(credentials);

package/package.json

@@ -5,7 +5,7 @@
   "author": "andrei gec (andreigec@hotmail.com)",
   "license": "ISC",
   "private": false,
-  "version": "0.0.2",
+  "version": "0.0.5",
   "preferGlobal": true,
   "bin": {
     "ag-awsauth": "./bin/awsauth.js"
@@ -17,10 +17,10 @@
     "LICENSE.md"
   ],
   "dependencies": {
-    "@aws-sdk/client-sso": "3.271.0",
-    "@aws-sdk/client-sso-oidc": "3.271.0",
-    "@aws-sdk/client-sts": "3.271.0",
-    "@aws-sdk/shared-ini-file-loader": "3.271.0",
+    "@aws-sdk/client-sso": "3.272.0",
+    "@aws-sdk/client-sso-oidc": "3.272.0",
+    "@aws-sdk/client-sts": "3.272.0",
+    "@aws-sdk/shared-ini-file-loader": "3.272.0",
     "ag-common": "0.0.412",
     "cli-select": "1.1.2",
     "dotenv": "16.0.3",
@@ -30,15 +30,15 @@
     "ini": "3.0.1",
     "node-beep": "0.0.3",
     "node-fetch": "2.6.9",
-    "puppeteer": "19.7.0",
+    "puppeteer": "19.7.1",
     "readline-sync": "1.4.10",
     "ts-node": "10.9.1",
     "typescript": "4.9.5",
-    "yargs": "17.6.2"
+    "yargs": "17.7.0"
   },
   "devDependencies": {
     "@types/ini": "1.3.31",
-    "@types/node": "18.13.0",
+    "@types/node": "18.14.0",
     "@types/node-fetch": "2.6.2",
     "@types/readline-sync": "1.4.4",
     "@types/yargs": "17.0.22"
@@ -52,7 +52,7 @@
   "scripts": {
     "format": "eslint --ext .ts,.tsx ./src --fix",
     "lint": "tsc && eslint --ext .ts,.tsx ./src",
-    "start": "ts-node src/direct.ts",
+    "start": "tsc && node bin/awsauth.js",
     "build": "tsc"
   }
 }