Browse Source

fix: auth strategy dependent username label

pull/2213/head
NGPixel 4 years ago
parent
commit
be499e5795
5 changed files with 11 additions and 1 deletions
  1. 6
      client/components/editor/editor-ckeditor.vue
  2. 3
      client/components/login.vue
  3. 1
      server/graph/schemas/authentication.graphql
  4. 1
      server/modules/authentication/ldap/definition.yml
  5. 1
      server/modules/authentication/local/definition.yml

6
client/components/editor/editor-ckeditor.vue

@ -18,6 +18,7 @@
import _ from 'lodash'
import { get, sync } from 'vuex-pathify'
import DecoupledEditor from '@requarks/ckeditor5'
// import DecoupledEditor from '../../../../wiki-ckeditor5/build/ckeditor'
import EditorConflict from './ckeditor/conflict.vue'
import { html as beautify } from 'js-beautify/js/lib/beautifier.min.js'
@ -110,6 +111,11 @@ export default {
linkIsDownloadable: true
})
break
case 'DIAGRAM':
this.editor.execute('imageInsert', {
source: `data:image/svg+xml;base64,${opts.text}`
})
break
}
})

3
client/components/login.vue

@ -40,7 +40,7 @@
hide-details
ref='iptEmail'
v-model='username'
:placeholder='$t("auth:fields.emailUser")'
:placeholder='$t(selectedStrategy.strategy.usernameLabel)'
)
v-text-field.mt-2(
solo
@ -536,6 +536,7 @@ export default {
color
icon
useForm
usernameLabel
}
displayName
order

1
server/graph/schemas/authentication.graphql

@ -85,6 +85,7 @@ type AuthenticationStrategy {
description: String
isAvailable: Boolean
useForm: Boolean!
usernameLabel: String
logo: String
color: String
website: String

1
server/modules/authentication/ldap/definition.yml

@ -7,6 +7,7 @@ color: blue darken-3
website: https://www.microsoft.com/windowsserver
isAvailable: true
useForm: true
usernameLabel: 'auth:fields.username'
props:
url:
title: LDAP URL

1
server/modules/authentication/local/definition.yml

@ -7,4 +7,5 @@ color: primary
website: https://wiki.js.org
isAvailable: true
useForm: true
usernameLabel: 'auth:fields.email'
props: {}
Loading…
Cancel
Save