Merge pull request #17581 from nextcloud/backport/stable17/17548

[stable17] Pass on direct query parameter during login
This commit is contained in:
Roeland Jago Douma 2019-10-22 08:53:02 +02:00 committed by GitHub
commit ade801160f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 2 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

@ -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 {

View File

@ -61,5 +61,6 @@ new View({
autoCompleteAllowed: fromStateOr('loginAutocomplete', true),
resetPasswordTarget: fromStateOr('resetPasswordTarget', ''),
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"
@ -110,6 +111,10 @@
type: Boolean,
default: true,
},
directLogin: {
type: Boolean,
default: false,
},
},
components: {
LoginForm,