Skip to content

Include client_id in access token cache #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sswatson wants to merge 1 commit into from
Closed

Include client_id in access token cache #59

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions src/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,20 +65,22 @@ function readClientCredentials(configParser: ConfigIniParser, profile: string) {
}
}

const client_id = configParser.get(profile, 'client_id', '');

const config: Config = {
host: configParser.get(profile, 'host', ''),
port: configParser.get(profile, 'port', DEFAULT_PORT),
scheme: configParser.get(profile, 'scheme', DEFAULT_SCHEME),
credentials: new ClientCredentials(
configParser.get(profile, 'client_id', ''),
client_id,
configParser.get(profile, 'client_secret', ''),
configParser.get(
profile,
'client_credentials_url',
DEFAULT_CLIENT_CREDENTIALS_URL,
),
async () => await readTokenCache(profile),
async cache => await writeTokenCache(cache, profile),
async () => await readTokenCache(profile, client_id),
async cache => await writeTokenCache(cache, profile, client_id),
),
};

Expand All @@ -97,12 +99,12 @@ function resolveHome(path: string) {
return path;
}

function makeTokenCachePath(profile: string) {
return resolveHome(`~/.rai/${profile}_cache.json`);
function makeTokenCachePath(profile: string, client_id: string) {
return resolveHome(`~/.rai/${profile}_${client_id}_cache.json`);
}

async function readTokenCache(profile = 'default') {
const cachePath = makeTokenCachePath(profile);
async function readTokenCache(profile = 'default', client_id = '') {
const cachePath = makeTokenCachePath(profile, client_id);

try {
const cachedStr = await readFile(cachePath, 'utf-8');
Expand All @@ -115,8 +117,12 @@ async function readTokenCache(profile = 'default') {
} catch {}
}

async function writeTokenCache(token: AccessTokenCache, profile = 'default') {
const cachePath = makeTokenCachePath(profile);
async function writeTokenCache(
token: AccessTokenCache,
profile = 'default',
client_id = '',
) {
const cachePath = makeTokenCachePath(profile, client_id);
const cacheStr = JSON.stringify(token, null, 2);

await writeFile(cachePath, cacheStr, 'utf-8');
Expand Down