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

fix: private users can remove app lock even after team enforce #2241

Merged
merged 2 commits into from
Nov 23, 2023
Merged

fix: private users can remove app lock even after team enforce #2241

merged 2 commits into from
Nov 23, 2023

Conversation

github-actions[bot]
Copy link
Contributor

Cherry pick from the original PR:

⚠️ Conflicts during cherry-pick:

PR Submission Checklist for internal contributors

  • The PR Title

    • conforms to the style of semantic commits messages¹ supported in Wire's Github Workflow²
    • contains a reference JIRA issue number like
    • answers the question: If merged, this PR will: ... ³

  • The PR Description

    • is free of optional paragraphs and you have filled the relevant parts to the best of your ability

What's new in this PR?

Issues

  1. App lock settings can be changed, even when enforced by team.
  2. App lock is cleared when the team removes the enforce.

Solutions

  1. add use case to check if the app lock can be modified (if at least one user ha ve it enforced by team).
  2. remove default timeout form klalium (this should be the app responsibility)

Needs releases with:

  • GitHub link to other pull request

Testing

Test Coverage (Optional)

  • I have added automated test to this contribution

How to Test

Briefly describe how this change was tested and if applicable the exact steps taken to verify that it works as expected.

Notes (Optional)

Specify here any other facts that you think are important for this issue.

Attachments (Optional)

Attachments like images, videos, etc. (drag and drop in the text box)

PR Post Submission Checklist for internal contributors (Optional)

  • Wire's Github Workflow has automatically linked the PR to a JIRA issue

PR Post Merge Checklist for internal contributors

  • If any soft of configuration variable was introduced by this PR, it has been added to the relevant documents and the CI jobs have been updated.
References
  1. https://sparkbox.com/foundry/semantic_commit_messages
  2. https://github.com/wireapp/.github#usage
  3. E.g. .

@MohamadJaara @github-actions
fix: private users can remove app lock even after team enforce (#2240)
a87f5ba 
* fix: app lock can be changes when enforced and it is cleared when not enforced

* add docs
@github-actions github-actions bot added the cherry-pick PR is cherry-picking changes from another banch label Nov 21, 2023
@ohassine ohassine enabled auto-merge November 22, 2023 10:53
@github-actions GitHub Actions
Copy link
Contributor Author

github-actions bot commented Nov 22, 2023 •
edited
Loading

Unit Test Results

   474 files  +  41     474 suites  +41   3m 5s ⏱️ + 2m 40s
2 640 tests +193  2 536 ✔️ +167  104 💤 +26  0 ❌ ±0 

Results for commit ad3a938. ± Comparison against base commit d7d5a72.

♻️ This comment has been updated with latest results.

@datadog-wireapp
Copy link

Datadog Report

All test runs d2faeaf 🔗

✅ 2 Total Test Services: 0 Failed, 0 with New Flaky, 2 Passed

Test Services
Service Name Failed Known Flaky New Flaky Passed Skipped Wall Time Branch View
kalium-ios 0 0 0 1831 30 9.09s Link
kalium-jvm 0 0 0 2512 52 6m 23.02s Link

@ohassine ohassine added this pull request to the merge queue Nov 23, 2023
@codecov-commenter
Copy link

Codecov Report

Merging #2241 (ad3a938) into develop (d7d5a72) will decrease coverage by 0.03%.
Report is 1 commits behind head on develop.
The diff coverage is 40.74%.

Additional details and impacted files 
@@              Coverage Diff              @@
##             develop    #2241      +/-   ##
=============================================
- Coverage      57.95%   57.93%   -0.03%     
  Complexity        21       21              
=============================================
  Files           1080     1081       +1     
  Lines          41002    41009       +7     
  Branches        3793     3793              
=============================================
- Hits           23762    23757       -5     
- Misses         15618    15631      +13     
+ Partials        1622     1621       -1
Files Coverage Δ
...re/kalium/logic/configuration/AppLockTeamConfig.kt 100.00% <100.00%> (ø)
...eature/applock/AppLockTeamFeatureConfigObserver.kt 100.00% <100.00%> (ø)
...ture/featureConfig/handler/AppLockConfigHandler.kt 81.81% <100.00%> (ø)
...reConfig/handler/ClassifiedDomainsConfigHandler.kt 75.00% <100.00%> (ø)
...om/wire/kalium/logic/featureFlags/KaliumConfigs.kt 100.00% <100.00%> (ø)
.../kotlin/com/wire/kalium/logic/GlobalKaliumScope.kt 0.00% <0.00%> (ø)
...kalium/logic/configuration/UserConfigRepository.kt 51.06% <80.00%> (+0.70%) ⬆️
...ire/kalium/logic/data/session/SessionRepository.kt 0.00% <0.00%> (ø)
.../feature/featureConfig/IsAppLockEditableUseCase.kt 0.00% <0.00%> (ø)

... and 2 files with indirect coverage changes

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d7d5a72...ad3a938. Read the comment docs.

Merged via the queue into develop with commit d0d84c0 Nov 23, 2023
15 checks passed
@ohassine ohassine deleted the fix/private-users-can-remove-app-lock-even-after-team-enforce-cherry-pick branch November 23, 2023 01:14
augustocdias pushed a commit that referenced this pull request Dec 5, 2023
@github-actions @MohamadJaara
@ohassine @augustocdias
fix: private users can remove app lock even after team enforce (#2240) (
db9b91a 
#2241)

* fix: app lock can be changes when enforced and it is cleared when not enforced

* add docs

Co-authored-by: Mohamad Jaara <[email protected]>
Co-authored-by: Oussama Hassine <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@saleniuk saleniuk saleniuk approved these changes

@ohassine ohassine ohassine approved these changes

Assignees

@MohamadJaara MohamadJaara

Labels
cherry-pick PR is cherry-picking changes from another banch 🚨 Potential breaking changes 👕 size: M type: bug / fix 🐞
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@codecov-commenter @ohassine @saleniuk @MohamadJaara