Skip to content

Commit 1bf21ff

Browse files
authored
fix(cli): update login command oauth to handle user region selection (#156)
- Enhanced the login command to prompt the user for a region if not provided when interactive login with token is selected. Closes #155
1 parent 6c36334 commit 1bf21ff

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

packages/cli/src/commands/login/index.ts

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,25 @@ export const loginCommand = program
102102
return value.length > 0;
103103
},
104104
});
105+
106+
let userRegion = region;
107+
if (!userRegion) {
108+
userRegion = await select({
109+
message: 'Please select the region you would like to work in:',
110+
choices: Object.values(regions).map((region: RegionCode) => ({
111+
name: regionNames[region],
112+
value: region,
113+
})),
114+
default: regions.EU,
115+
});
116+
}
105117
spinner.start(`Logging in with token`);
106-
const { user } = await loginWithToken(userToken, region);
118+
const { user } = await loginWithToken(userToken, userRegion);
107119
spinner.succeed();
108-
updateSession(user.email, userToken, region);
109-
await persistCredentials(region);
120+
updateSession(user.email, userToken, userRegion);
121+
await persistCredentials(userRegion);
110122

111-
konsola.ok(`Successfully logged in to region ${chalk.hex(colorPalette.PRIMARY)(`${regionNames[region]} (${region})`)}. Welcome ${chalk.hex(colorPalette.PRIMARY)(user.friendly_name)}.`, true);
123+
konsola.ok(`Successfully logged in to region ${chalk.hex(colorPalette.PRIMARY)(`${regionNames[userRegion]} (${userRegion})`)}. Welcome ${chalk.hex(colorPalette.PRIMARY)(user.friendly_name)}.`, true);
112124
}
113125

114126
else {

0 commit comments

Comments
 (0)