Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: add support for expiring applications #247

Merged
merged 10 commits into from Nov 17, 2022
Merged

feat: add support for expiring applications #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
921c1e8
feat: add support for expiring applications
kevinperaza Nov 14, 2022
5889fb6
test(application): update mocks
kevinperaza Nov 15, 2022
47f7e17
feat(application): make name optional to support expiring apps
kevinperaza Nov 15, 2022
095f5fa
feat(tokens): add expiresAt to update token request
kevinperaza Nov 15, 2022
16c6636
test(tokens): add expiresAt to mocks
kevinperaza Nov 15, 2022
4a2b7f6
feat(applications): add conditions to access rules
kevinperaza Nov 15, 2022
6d5fe29
test(applications): add conditions to access rules mocks
kevinperaza Nov 15, 2022
6660d35
feat(applications): make access rules' conditions optional
kevinperaza Nov 16, 2022
025f7f6
Merge branch 'master' into eng-3755-add-expiring-apps-fields
jleon15 Nov 17, 2022
295734b
feat(applications): make access rule's container optional
kevinperaza Nov 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/types/models/applications.ts
View file
Open in desktop
Expand Up @@ -14,21 +14,30 @@ type TransformType = typeof TRANSFORM_TYPES[number];
interface Application extends Auditable {
id: string;
tenantId: string;
name: string;
name?: string;
key?: string;
type: ApplicationType;
permissions?: string[];
rules?: AccessRule[];
canCreateExpiringApplications?: boolean;
expiresAt?: string;
}

interface AccessRule {
description: string;
priority: number;
container: string;
container?: string;
transform: TransformType;
permissions: string[];
conditions?: Condition[];
}

type Condition = {
attribute: string;
operator: string;
value: string;
};

type CreateApplication = Pick<Application, 'name' | 'type'> &
djejaquino marked this conversation as resolved.
Show resolved Hide resolved
Partial<Pick<Application, 'permissions' | 'rules'>>;

Expand Down
1 change: 1 addition & 0 deletions src/types/models/tokens.ts
View file
Open in desktop
Expand Up @@ -82,6 +82,7 @@ type UpdateToken<DataType = Primitive> = Partial<
| 'searchIndexes'
| 'fingerprintExpression'
| 'mask'
| 'expiresAt'
> & {
privacy: Omit<TokenPrivacy, 'classification'>;
deduplicateToken: boolean;
Expand Down
12 changes: 12 additions & 0 deletions test/applications.test.ts
View file
Open in desktop
Expand Up @@ -37,6 +37,8 @@ describe('Applications', () => {
name: chance.string(),
type: chance.string() as ApplicationType,
permissions: [chance.string()],
canCreateExpiringApplications: chance.bool(),
expiresAt: chance.date().toString(),
},
updatePayload: {
name: chance.string(),
Expand All @@ -63,8 +65,17 @@ describe('Applications', () => {
'reveal',
]),
permissions: [chance.string()],
conditions: [
{
attribute: chance.string(),
operator: chance.string(),
value: chance.string(),
},
],
},
],
canCreateExpiringApplications: chance.bool(),
expiresAt: chance.date().toString(),
},
updatePayload: {
name: chance.string(),
Expand All @@ -79,6 +90,7 @@ describe('Applications', () => {
'reveal',
]),
permissions: [chance.string()],
conditions: [],
},
],
},
Expand Down
2 changes: 2 additions & 0 deletions test/tokens.test.ts
View file
Open in desktop
Expand Up @@ -646,6 +646,7 @@ describe('Tokens', () => {
alg: _chance.string(),
},
},
expiresAt: _chance.date().toString(),
metadata: {
camelCaseParameter: _chance.string(),
snake_case_parameter: _chance.string(),
Expand Down Expand Up @@ -709,6 +710,7 @@ describe('Tokens', () => {
},
searchIndexes: [_chance.string(), _chance.string()],
fingerprintExpression: _chance.string(),
expiresAt: _chance.date().toString(),
};
/* eslint-enable camelcase */

Expand Down