slawek/sk-az-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: streamline session state management using configuration functions

Browse Source
This commit is contained in:
Sławek Koszewski
2026-03-07 15:36:48 +01:00
parent aa6f9e24f8
commit 63029d1119
1 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/azure/pca-auth.ts
View File

@@ -2,10 +2,11 @@
import open, { apps } from "open"; import open, { apps } from "open";
import fs from "node:fs"; import fs from "node:fs";
import { readFile, writeFile, mkdir, unlink } from "node:fs/promises"; import { writeFile, mkdir, unlink } from "node:fs/promises";
import path from "node:path"; import path from "node:path";
import { PublicClientApplication } from "@azure/msal-node"; import { PublicClientApplication } from "@azure/msal-node";
import { getConfig, getConfigDir } from "@slawek/sk-tools";
import type { import type {
AccountInfo, AccountInfo,
AuthenticationResult, AuthenticationResult,
@@ -27,6 +28,7 @@ const LOGIN_REQUIRED_MESSAGE = "Login required. Run: sk-az-tools login";
const BROWSER_KEYWORDS = Object.keys(apps).sort(); const BROWSER_KEYWORDS = Object.keys(apps).sort();
const OPEN_APPS = apps as Record<string, string | readonly string[]>; const OPEN_APPS = apps as Record<string, string | readonly string[]>;
const CHROMIUM_BROWSERS = new Set(["edge", "chrome", "brave"]); const CHROMIUM_BROWSERS = new Set(["edge", "chrome", "brave"]);
const CONFIG_FILE_NAME = "config";
type SessionState = { type SessionState = {
activeAccountUpn: string | null; activeAccountUpn: string | null;
@@ -86,37 +88,26 @@ function getCacheRoot(): string {
: path.join(userRoot, ".config", "sk-az-tools"); : path.join(userRoot, ".config", "sk-az-tools");
} }
function getSessionFilePath(): string {
return path.join(getCacheRoot(), "login-session.json");
}
async function readSessionState(): Promise<SessionState> { async function readSessionState(): Promise<SessionState> {
try { const parsed = (await getConfig("sk-az-tools", CONFIG_FILE_NAME)) as { activeAccountUpn?: unknown };
const sessionJson = await readFile(getSessionFilePath(), "utf8"); return {
const parsed = JSON.parse(sessionJson) as { activeAccountUpn?: unknown }; activeAccountUpn:
return { typeof parsed?.activeAccountUpn === "string"
activeAccountUpn: ? parsed.activeAccountUpn
typeof parsed?.activeAccountUpn === "string" : null,
? parsed.activeAccountUpn };
: null,
};
} catch (err) {
if ((err as { code?: string } | null)?.code === "ENOENT") {
return { activeAccountUpn: null };
}
throw err;
}
} }
async function writeSessionState(state: SessionState): Promise<void> { async function writeSessionState(state: SessionState): Promise<void> {
const sessionPath = getSessionFilePath(); const sessionPath = path.join(getConfigDir("sk-az-tools"), `${CONFIG_FILE_NAME}.json`);
await mkdir(path.dirname(sessionPath), { recursive: true }); await mkdir(path.dirname(sessionPath), { recursive: true });
await writeFile(sessionPath, JSON.stringify(state, null, 2), "utf8"); await writeFile(sessionPath, JSON.stringify(state, null, 2), "utf8");
} }
async function clearSessionState(): Promise<void> { async function clearSessionState(): Promise<void> {
try { try {
await unlink(getSessionFilePath()); const sessionPath = path.join(getConfigDir("sk-az-tools"), `${CONFIG_FILE_NAME}.json`);
await unlink(sessionPath);
} catch (err) { } catch (err) {
if ((err as { code?: string } | null)?.code !== "ENOENT") { if ((err as { code?: string } | null)?.code !== "ENOENT") {
throw err; throw err;