Skip to content

Commit ee3b5cf

Browse files
Mateusz Pietrygapietrygamat
Mateusz Pietryga
authored and
pietrygamat
committed
OAuth2: Implement OAuth 2.0 Implicit Grant
usebruno#2056
1 parent 2621c38 commit ee3b5cf

File tree

21 files changed

+498
-28
lines changed

21 files changed

+498
-28
lines changed

Diff for: ‎packages/bruno-app/src/components/CollectionSettings/Auth/OAuth2/GrantTypeSelector/index.js

+9
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,15 @@ const GrantTypeSelector = ({ collection }) => {
9090
>
9191
Client Credentials
9292
</div>
93+
<div
94+
className="dropdown-item"
95+
onClick={() => {
96+
dropdownTippyRef.current.hide();
97+
onGrantTypeChange('implicit');
98+
}}
99+
>
100+
Implicit
101+
</div>
93102
</Dropdown>
94103
</div>
95104
</StyledWrapper>

Diff for: ‎packages/bruno-app/src/components/CollectionSettings/Auth/OAuth2/Implicit/StyledWrapper.js

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import styled from 'styled-components';
2+
3+
const Wrapper = styled.div`
4+
label {
5+
font-size: 0.8125rem;
6+
}
7+
.single-line-editor-wrapper {
8+
max-width: 400px;
9+
padding: 0.15rem 0.4rem;
10+
border-radius: 3px;
11+
border: solid 1px ${(props) => props.theme.input.border};
12+
background-color: ${(props) => props.theme.input.bg};
13+
}
14+
`;
15+
16+
export default Wrapper;

Diff for: ‎packages/bruno-app/src/components/CollectionSettings/Auth/OAuth2/Implicit/index.js

+87
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
import React from 'react';
2+
import get from 'lodash/get';
3+
import { useTheme } from 'providers/Theme';
4+
import { useDispatch } from 'react-redux';
5+
import SingleLineEditor from 'components/SingleLineEditor';
6+
import { saveCollectionRoot, sendCollectionOauth2Request } from 'providers/ReduxStore/slices/collections/actions';
7+
import StyledWrapper from './StyledWrapper';
8+
import { inputsConfig } from './inputsConfig';
9+
import { updateCollectionAuth } from 'providers/ReduxStore/slices/collections/index';
10+
import { clearOauth2Cache } from 'utils/network';
11+
import toast from 'react-hot-toast';
12+
13+
const OAuth2Implicit = ({ item, collection }) => {
14+
const dispatch = useDispatch();
15+
const { storedTheme } = useTheme();
16+
17+
const oAuth = get(collection, 'root.request.auth.oauth2', {});
18+
19+
const handleRun = async () => {
20+
dispatch(sendCollectionOauth2Request(collection.uid));
21+
};
22+
23+
const handleSave = () => dispatch(saveCollectionRoot(collection.uid));
24+
25+
const { callbackUrl, authorizationUrl, clientId, scope, state } = oAuth;
26+
27+
const handleChange = (key, value) => {
28+
dispatch(
29+
updateCollectionAuth({
30+
mode: 'oauth2',
31+
collectionUid: collection.uid,
32+
content: {
33+
grantType: 'implicit',
34+
callbackUrl,
35+
authorizationUrl,
36+
clientId,
37+
scope,
38+
state,
39+
[key]: value
40+
}
41+
})
42+
);
43+
};
44+
45+
const handleClearCache = (e) => {
46+
clearOauth2Cache(collection?.uid)
47+
.then(() => {
48+
toast.success('cleared cache successfully');
49+
})
50+
.catch((err) => {
51+
toast.error(err.message);
52+
});
53+
};
54+
55+
return (
56+
<StyledWrapper className="mt-2 flex w-full gap-4 flex-col">
57+
{inputsConfig.map((input) => {
58+
const { key, label } = input;
59+
return (
60+
<div className="flex flex-col w-full gap-1" key={`input-${key}`}>
61+
<label className="block font-medium">{label}</label>
62+
<div className="single-line-editor-wrapper">
63+
<SingleLineEditor
64+
value={oAuth[key] || ''}
65+
theme={storedTheme}
66+
onSave={handleSave}
67+
onChange={(val) => handleChange(key, val)}
68+
onRun={handleRun}
69+
collection={collection}
70+
/>
71+
</div>
72+
</div>
73+
);
74+
})}
75+
<div className="flex flex-row gap-4">
76+
<button onClick={handleRun} className="submit btn btn-sm btn-secondary w-fit">
77+
Get Access Token
78+
</button>
79+
<button onClick={handleClearCache} className="submit btn btn-sm btn-secondary w-fit">
80+
Clear Cache
81+
</button>
82+
</div>
83+
</StyledWrapper>
84+
);
85+
};
86+
87+
export default OAuth2Implicit;

Diff for: ‎packages/bruno-app/src/components/CollectionSettings/Auth/OAuth2/Implicit/inputsConfig.js

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
const inputsConfig = [
2+
{
3+
key: 'callbackUrl',
4+
label: 'Callback URL'
5+
},
6+
{
7+
key: 'authorizationUrl',
8+
label: 'Authorization URL'
9+
},
10+
{
11+
key: 'clientId',
12+
label: 'Client ID'
13+
},
14+
{
15+
key: 'scope',
16+
label: 'Scope'
17+
},
18+
{
19+
key: 'state',
20+
label: 'State'
21+
}
22+
];
23+
24+
export { inputsConfig };

Diff for: ‎packages/bruno-app/src/components/CollectionSettings/Auth/OAuth2/index.js

+4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import GrantTypeSelector from './GrantTypeSelector/index';
55
import OAuth2PasswordCredentials from './PasswordCredentials/index';
66
import OAuth2AuthorizationCode from './AuthorizationCode/index';
77
import OAuth2ClientCredentials from './ClientCredentials/index';
8+
import OAuth2Implicit from './Implicit/index';
89

910
const grantTypeComponentMap = (grantType, collection) => {
1011
switch (grantType) {
@@ -17,6 +18,9 @@ const grantTypeComponentMap = (grantType, collection) => {
1718
case 'client_credentials':
1819
return <OAuth2ClientCredentials collection={collection} />;
1920
break;
21+
case 'implicit':
22+
return <OAuth2Implicit collection={collection} />;
23+
break;
2024
default:
2125
return <div>TBD</div>;
2226
break;

Diff for: ‎packages/bruno-app/src/components/RequestPane/Auth/OAuth2/GrantTypeSelector/index.js

+9
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,15 @@ const GrantTypeSelector = ({ item, collection }) => {
8484
>
8585
Client Credentials
8686
</div>
87+
<div
88+
className="dropdown-item"
89+
onClick={() => {
90+
dropdownTippyRef.current.hide();
91+
onGrantTypeChange('implicit');
92+
}}
93+
>
94+
Implicit
95+
</div>
8796
</Dropdown>
8897
</div>
8998
</StyledWrapper>

Diff for: ‎packages/bruno-app/src/components/RequestPane/Auth/OAuth2/Implicit/StyledWrapper.js

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import styled from 'styled-components';
2+
3+
const Wrapper = styled.div`
4+
label {
5+
font-size: 0.8125rem;
6+
}
7+
.single-line-editor-wrapper {
8+
max-width: 400px;
9+
padding: 0.15rem 0.4rem;
10+
border-radius: 3px;
11+
border: solid 1px ${(props) => props.theme.input.border};
12+
background-color: ${(props) => props.theme.input.bg};
13+
}
14+
`;
15+
16+
export default Wrapper;

Diff for: ‎packages/bruno-app/src/components/RequestPane/Auth/OAuth2/Implicit/index.js

+87
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
import React from 'react';
2+
import get from 'lodash/get';
3+
import { useTheme } from 'providers/Theme';
4+
import { useDispatch } from 'react-redux';
5+
import SingleLineEditor from 'components/SingleLineEditor';
6+
import { updateAuth } from 'providers/ReduxStore/slices/collections';
7+
import { saveRequest, sendRequest } from 'providers/ReduxStore/slices/collections/actions';
8+
import StyledWrapper from './StyledWrapper';
9+
import { inputsConfig } from './inputsConfig';
10+
import { clearOauth2Cache } from 'utils/network/index';
11+
import toast from 'react-hot-toast';
12+
13+
const OAuth2Implicit = ({ item, collection }) => {
14+
const dispatch = useDispatch();
15+
const { storedTheme } = useTheme();
16+
17+
const oAuth = item.draft ? get(item, 'draft.request.auth.oauth2', {}) : get(item, 'request.auth.oauth2', {});
18+
19+
const handleRun = async () => {
20+
dispatch(sendRequest(item, collection.uid));
21+
};
22+
23+
const handleSave = () => dispatch(saveRequest(item.uid, collection.uid));
24+
25+
const { callbackUrl, authorizationUrl, clientId, scope } = oAuth;
26+
27+
const handleChange = (key, value) => {
28+
dispatch(
29+
updateAuth({
30+
mode: 'oauth2',
31+
collectionUid: collection.uid,
32+
itemUid: item.uid,
33+
content: {
34+
grantType: 'implicit',
35+
callbackUrl,
36+
authorizationUrl,
37+
clientId,
38+
scope,
39+
[key]: value
40+
}
41+
})
42+
);
43+
};
44+
45+
const handleClearCache = (e) => {
46+
clearOauth2Cache(collection?.uid)
47+
.then(() => {
48+
toast.success('cleared cache successfully');
49+
})
50+
.catch((err) => {
51+
toast.error(err.message);
52+
});
53+
};
54+
55+
return (
56+
<StyledWrapper className="mt-2 flex w-full gap-4 flex-col">
57+
{inputsConfig.map((input) => {
58+
const { key, label } = input;
59+
return (
60+
<div className="flex flex-col w-full gap-1" key={`input-${key}`}>
61+
<label className="block font-medium">{label}</label>
62+
<div className="single-line-editor-wrapper">
63+
<SingleLineEditor
64+
value={oAuth[key] || ''}
65+
theme={storedTheme}
66+
onSave={handleSave}
67+
onChange={(val) => handleChange(key, val)}
68+
onRun={handleRun}
69+
collection={collection}
70+
/>
71+
</div>
72+
</div>
73+
);
74+
})}
75+
<div className="flex flex-row gap-4">
76+
<button onClick={handleRun} className="submit btn btn-sm btn-secondary w-fit">
77+
Get Access Token
78+
</button>
79+
<button onClick={handleClearCache} className="submit btn btn-sm btn-secondary w-fit">
80+
Clear Cache
81+
</button>
82+
</div>
83+
</StyledWrapper>
84+
);
85+
};
86+
87+
export default OAuth2Implicit;

Diff for: ‎packages/bruno-app/src/components/RequestPane/Auth/OAuth2/Implicit/inputsConfig.js

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
const inputsConfig = [
2+
{
3+
key: 'callbackUrl',
4+
label: 'Callback URL'
5+
},
6+
{
7+
key: 'authorizationUrl',
8+
label: 'Authorization URL'
9+
},
10+
{
11+
key: 'clientId',
12+
label: 'Client ID'
13+
},
14+
{
15+
key: 'scope',
16+
label: 'Scope'
17+
}
18+
];
19+
20+
export { inputsConfig };

Diff for: ‎packages/bruno-app/src/components/RequestPane/Auth/OAuth2/index.js

+4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import GrantTypeSelector from './GrantTypeSelector/index';
55
import OAuth2PasswordCredentials from './PasswordCredentials/index';
66
import OAuth2AuthorizationCode from './AuthorizationCode/index';
77
import OAuth2ClientCredentials from './ClientCredentials/index';
8+
import OAuth2Implicit from './Implicit/index';
89

910
const grantTypeComponentMap = (grantType, item, collection) => {
1011
switch (grantType) {
@@ -17,6 +18,9 @@ const grantTypeComponentMap = (grantType, item, collection) => {
1718
case 'client_credentials':
1819
return <OAuth2ClientCredentials item={item} collection={collection} />;
1920
break;
21+
case 'implicit':
22+
return <OAuth2Implicit item={item} collection={collection} />;
23+
break;
2024
default:
2125
return <div>TBD</div>;
2226
break;

Diff for: ‎packages/bruno-app/src/utils/collections/index.js

+4
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,10 @@ export const humanizeGrantType = (mode) => {
577577
label = 'Client Credentials';
578578
break;
579579
}
580+
case 'implicit': {
581+
label = 'Implicit';
582+
break;
583+
}
580584
}
581585

582586
return label;

0 commit comments

Comments
 (0)