ag-awsauth 0.0.281 → 0.0.285

package/dist/helpers/awsconfig.d.ts

@@ -1,3 +1,5 @@
 import type { IAwsCreds, IAwsCredsRaw } from '../types';
 export declare const getAwsCredentials: () => Promise<Record<string, IAwsCredsRaw>>;
 export declare const updateAwsCredentials: (p: IAwsCreds | undefined) => Promise<void>;
+export declare const getLastSite: () => Promise<string | undefined>;
+export declare const setLastSite: (siteName: string) => Promise<void>;

package/dist/helpers/awsconfig.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateAwsCredentials = exports.getAwsCredentials = void 0;
+exports.setLastSite = exports.getLastSite = exports.updateAwsCredentials = exports.getAwsCredentials = void 0;
 const shared_ini_file_loader_1 = require("@aws-sdk/shared-ini-file-loader");
 const log_1 = require("ag-common/dist/common/helpers/log");
 const fs_1 = __importDefault(require("fs"));
@@ -50,3 +50,16 @@ const updateAwsCredentials = (p) => __awaiter(void 0, void 0, void 0, function*
     fs_1.default.writeFileSync(credspath, newcreds);
 });
 exports.updateAwsCredentials = updateAwsCredentials;
+const getLastSite = () => __awaiter(void 0, void 0, void 0, function* () {
+    const creds = yield (0, exports.getAwsCredentials)();
+    return creds.default.last_site;
+});
+exports.getLastSite = getLastSite;
+const setLastSite = (siteName) => __awaiter(void 0, void 0, void 0, function* () {
+    const creds = yield (0, exports.getAwsCredentials)();
+    creds.default.last_site = siteName;
+    const newcreds = (0, ini_1.stringify)(creds);
+    const credspath = (0, getCredentialsFilepath_1.getCredentialsFilepath)();
+    fs_1.default.writeFileSync(credspath, newcreds);
+});
+exports.setLastSite = setLastSite;

package/dist/helpers/browser.js

@@ -128,7 +128,7 @@ function getMFA(p) {
         }
         catch (e) {
             const em = e.toString();
-            if (!em.includes('exceeded')) {
+            if (!em.includes('exceeded') && !em.includes('Waiting for selector')) {
                 const em2 = `creds error:` + em;
                 (0, log_1.error)(em2);
                 throw new Error(em2);

package/dist/helpers/sso.d.ts

@@ -12,6 +12,7 @@ export declare const getOIDCCredentialsFromAccessToken: (p: {
 }) => Promise<IAwsCreds>;
 export declare function appInstances(p: {
     ssoAuthn: string;
+    lastSite?: string;
 }): Promise<IAppInstance[]>;
 export declare function getSamlAssertion(p: IAwsCreds, instance: IAppInstance): Promise<{
     samlAssertion: string;

package/dist/helpers/sso.js

@@ -72,7 +72,16 @@ function appInstances(p) {
         if (!ai.result) {
             throw new Error('appinstance error' + JSON.stringify(ai, null, 2));
         }
-        return ai.result.sort((a, b) => (a.name < b.name ? -1 : 1));
+        // Sort alphabetically first, then move last_site to top if it exists
+        const sorted = ai.result.sort((a, b) => (a.name < b.name ? -1 : 1));
+        if (p.lastSite) {
+            const lastSiteIndex = sorted.findIndex((a) => a.name === p.lastSite);
+            if (lastSiteIndex > 0) {
+                const [lastSiteItem] = sorted.splice(lastSiteIndex, 1);
+                sorted.unshift(lastSiteItem);
+            }
+        }
+        return sorted;
     });
 }
 function getSamlAssertion(p, instance) {

package/dist/index.js

@@ -80,8 +80,11 @@ function main(args) {
         (0, log_1.info)('save aws creds to file');
         yield (0, awsconfig_1.updateAwsCredentials)(credentials);
         (0, log_1.info)('get app instances and display');
-        const instances = yield (0, sso_1.appInstances)(credentials);
+        const lastSite = yield (0, awsconfig_1.getLastSite)();
+        const instances = yield (0, sso_1.appInstances)(Object.assign(Object.assign({}, credentials), { lastSite }));
         const instance = yield (0, input_1.chooseAppInstance)(instances, args);
+        // Save the selected site as last_site for next run
+        yield (0, awsconfig_1.setLastSite)(instance.name);
         let debugRole = '';
         if (instance.searchMetadata) {
             (0, log_1.info)('account is native aws, directly  connecting');

package/dist/types.d.ts

@@ -14,6 +14,7 @@ export interface IAwsCredsRaw {
     aws_access_token: string;
     aws_sso_authn: string;
     aws_application_id: string;
+    last_site: string;
 }
 export interface IAppInstances {
     result: IAppInstance[];

package/package.json

@@ -5,14 +5,8 @@
   "author": "andreigec@hotmail.com",
   "license": "ISC",
   "private": false,
-  "version": "0.0.281",
+  "version": "0.0.285",
   "preferGlobal": true,
-  "scripts": {
-    "lint": "next lint",
-    "format": "eslint src --fix",
-    "start": "tsc && node bin/awsauth.js",
-    "build": "tsc"
-  },
   "bin": {
     "ag-awsauth": "./bin/awsauth.js"
   },
@@ -23,28 +17,28 @@
     "LICENSE.md"
   ],
   "dependencies": {
-    "@aws-sdk/client-sso": "3.879.0",
-    "@aws-sdk/client-sso-oidc": "3.879.0",
-    "@aws-sdk/client-sts": "3.879.0",
+    "@aws-sdk/client-sso": "3.972.0",
+    "@aws-sdk/client-sso-oidc": "3.972.0",
+    "@aws-sdk/client-sts": "3.972.0",
     "@aws-sdk/shared-ini-file-loader": "3.374.0",
-    "ag-common": "0.0.769",
+    "ag-common": "0.0.861",
     "cli-select": "1.1.2",
-    "dotenv": "17.2.1",
+    "dotenv": "17.2.3",
     "envfile": "7.1.0",
-    "eslint-config-e7npm": "0.1.25",
+    "eslint-config-e7npm": "0.1.31",
     "ini": "5.0.0",
     "node-fetch": "3.3.2",
-    "puppeteer": "24.18.0",
+    "puppeteer": "24.35.0",
     "readline-sync": "1.4.10",
-    "typescript": "5.9.2",
+    "typescript": "5.9.3",
     "yargs": "18.0.0"
   },
   "devDependencies": {
     "@types/ini": "4.1.1",
-    "@types/node": "24.3.0",
+    "@types/node": "24.10.9",
     "@types/node-fetch": "2.6.13",
     "@types/readline-sync": "1.4.8",
-    "@types/yargs": "17.0.33"
+    "@types/yargs": "17.0.35"
   },
   "resolutions": {
     "ws": ">=8.17.1"
@@ -54,5 +48,11 @@
     "yarn": "use pnpm",
     "npm": "use pnpm",
     "pnpm": ">=8"
+  },
+  "scripts": {
+    "lint": "eslint src",
+    "format": "eslint src --fix",
+    "start": "tsc && node bin/awsauth.js",
+    "build": "tsc"
   }
-}
+}