Merge pull request #17548 from nextcloud/fix/saml/pass_on_direct

Pass on direct query parameter during login
This commit is contained in:
Roeland Jago Douma 2019-10-17 00:24:20 +02:00 committed by GitHub
commit a122fe6c86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 3 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -125,6 +125,10 @@
<input type="hidden"
name="requesttoken"
:value="OC.requestToken">
<input v-if="directLogin"
type="hidden"
name="direct"
value="1">
</fieldset>
</form>
</template>
@ -160,6 +164,10 @@ export default {
autoCompleteAllowed: {
type: Boolean,
default: true
},
directLogin: {
type: Boolean,
default: false
}
},
data() {

View File

@ -62,6 +62,7 @@ new View({
resetPasswordLink: fromStateOr('loginResetPasswordLink', ''),
autoCompleteAllowed: fromStateOr('loginAutocomplete', true),
resetPasswordTarget: fromStateOr('resetPasswordTarget', ''),
resetPasswordUser: fromStateOr('resetPasswordUser', '')
resetPasswordUser: fromStateOr('resetPasswordUser', ''),
directLogin: query.direct === '1'
}
}).$mount('#login')

View File

@ -27,6 +27,7 @@
<LoginForm
:username.sync="user"
:redirect-url="redirectUrl"
:directLogin="directLogin"
:messages="messages"
:errors="errors"
:throttle-delay="throttleDelay"
@ -114,6 +115,10 @@ export default {
autoCompleteAllowed: {
type: Boolean,
default: true
},
directLogin: {
type: Boolean,
default: false
}
},
data() {