From 430393f213d6b6b15fc8bba943a36e84ca98d343 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Thu, 17 Oct 2019 11:34:42 +0200
Subject: [PATCH] [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>
---
 core/js/dist/login.js                   | Bin 648641 -> 648864 bytes
 core/js/dist/login.js.map               | Bin 2667205 -> 2667930 bytes
 core/src/components/login/LoginForm.vue |   8 ++++++++
 core/src/login.js                       |   1 +
 core/src/views/Login.vue                |   5 +++++
 5 files changed, 14 insertions(+)

diff --git a/core/js/dist/login.js b/core/js/dist/login.js
index 0ba04979459e7f0f3a349c9080d73d30078256dc..7410442d838bc2530921f64472494ff12c8f39c1 100644
GIT binary patch
delta 345
zcmX?jT7AJ;^@bM47N!>F7M2#)7Pc1l7LF~Pmg{(QQZkEDlS_Q^(=+p?e_YEcHGSOy
zPRZ$!w>i1D$FAcn6O`0R)r&9FP*PCR1hSA++fU!Uk5kPYBBG>ImY7qTYNceTR9mZQ
z1=NzNp&6@Vq#3JOs}mioqiCp;SDKTfqhyk7X_0E0n6mx-eok>|OzXF^-R5*-kwmfw
zXc!W2yZ3!gHD)HAkm*&AIHkF*Gt)GHcG}w7hD@LOh;uii%k;p<oRvW8^kYsLAob!g
zry`Kzdcvs+qzs;LDg&vIC!EnhYQqyweIWJV38xW|5`N053#1$&RQ^*=32EfO0eKB%
N4b(By+n;h;0RSY~cZC1|

delta 230
zcmZ2*R{h{<^@bM47N!>F7M2#)7Pc1l7LF~Pmg~01uj8C0C=;t=q#3JOs}mioqiCp;
zSDKTfqhw-eZf0nboV-2%0H?V0_BFRT-B`BsJm6GiR<X`Z(@-*0vbD7>)=ShYNGvK&
z)yT<DPAtjH&(kYTO)N^z(3~Fmm~%H{$aK*soRvVT{|ToIkXrMEQxQm=d%~#-q`o}i
zR0dKKPdTH3RLN6LeIT{uDW?&Ty8e_?mpMd3X?o%rPT}cN&p0I{fxM#B;?$CW#Ny)e
V{Gyc5;?yD~9VI2r>1oe6tpHt~Pl5md

diff --git a/core/js/dist/login.js.map b/core/js/dist/login.js.map
index 0d3242304d7d055b4b46b3c7d88fb732e5094d74..544c18b0669570439615dfbfeba5113a029ea422 100644
GIT binary patch
delta 1510
zcmai!T})g>6vwkG6mV>@Kv7C}yIrtM?O679S-v9CnR{>PmTt+i1+sM`Y}sYG`wc7$
zyD6@3eKN*0X6%Q?)(15{fHvmF#Kb3`j4`o|uMJugk|w5!iXYM9nYoZ`pUlng-kfvh
zocW(Kll%40w`|uQ+_J5&U8;!<#4cXhSbhG=bh-KV!%HE1jmH=32T$AW>B`s!iWv*>
znZnsz!pL4;o3;UV;0d4xs0H=_bwEAP06b}~O(XXLGW>Ils8prI;5Q$j7XI*iblw@J
zIweuz-FXdDGD6c}PtuIaLwC?(ouUcrB>(mf3fqh4Oneu8wXY$;C{3`0SLdJnfZ90S
zK)%ipr6CfaG)P7%9qmc`iB741F2{s3053I}Gk^UNowo6hwosVAaThh1@7_l>`;kZY
zp0(sf`H`PcvyeBy|NI@%J(fo9*+NI_lTu4c<F9U^<F+Js+(%AP>&x1bkEI!R-9rb=
z*Zx4=c6&C-*ZxAOm%^0JOh_S%jDQg)Aak<7q-%)@D<t%Wik54cN%h2l1`W1ip86X_
z?e^{>|M(wty>h0^l#oabmg2+@)ryKHyDO%wQn@~j1gTn9$uOl>=W|RI8G+>yF@p1u
zrm71)y4=R__+j)k>a)`FY&VdCK%CNepA{%D?}|!-{PTZNVAMFSLv?*Z2nfj9GolT(
z8**Tyk%Z!hxLRg%E4fc{Ko_h1Dfo*0R5DKKxCjN)JopH;4SDi@STQ2xY0>PgT<u*s
zZK+(51y{rkf@#4u8e1qaQDRaU6TSSyM@Xrp<$$9w2~ZIx%P_$lOE1gZK6SoVPH4PW
z8Mfl$3K>#kQOz<k1KnnJQs*HA#|2F!wLBApNU(g_YN6Mo%OmWAuV_iwLFhxh2yWG@
z&dQ@pF?md3Qi4*T6-pJgF_Ho+!-AFo5%Nd@Wes}EfjQ6M{H1y!VP57Hw27VAIR9cB
z;Z8Wfymn4prha*~lPsChMOGk{&|oThnkknzw-N9Zuou_|Gy+cp`++8)8E63x0Ik3?
zz_UOba1dw*4gn6p2^<Doz!AU=bO4>ebHGt^bGwT;>ShM|<GyIjY<J+iZP(&2SMY%O
zjT8UU)E+6kXk_zC1y}I}V|FOwuKJ^JhX<c@T8@Z2l8qFs$K`Srqv@qMtX9l*1%F`Q
z8!1%h(Iwo>4`0RYy!8TZ<gRyc9dGQz_2w%*_*yHkc^|h_|GD@<Kkn(+-G@ZnvU<cl
z2=ycG)zxEzQ^m}QsW>)&JA<!lZB<)6F4%niP5fQM|BEq4ui`~}UCiTC6kjhtF@+ED
z3pa2Jzqg8;__}yi9JrQG-2nCAJ7z-kExV&?V^AkVRe8+K_wc999gj_7&^5mlUnuP?
Ra}5m*xw@1t{`P0s^B?N*5XArh

delta 947
zcmYLGOH5Ni6iuH<f#D}r5alEOn8-vvEiFwnX6C)7t%%4!xG>a$K#Qg2Qz*f(apKB_
zAvzHViR{#<7((8{1<b;oaUpD75M`q=abZwN0PlN+xHvPp_spC*=g!Rc1<U)*1<T@_
z$&{)(d(HI5y$jP_6Sk$FlPyY0w>ubwPT^A5RP)Az)h-J_0UQFP01g9E0aid7ARUmQ
zuXdr*A;swv8=p`tCqTWF)KfR3q=Qy45nV&W))CF9M#Z-^)TvZ9=$>`7lAYPlDD7vY
zfvV$u`qUTXvnY0tc>4pr)9-Jh=ed@IxVVLcSl>d$X)e`}s8hw?EmWb@dc}*cC@$uH
zqo7h_*DZgLS5b!g#MNySCM}e9v=a}d{$XYmEu;~a5oWeVnNc;8<m++$*ER|$N@!Gc
z?4a3PUnL`6N(T*F+VzTSVs{4>)m5@Yz2UQ!_^GN6IXtFBZ<U_}C=J+M8fl_xlpPTL
zK=e@BQ!Bc6(M?OQSlLAdE;n?+Q+);OUaC$oQ_NKAb9<nm{(jgEMU}Ks+GbEqA(6F*
z3NI(3emGHY7|;R(cg)lFabMEMxG6Z!h-ze2soES(FhiolDB2w&xQD8zLX32RHcT8`
zbdoWc{vZpDnRi`k%xR9Q%~9=5^1aF5fxvNffRP~N3GZKx0R@wV5FstXjHtaVI+2Xv
zsPdTeuZ7)+WYkTNL%j`c)vk7%gAcQ&<SPk~0<Rzy*KUw7RCih9f2ztH(u5XgWDvL*
zgWogV8x~^by%DW-pKEzMnu)EA)DzL%5iT>i%;GYe%N#Cqxje#U9+x&Qk8*j8%X}^i
zxIE5fA(tn(JjrDdm&II`a9PUbDK5*nJk8}9F3)m#j?430mM=?8imlZyXSE|36p<;6
z^`a8&vmCVaa49ag>8W-+qli~^I89uc!<Y10C%%=hXEfj$P5<x+ucqstXYsINbvhlc
hK#%K52`&?h^RPS&;5_~1JpQQYPoLq}HW69I<R2qrKq>$L

diff --git a/core/src/components/login/LoginForm.vue b/core/src/components/login/LoginForm.vue
index 5c2b524248..d29770f39e 100644
--- a/core/src/components/login/LoginForm.vue
+++ b/core/src/components/login/LoginForm.vue
@@ -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 {
diff --git a/core/src/login.js b/core/src/login.js
index 12f3a89630..97ba821329 100644
--- a/core/src/login.js
+++ b/core/src/login.js
@@ -61,5 +61,6 @@ new View({
 		autoCompleteAllowed: fromStateOr('loginAutocomplete', true),
 		resetPasswordTarget: fromStateOr('resetPasswordTarget', ''),
 		resetPasswordUser: fromStateOr('resetPasswordUser', ''),
+		directLogin: query.direct === '1'
 	}
 }).$mount('#login');
diff --git a/core/src/views/Login.vue b/core/src/views/Login.vue
index d1127e05f9..b518772028 100644
--- a/core/src/views/Login.vue
+++ b/core/src/views/Login.vue
@@ -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,