Don't allow enforcing 2FA when no provider is enabled #16463
Closed
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
Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de>
Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de>
MorrisJobke
added
2. developing
This was referenced Jul 18, 2019
Merged
skjnldsv
reviewed
Jul 22, 2019
| } | ||
| } | ||
|
|
||
| export const actions = { | ||
| const actions = { | ||
| save ({commit}, ) { |
skjnldsv
reviewed
Jul 22, 2019
| } | ||
|
|
||
| export default new Vuex.Store({ | ||
| export default { |
skjnldsv
reviewed
Jul 22, 2019
| OCP.InitialState.loadState('settings', 'mandatory2FAState') | ||
| ) | ||
| let initialState = OCP.InitialState.loadState('settings', 'mandatory2FAState'); | ||
| store.commit('setEnforced', initialState.enforced); |
There was a problem hiding this comment.
This is considered bad practice to commit from a component.
You need to use actions for that.
skjnldsv
reviewed
Jul 22, 2019
| }, | ||
| set: function (val) { | ||
| this.dirty = true | ||
| this.$store.commit('setExcludedGroups', val) | ||
| } | ||
| }, | ||
| noProviderGlobally: { |
There was a problem hiding this comment.
You can directly use the function if you don't have a setter here.
Suggested change
| noProviderGlobally: { | |
| noProviderGlobally() { | |
| var providers = this.$store.getters.getAllApps.filter( function(app) { | |
| return ('two-factor-providers' in app && 'provider' in app['two-factor-providers'] && app['active'] === true); | |
| }); | |
| return (providers.length === 0); | |
| } |
skjnldsv
reviewed
Jul 22, 2019
| @@ -78,6 +84,10 @@ | |||
| components: { | |||
| Multiselect | |||
| }, | |||
| beforeMount(){ | |||
| this.$store.dispatch('getAllApps'); | |||
skjnldsv
reviewed
Jul 22, 2019
| beforeMount(){ | ||
| this.$store.dispatch('getAllApps'); | ||
| this.$store.dispatch('getEnabledProvidersCurrentUser'); | ||
| }, | ||
| data () { | ||
| return { | ||
| loading: false, |
There was a problem hiding this comment.
If so maybe set it to true by default?
Feel free to take over - I just untangled the git history. |
|
I'm going to close this due to lack of activity. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Resubmit of #13735
Fixes #12267
I haven't committed compiled assets yet.
cc @rummatee