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

Test #180

Merged
merged 43 commits into from
Jul 11, 2023
Merged

Test #180

merged 43 commits into from
Jul 11, 2023

Conversation

JanSpies82
Copy link
Collaborator

No description provided.

ConradStras and others added 30 commits July 4, 2023 16:51
@ConradStras
commit to initialize branch
e05130b
@JulianPienaar
Merge pull request #167 from COS301-SE-2023/test
c2a4ef2 
pull from test into dev/frontend
@JulianPienaar
Added environment files to alter apiURL
878986f
@JulianPienaar
Fixed expiration check on auth token
8fce3b9
@JanSpies82
Merge pull request #169 from COS301-SE-2023/main
da7f083 
Sync test w main
@JanSpies82
Expanded auth service tests
1aa1da4
@JulianPienaar
Added asymmetric encryption module
d2a84be
@JulianPienaar
Removed bcrypt module
53a7201
@JulianPienaar
Reduced amount of vulnerabilities
ea72825
@JulianPienaar
Manually update versions of semver
bb0963c
@JulianPienaar
Fixed the vulnerabilities in the frontend
a034307
@JanSpies82
Changed input validation
2c13133
@JanSpies82
Expanded tests
e5c4f34
@JanSpies82
Fixed badge specing
dd9f769
@JanSpies82
Removed unnecessary check
b127f11
@JanSpies82
Removed more unnecessary tests
dc4fb93
@JanSpies82
Restructured endpoints
f5d4def
@JanSpies82
Expanded tests
06b38df
@JanSpies82
Added last test
44f55cb
@JulianPienaar
Added encryption to all required places
831dbdf
@JulianPienaar
Now decrypts the contents on export
523c466
@jakeweatherhead @JulianPienaar
Implemented encryption and decryption for export file e2e
68b54f5 
Co-authored-by: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com>
@JulianPienaar @jakeweatherhead
Implemented import encryption+decryption
7956bb5 
Co-authored-by: Jake Weatherhead <jakeweatherhead1@gmail.com>
@JulianPienaar
Fixed added quotation marks on import
9c2455c
@JulianPienaar
Test Code Push
db50ced
@JulianPienaar @jakeweatherhead @dylankapnias-uni
Fixed encryption of documents on save and retrieve
a89ca3c 
Co-authored-by: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com>
Co-authored-by: Jake Weatherhead <jakeweatherhead1@gmail.com>
Co-authored-by: Dylan Shane Kapnias <127115374+dylankapnias-uni@users.noreply.github.com>
@JanSpies82
Refactored SHA cryptojs import
c4eb567
@JanSpies82
Added create tests
36d8a07
@JulianPienaar
Fixed exporting to include encryption
8ef30f1
@JanSpies82
Removed unnecessary imports
53b0125
@codecov
Copy link

codecov bot commented Jul 11, 2023 •
edited
Loading

Codecov Report

Merging #180 (7ae86b3) into main (583fc77) will increase coverage by 15.97%.
The diff coverage is 100.00%.

@@             Coverage Diff             @@
##             main     #180       +/-   ##
===========================================
+ Coverage   67.58%   83.56%   +15.97%     
===========================================
  Files          48       48               
  Lines         796      785       -11     
  Branches      120      107       -13     
===========================================
+ Hits          538      656      +118     
+ Misses        255      128      -127     
+ Partials        3        1        -2
Impacted Files Coverage Δ
backend/src/conversion/conversion.service.ts 93.93% <ø> (ø)
backend/src/s3/s3.service.ts 12.35% <ø> (ø)
backend/src/users/users.controller.ts 100.00% <ø> (ø)
backend/src/app.module.ts 100.00% <100.00%> (ø)
backend/src/auth/auth.controller.ts 100.00% <100.00%> (+45.00%) ⬆️
...ackend/src/file_manager/file_manager.controller.ts 100.00% <100.00%> (+59.84%) ⬆️
backend/src/file_manager/file_manager.module.ts 100.00% <100.00%> (ø)
backend/src/file_manager/file_manager.service.ts 100.00% <100.00%> (ø)
backend/src/users/users.service.ts 100.00% <100.00%> (+45.00%) ⬆️

... and 2 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

jakeweatherhead
jakeweatherhead reviewed Jul 11, 2023
View reviewed changes
Copy link
Collaborator

@jakeweatherhead jakeweatherhead left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All tests pass, okay to merge

jakeweatherhead
jakeweatherhead approved these changes Jul 11, 2023
View reviewed changes
Copy link
Collaborator

@jakeweatherhead jakeweatherhead left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All tests pass, okay to merge

@jakeweatherhead jakeweatherhead merged commit 5a25506 into main Jul 11, 2023
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jakeweatherhead jakeweatherhead jakeweatherhead approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@JanSpies82 @jakeweatherhead @ConradStras @JulianPienaar