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

453 ega api funcs #458

Merged
merged 9 commits into from
Sep 30, 2024
Merged

453 ega api funcs #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
aa42318
Add zod, update ts. Add expiry to approved app list data
anncatton Sep 24, 2024
870ba74
Add api response types, permissions and users get funcs
anncatton Sep 24, 2024
6162104
Add safe parsing for api list results. Add dacId to config
anncatton Sep 25, 2024
76a740e
Add safeParse checks to ega client calls.
anncatton Sep 25, 2024
f62d34b
Add failure returns to ega client calls, restructure types
anncatton Sep 25, 2024
14d35f4
remove empty file
anncatton Sep 25, 2024
12bb890
move failure types to separate file, add appId to approved users data
anncatton Sep 26, 2024
e995c79
modify list response types
anncatton Sep 26, 2024
e866b2b
move safeParseArray to own file, update imports
anncatton Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,3 +119,4 @@ EGA_AUTH_REALM_NAME=
EGA_API_URL=
EGA_USERNAME=
EGA_PASSWORD=
DAC_ID=
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Development of the Data Access Control API
| EGA_API_URL | Root URL for EGA API | `string` | true | |
| EGA_USERNAME | Username for account used to gain access token from EGA authentication server | `string` | true | |
| EGA_PASSWORD | Password for account used to gain access token from EGA authentication server | `string` | true | |
| DAC_ID | AccessionId for ICGC DAC | `string` | true | |

## Feature Flags

Expand Down
326 changes: 22 additions & 304 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"sinon": "^10.0.0",
"testcontainers": "^7.8.0",
"ts-node-dev": "^2.0.0",
"typescript": "^4.9.5"
"typescript": "^5.6.2"
},
"dependencies": {
"@aws-sdk/client-s3": "^3.18.0",
Expand Down Expand Up @@ -123,7 +123,8 @@
"uuid": "^8.3.2",
"validate.js": "^0.13.1",
"winston": "^3.3.3",
"yamljs": "^0.3.0"
"yamljs": "^0.3.0",
"zod": "^3.23.8"
},
"husky": {
"hooks": {
Expand Down
2 changes: 2 additions & 0 deletions src/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ export interface AppConfig {
authHost: string;
authRealmName: string;
apiUrl: string;
dacId: string;
};
}

Expand Down Expand Up @@ -211,6 +212,7 @@ const buildAppContext = (): AppConfig => {
authHost: checkIsDefined(process.env.EGA_AUTH_HOST),
authRealmName: checkIsDefined(process.env.EGA_AUTH_REALM_NAME),
apiUrl: checkIsDefined(process.env.EGA_API_URL),
dacId: checkIsDefined(process.env.DAC_ID),
},
};
return config;
Expand Down
5 changes: 3 additions & 2 deletions src/domain/interface.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,12 +368,13 @@ export interface IRequest extends Request {
identity: Identity;
}

export interface UserDataFromApprovedApplicationsResult {
export type UserDataFromApprovedApplicationsResult = {
applicant: Sections['applicant'];
collaborators: Sections['collaborators'];
lastUpdatedAtUtc?: Date;
appId: string;
}
expiresAtUtc: Date;
};

export interface ApprovedUserRowData {
userName: string;
Expand Down
2 changes: 2 additions & 0 deletions src/domain/service/applications/search.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,7 @@ export const getUsersFromApprovedApps = async (): Promise<
'sections.applicant': 1,
'sections.collaborators': 1,
lastUpdatedAtUtc: 1,
expiresAtUtc: 1,
}).exec();

return results.map((result) => {
Expand All @@ -355,6 +356,7 @@ export const getUsersFromApprovedApps = async (): Promise<
collaborators: result.sections.collaborators,
appId: result.appId,
lastUpdatedAtUtc: result.lastUpdatedAtUtc,
expiresAtUtc: result.expiresAtUtc,
};
return approvedUsersInfo;
});
Expand Down
Loading