Skip to content

fix(login): prevent empty auth provider selection #8010

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

Open
glovergao wants to merge 1 commit into
base: main
Choose a base branch
from
+39 −7
Open

fix(login): prevent empty auth provider selection #8010

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 39 additions & 7 deletions client/components/login.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
.text-subtitle-1 {{$t('auth:selectAuthProvider')}}
.login-list
v-list.elevation-1.radius-7(nav, light)
v-list-item-group(v-model='selectedStrategyKey')
v-list-item-group(v-model='selectedStrategyKey', mandatory)
v-list-item(
v-for='(stg, idx) of filteredStrategies'
:key='stg.key'
Expand Down Expand Up @@ -257,6 +257,15 @@ import Cookies from 'js-cookie'
import gql from 'graphql-tag'
import { sync } from 'vuex-pathify'

const getEmptySelectedStrategy = () => ({
key: 'unselected',
selfRegistration: false,
strategy: {
useForm: false,
usernameType: 'email'
}
})

export default {
i18nOptions: { namespaces: 'auth' },
props: {
Expand All @@ -278,7 +287,7 @@ export default {
error: false,
strategies: [],
selectedStrategyKey: 'unselected',
selectedStrategy: { key: 'unselected', strategy: { useForm: false, usernameType: 'email' } },
selectedStrategy: getEmptySelectedStrategy(),
screen: 'login',
username: '',
password: '',
Expand Down Expand Up @@ -321,17 +330,37 @@ export default {
},
watch: {
filteredStrategies (newValue, oldValue) {
if (_.head(newValue).strategy.useForm) {
this.selectedStrategyKey = _.head(newValue).key
const firstStrategy = _.head(newValue)
if (!firstStrategy) {
this.selectedStrategyKey = 'unselected'
this.selectedStrategy = getEmptySelectedStrategy()
return
}
if (_.some(newValue, ['key', this.selectedStrategyKey])) {
return
}
if (firstStrategy.strategy.useForm) {
this.selectedStrategyKey = firstStrategy.key
}
},
selectedStrategyKey (newValue, oldValue) {
this.selectedStrategy = _.find(this.strategies, ['key', newValue])
const strategy = _.find(this.strategies, ['key', newValue])
if (!strategy) {
const fallbackStrategy = _.find(this.filteredStrategies, ['key', oldValue]) || _.head(this.filteredStrategies)
if (fallbackStrategy) {
this.selectedStrategyKey = fallbackStrategy.key
return
}
this.selectedStrategy = getEmptySelectedStrategy()
this.screen = 'login'
return
}
this.selectedStrategy = strategy
if (this.screen === 'changePwd') {
return
}
this.screen = 'login'
if (!this.selectedStrategy.strategy.useForm) {
if (!strategy.strategy.useForm) {
this.isLoading = true
window.location.assign('/login/' + newValue)
} else {
Expand All @@ -354,7 +383,10 @@ export default {
*/
async login () {
this.errorShown = false
if (this.username.length < 2) {
if (!this.selectedStrategy || this.selectedStrategy.key === 'unselected') {
this.errorMessage = this.$t('auth:selectAuthProvider')
this.errorShown = true
} else if (this.username.length < 2) {
this.errorMessage = this.$t('auth:invalidEmailUsername')
this.errorShown = true
this.$refs.iptEmail.focus()
Expand Down