liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: webpack fixes, missing auth icons, auth resolvers

Browse Source
This commit is contained in:
NGPixel
2018-03-10 00:58:04 -05:00
parent 69a0711d16
commit 16d3336cd0
25 changed files with 212 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
client/components/login.vue
View File

@@ -106,16 +106,16 @@ export default {
} else {
this.isLoading = true
graphQL.mutate({
mutation: CONSTANTS.GRAPHQL.GQL_MUTATION_LOGIN,
mutation: CONSTANTS.GRAPH.AUTHENTICATION.MUTATION_LOGIN,
variables: {
username: this.username,
password: this.password,
provider: this.selectedStrategy
}
}).then(resp => {
if (resp.data.login) {
let respObj = resp.data.login
if (respObj.succeeded === true) {
if (_.has(resp, 'data.authentication.login')) {
let respObj = _.get(resp, 'data.authentication.login', {})
if (respObj.operation.succeeded === true) {
if (respObj.tfaRequired === true) {
this.screen = 'tfa'
this.securityCode = ''
@@ -132,7 +132,7 @@ export default {
}
this.isLoading = false
} else {
throw new Error(respObj.message)
throw new Error(respObj.operation.message)
}
} else {
throw new Error('Authentication is unavailable.')
@@ -159,15 +159,15 @@ export default {
} else {
this.isLoading = true
graphQL.mutate({
mutation: CONSTANTS.GRAPHQL.GQL_MUTATION_LOGINTFA,
mutation: CONSTANTS.GRAPH.AUTHENTICATION.MUTATION_LOGINTFA,
variables: {
loginToken: this.loginToken,
securityCode: this.securityCode
}
}).then(resp => {
if (resp.data.loginTFA) {
let respObj = resp.data.loginTFA
if (respObj.succeeded === true) {
if (_.has(resp, 'data.authentication.loginTFA')) {
let respObj = _.get(resp, 'data.authentication.loginTFA', {})
if (respObj.operation.succeeded === true) {
this.$store.dispatch('alert', {
style: 'success',
icon: 'gg-check',
@@ -175,7 +175,7 @@ export default {
})
this.isLoading = false
} else {
throw new Error(respObj.message)
throw new Error(respObj.operation.message)
}
} else {
throw new Error('Authentication is unavailable.')
@@ -382,6 +382,10 @@ export default {
}
}
em {
height: 20px;
}
span {
font-weight: 600;