[stable17] Pass on direct query parameter during login
If direct is set we should forward it again. This to make SAML direct login work again. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
This commit is contained in:
parent
c466572d98
commit
430393f213
5 changed files with 14 additions and 0 deletions
BIN
core/js/dist/login.js
vendored
BIN
core/js/dist/login.js
vendored
Binary file not shown.
BIN
core/js/dist/login.js.map
vendored
BIN
core/js/dist/login.js.map
vendored
Binary file not shown.
|
@ -123,6 +123,10 @@
|
|||
<input type="hidden"
|
||||
name="requesttoken"
|
||||
:value="OC.requestToken">
|
||||
<input v-if="directLogin"
|
||||
type="hidden"
|
||||
name="direct"
|
||||
value="1">
|
||||
</fieldset>
|
||||
</form>
|
||||
</template>
|
||||
|
@ -159,6 +163,10 @@
|
|||
type: Boolean,
|
||||
default: true,
|
||||
},
|
||||
directLogin: {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
|
|
|
@ -61,5 +61,6 @@ new View({
|
|||
autoCompleteAllowed: fromStateOr('loginAutocomplete', true),
|
||||
resetPasswordTarget: fromStateOr('resetPasswordTarget', ''),
|
||||
resetPasswordUser: fromStateOr('resetPasswordUser', ''),
|
||||
directLogin: query.direct === '1'
|
||||
}
|
||||
}).$mount('#login');
|
||||
|
|
|
@ -27,6 +27,7 @@
|
|||
<LoginForm
|
||||
:username.sync="user"
|
||||
:redirect-url="redirectUrl"
|
||||
:directLogin="directLogin"
|
||||
:messages="messages"
|
||||
:errors="errors"
|
||||
:throttle-delay="throttleDelay"
|
||||
|
@ -110,6 +111,10 @@
|
|||
type: Boolean,
|
||||
default: true,
|
||||
},
|
||||
directLogin: {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
},
|
||||
components: {
|
||||
LoginForm,
|
||||
|
|
Loading…
Reference in a new issue