Merge pull request #26 from trycourier/bryan/adding-all

adding all to users:jwt

source/commands/UserToken.tsx

@@ -1,16 +1,16 @@
-import {Text} from 'ink';
+import {Box, Text} from 'ink';
 import _ from 'lodash';
 import React, {useEffect, useState} from 'react';
 import {useBoolean} from 'usehooks-ts';
 import {useCliContext} from '../components/Context.js';
 import Spinner from '../components/Spinner.js';
 import UhOh from '../components/UhOh.js';
-import {stdout} from 'process';
 
 interface IParams {
 	_: string[];
 	scopes?: string;
 	expiration?: string | number;
+	all?: boolean;
 }
 
 const VALID_SCOPE_PREFIXES = [
@@ -25,14 +25,19 @@ const VALID_SCOPE_PREFIXES = [
 	'write:preferences',
 ];
 
+const ALL = VALID_SCOPE_PREFIXES.filter(s => !s.endsWith('brand'));
+
 const UserToken = () => {
 	const {parsedParams, getJWT} = useCliContext();
 	const running = useBoolean(true);
 	const [jwt, setJWT] = useState<string>();
+	const [final_scopes, setFinalScopes] = useState<string[]>([]);
 	const [error, setError] = useState<string | undefined>();
+
 	const {
 		expiration,
 		scopes,
+		all,
 		_: [user_id],
 	} = parsedParams as IParams;
 
@@ -42,11 +47,13 @@ const UserToken = () => {
 
 	const getUserJWT = async () => {
 		const exp = Number(expiration);
-		const sc = (scopes?.split(',') || []).map(s => s.trim());
+
+		const scope_input = scopes?.split(',') || [];
+		const sc = [...new Set([...scope_input, ...(all ? ALL : [])])];
 		const invalid_scopes = sc.filter(
 			scope => !_.some(VALID_SCOPE_PREFIXES, val => scope.startsWith(val)),
 		);
-
+		setFinalScopes([`user_id:${user_id}`, ...sc]);
 		if (!user_id) {
 			setError('No User Specified');
 		} else if (!(sc && sc.length)) {
@@ -75,8 +82,31 @@ const UserToken = () => {
 	} else if (running.value) {
 		return <Spinner text={`Fetching JWT`} />;
 	} else {
-		stdout.write(jwt ?? '');
-		return <Text>{jwt}</Text>;
+		return (
+			<>
+				<Text>Token has the following scopes:</Text>
+				<Text>{final_scopes.join(' ')}</Text>
+				<Box
+					flexDirection="column"
+					marginY={1}
+					borderColor="gray"
+					borderStyle={'single'}
+					borderTop={false}
+					borderLeft={false}
+					borderRight={false}
+				></Box>
+				<Text>{jwt}</Text>
+				<Box
+					flexDirection="column"
+					marginY={1}
+					borderColor="gray"
+					borderStyle={'single'}
+					borderBottom={false}
+					borderLeft={false}
+					borderRight={false}
+				></Box>
+			</>
+		);
 	}
 };
 

source/components/Version.tsx

@@ -6,7 +6,7 @@ import {useCliContext} from './Context.js';
 import constants from '../constants.js';
 
 const Version = () => {
-	const {version, setVersion, map} = useCliContext();
+	const {version, setVersion, map, parsedParams} = useCliContext();
 	useEffect(() => {
 		getVersion();
 	}, []);
@@ -37,7 +37,7 @@ const Version = () => {
 			: undefined;
 
 	if (version_text?.length) {
-		if (map === 'upgrade') {
+		if (map === 'upgrade' || _.get(parsedParams, ['quiet'], false)) {
 			return <></>;
 		} else {
 			return (

source/mappings.tsx

@@ -574,7 +574,11 @@ mappings.set('users:jwt', {
 		{
 			option: '--scopes',
 			value:
-				'Required. The scopes to attach to the JWT. We will provide the user_id scope automatically, all others will be comma seperated (https://www.courier.com/docs/reference/auth/issue-token/#available-scopes).',
+				'Required if not using all. The scopes to attach to the JWT. We will provide the user_id scope automatically, all others will be comma seperated (https://www.courier.com/docs/reference/auth/issue-token/#available-scopes).',
+		},
+		{
+			option: '--all',
+			value: 'Include all scopes besides brand scopes.',
 		},
 		{
 			option: '--expiration',