extern/bruno
1
0
Fork 1
mirror of https://github.com/usebruno/bruno.git synced 2025-08-20 21:33:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4796 from lohxt1/collection_auth_default_values_issue

Browse Source 
fix: collection auth default value access fix and validations
This commit is contained in:
maintainer-bruno
2025-05-29 18:28:57 +05:30
committed by GitHub
parent e7dd78ea53 6e89001825
commit afaebf6b3d
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/bruno-app/src/components/CollectionSettings/index.js
View File

@@ -49,7 +49,7 @@ const CollectionSettings = ({ collection }) => {
const requestVars = get(collection, 'root.request.vars.req', []); const requestVars = get(collection, 'root.request.vars.req', []);
const responseVars = get(collection, 'root.request.vars.res', []); const responseVars = get(collection, 'root.request.vars.res', []);
const activeVarsCount = requestVars.filter((v) => v.enabled).length + responseVars.filter((v) => v.enabled).length; const activeVarsCount = requestVars.filter((v) => v.enabled).length + responseVars.filter((v) => v.enabled).length;
const auth = get(collection, 'root.request.auth', {}).mode; const authMode = get(collection, 'root.request.auth', {}).mode || 'none';
const proxyConfig = get(collection, 'brunoConfig.proxy', {}); const proxyConfig = get(collection, 'brunoConfig.proxy', {});
const clientCertConfig = get(collection, 'brunoConfig.clientCertificates.certs', []); const clientCertConfig = get(collection, 'brunoConfig.clientCertificates.certs', []);
@@ -155,7 +155,7 @@ const CollectionSettings = ({ collection }) => {
</div> </div>
<div className={getTabClassname('auth')} role="tab" onClick={() => setTab('auth')}> <div className={getTabClassname('auth')} role="tab" onClick={() => setTab('auth')}>
Auth Auth
{auth !== 'none' && <ContentIndicator />} {authMode !== 'none' && <ContentIndicator />}
</div> </div>
<div className={getTabClassname('script')} role="tab" onClick={() => setTab('script')}> <div className={getTabClassname('script')} role="tab" onClick={() => setTab('script')}>
Script Script

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

@@ -36,7 +36,7 @@ const resolveInheritedAuth = (item, collection) => {
const requestTreePath = getTreePathFromCollectionToItem(collection, item.uid); const requestTreePath = getTreePathFromCollectionToItem(collection, item.uid);
// Default to collection auth // Default to collection auth
const collectionAuth = get(collection, 'root.request.auth'); const collectionAuth = get(collection, 'root.request.auth', { mode: 'none' });
let effectiveAuth = collectionAuth; let effectiveAuth = collectionAuth;
let source = 'collection'; let source = 'collection';

2
packages/bruno-lang/v2/src/collectionBruToJson.js
View File

@@ -163,7 +163,7 @@ const sem = grammar.createSemantics().addAttribute('ast', {
return { return {
auth: { auth: {
mode: auth ? auth.mode : 'none' mode: auth?.mode || 'none'
} }
}; };
}, },