fix: allow reset_otp_secret only if Two Factor Auth is enabled
#20506
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
DaizyModi
requested review from
a team and
shariquerik
and removed request for
a team
github-actions
bot
added
the
add-test-cases
DaizyModi
force-pushed
the
fix-reset_otp_secret-whitelisted-fn
branch
from
941bce5
to
6976b12
Compare
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## develop #20506 +/- ##
===========================================
+ Coverage 63.80% 63.90% +0.10%
===========================================
Files 758 758
Lines 68679 68699 +20
Branches 6194 6198 +4
===========================================
+ Hits 43821 43903 +82
+ Misses 21320 21298 -22
+ Partials 3538 3498 -40
Flags with carried forward coverage won't be shown. Click here to find out more. |
ankush
approved these changes
Apr 3, 2023
ankush
added
backport version-13-hotfix
backport version-14-hotfix
mergify bot
pushed a commit
that referenced
this pull request
Apr 3, 2023
) * fix: display `Reset OTP Secret` button only if Two factor Auth is enabled * fix: added validations and fetched value from cached doc * fix: linter changes (cherry picked from commit 06580bd)
mergify bot
pushed a commit
that referenced
this pull request
Apr 3, 2023
) * fix: display `Reset OTP Secret` button only if Two factor Auth is enabled * fix: added validations and fetched value from cached doc * fix: linter changes (cherry picked from commit 06580bd) # Conflicts: # frappe/core/doctype/user/user.js # frappe/twofactor.py
This was referenced Apr 3, 2023
frappe-pr-bot
pushed a commit
that referenced
this pull request
Apr 4, 2023
# [14.31.0](v14.30.0...v14.31.0) (2023-04-04) ### Bug Fixes * allow `reset_otp_secret` only if Two Factor Auth is enabled ([#20506](#20506)) ([#20561](#20561)) ([ca486c4](ca486c4)) * allowed only POST and PUT methods in `rename_doc` ([#20504](#20504)) ([#20565](#20565)) ([fd1f6fe](fd1f6fe)) * bulk update using doc method, check perms ([#20522](#20522)) ([2237968](2237968)) * cannot restore cancelled document if workflow is active ([547efe3](547efe3)) * Check if reference_name is set ([2e9068b](2e9068b)) * content_type can be `None` during file upload ([#20572](#20572)) ([#20574](#20574)) ([ebc6059](ebc6059)) * date field shouldn't be formatted for TZ ([#20486](#20486)) ([#20490](#20490)) ([07b7b46](07b7b46)) * don't hide tab with dashboard if there is a visible section/control ([084e8af](084e8af)) * Drop message_id index before migrating email queue ([#20376](#20376)) ([#20578](#20578)) ([394c232](394c232)) * email linking and message_id indexing ([#20356](#20356)) ([#20579](#20579)) ([5ae94ef](5ae94ef)) * escape HTML instead of sanitizing ([2269d6e](2269d6e)) * fix address query for postgres ([f01566a](f01566a)), closes [/github.com//pull/20537#ref-pullrequest-1645575433](https://github.com//github.com/frappe/frappe/pull/20537/issues/ref-pullrequest-1645575433) * get workflow_state_fieldname instead of setting workflow_state to none ([bac4e9b](bac4e9b)) * Handle JsBarcode exceptions ([#20532](#20532)) ([b1c3d8b](b1c3d8b)) * heatmap not reset on dashboard refresh ([3c0659b](3c0659b)) * hide chart and heatmap on dashboard reset ([cec7a73](cec7a73)) * Incorrect use of the Walrus operator ([a70a5ca](a70a5ca)) * nestedset rename ([#20498](#20498)) ([#20499](#20499)) ([b831392](b831392)) * removed unnecessary usage of `[@frappe](https://github.com/frappe).whitelist` ([#20503](#20503)) ([#20563](#20563)) ([0af8315](0af8315)) * rewrite query for postgres ([#20557](#20557)) ([#20559](#20559)) ([d754be5](d754be5)) * sending mails to unintended recipients as cc ([1c47643](1c47643)) * **UI:** align link cards & charts on workspace ([82cfd33](82cfd33)) * unsubscribe from list_update before resubbing ([#20450](#20450)) ([#20581](#20581)) ([7866605](7866605)) * use chart type passed to `render_graph` on form dashboards ([015f7db](015f7db)) ### Features * Disable Sharing globally (backport [#20318](#20318)) ([#20492](#20492)) ([67a537c](67a537c)) * list-view click and drag on check box to select multiple rows (backport [#20457](#20457)) ([#20568](#20568)) ([f757a37](f757a37)) * make workflow state translatable ([#20412](#20412)) ([8675789](8675789)) * **util:** `get_table_name`: wrap in backticks ([#20553](#20553)) ([#20556](#20556)) ([5c56dff](5c56dff)) ### Performance Improvements * Faster address query with explicit joins (backport [#20537](#20537)) ([#20540](#20540)) ([2ef7ef5](2ef7ef5)) * unsubscribe from list_update events ([#20423](#20423)) ([#20580](#20580)) ([8a63144](8a63144))
ankush
added a commit
that referenced
this pull request
Apr 11, 2023
…kport #20506) (#20560) * fix: allow `reset_otp_secret` only if Two Factor Auth is enabled (#20506) * fix: display `Reset OTP Secret` button only if Two factor Auth is enabled * fix: added validations and fetched value from cached doc * fix: linter changes (cherry picked from commit 06580bd) # Conflicts: # frappe/core/doctype/user/user.js # frappe/twofactor.py * chore: conflicts --------- Co-authored-by: Daizy Modi <modidaizy5217@gmail.com> Co-authored-by: Ankush Menat <ankush@frappe.io>
frappe-pr-bot
pushed a commit
that referenced
this pull request
Apr 11, 2023
# [13.53.0](v13.52.0...v13.53.0) (2023-04-11) ### Bug Fixes * allow `reset_otp_secret` only if Two Factor Auth is enabled (backport [#20506](#20506)) ([#20560](#20560)) ([e8025a4](e8025a4)) * better permission error for query_report ([#20643](#20643)) ([#20646](#20646)) ([d972af8](d972af8)) * change z-index of freeze component to make it appear above all components ([1878b87](1878b87)), closes [#20538](#20538) * child row form should be above freeze screen ([9201e84](9201e84)) * client script add to instead of replace ([0c7ac16](0c7ac16)) * client_script default value ([9ed7851](9ed7851)) * german translation of workflow state ([#20609](#20609)) ([#20615](#20615)) ([3769bdf](3769bdf)) * **grid row:** fix prettier hook check ([9309687](9309687)) * **grid row:** fix update_docfield_property function not updating grid row ([558f908](558f908)) * **ListView:** Evaluate sort_field sort_order within listviews based on DocTypes Definition ([#20482](#20482)) ([ba3cf84](ba3cf84)) * log requests even if no response ([#20638](#20638)) ([#20639](#20639)) ([ae4f7dd](ae4f7dd)) * no optional chaining in v13 ([d08627b](d08627b)) * **pretty-date:** plural form when the value is 1 ([#20619](#20619)) ([#20641](#20641)) ([4d6b776](4d6b776)) * validate if doctype exists before syncing customisations ([#20598](#20598)) ([#20644](#20644)) ([32ba65f](32ba65f)) ### Features * add context to confirm dailog ([0e21299](0e21299)) * add context to prompt dialog ([1bbf9c9](1bbf9c9)) * make report name translatable (backport [#20608](#20608)) ([#20617](#20617)) ([a92e69e](a92e69e)) * **minor:** log datetime in worker log (backport [#20414](#20414)) ([#20569](#20569)) ([dccb6af](dccb6af))
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix
In
user.jsReset OTP Secretbutton only if Two Factor Auth is enabled from System Settings.Whitelisted function
reset_otp_secretIntwofactor.pyget_cached_docandget_cached_value