Skip to content

Commit afaebf6

Browse files
Merge pull request #4796 from lohxt1/collection_auth_default_values_issue
fix: collection auth default value access fix and validations
2 parents e7dd78e + 6e89001 commit afaebf6

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

packages/bruno-app/src/components/CollectionSettings/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ const CollectionSettings = ({ collection }) => {
4949
const requestVars = get(collection, 'root.request.vars.req', []);
5050
const responseVars = get(collection, 'root.request.vars.res', []);
5151
const activeVarsCount = requestVars.filter((v) => v.enabled).length + responseVars.filter((v) => v.enabled).length;
52-
const auth = get(collection, 'root.request.auth', {}).mode;
52+
const authMode = get(collection, 'root.request.auth', {}).mode || 'none';
5353

5454
const proxyConfig = get(collection, 'brunoConfig.proxy', {});
5555
const clientCertConfig = get(collection, 'brunoConfig.clientCertificates.certs', []);
@@ -155,7 +155,7 @@ const CollectionSettings = ({ collection }) => {
155155
</div>
156156
<div className={getTabClassname('auth')} role="tab" onClick={() => setTab('auth')}>
157157
Auth
158-
{auth !== 'none' && <ContentIndicator />}
158+
{authMode !== 'none' && <ContentIndicator />}
159159
</div>
160160
<div className={getTabClassname('script')} role="tab" onClick={() => setTab('script')}>
161161
Script

packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ const resolveInheritedAuth = (item, collection) => {
3636
const requestTreePath = getTreePathFromCollectionToItem(collection, item.uid);
3737

3838
// Default to collection auth
39-
const collectionAuth = get(collection, 'root.request.auth');
39+
const collectionAuth = get(collection, 'root.request.auth', { mode: 'none' });
4040
let effectiveAuth = collectionAuth;
4141
let source = 'collection';
4242

packages/bruno-lang/v2/src/collectionBruToJson.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ const sem = grammar.createSemantics().addAttribute('ast', {
163163

164164
return {
165165
auth: {
166-
mode: auth ? auth.mode : 'none'
166+
mode: auth?.mode || 'none'
167167
}
168168
};
169169
},

0 commit comments

Comments
 (0)