awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: remove accessType hardcap in migration + style

Browse Source
This commit is contained in:
Alfonso Hernandez
2024-07-19 16:19:45 +02:00
parent 224368b172
commit 4c5c24f689
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/db/migrations/20240718170955_add-access-secret-sharing.ts
View File

@@ -8,7 +8,7 @@ export async function up(knex: Knex): Promise<void> {
const hasColumn = await knex.schema.hasColumn(TableName.SecretSharing, "accessType");
if (!hasColumn) {
await knex.schema.table(TableName.SecretSharing, (table) => {
table.string("accessType", 20).notNullable().defaultTo(SecretSharingAccessType.Anyone);
table.string("accessType").notNullable().defaultTo(SecretSharingAccessType.Anyone);
});
}
}

2
backend/src/services/secret-sharing/secret-sharing-service.ts
View File

@@ -137,7 +137,7 @@ export const secretSharingServiceFactory = ({
}
await secretSharingDAL.updateById(sharedSecretId, { $decr: { expiresAfterViews: 1 } });
}
if (sharedSecret.accessType === SecretSharingAccessType.Organization) {
if (sharedSecret.accessType === SecretSharingAccessType.Organization && orgId === sharedSecret.orgId) {
return { ...sharedSecret, orgName };
}
return { ...sharedSecret, orgName: undefined };

6
frontend/src/views/ShareSecretPublicPage/components/SecretTable.tsx
View File

@@ -32,7 +32,9 @@ export const SecretTable = ({
orgName
}: Props) => {
const [isVisible, setIsVisible] = useToggle(false);
const title = (<p>Someone from <strong>{orgName}</strong> organization has shared a secret with you</p>);
const title = orgName
? (<p>Someone from <strong>{orgName}</strong> organization has shared a secret with you</p>)
: (<p>You need to be logged in to view this secret</p>);
return (
<div className="flex w-full items-center justify-center rounded-md border border-solid border-mineshaft-700 bg-mineshaft-800 p-2">
@@ -60,7 +62,7 @@ export const SecretTable = ({
onClick={() => {}}
rightIcon={<FontAwesomeIcon icon={faArrowRight} className="ml-2" />}
>
Login to view this secret
Login into <strong>{orgName}</strong> to view this secret
</Button>
</a>
</div>