Browse Source

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>
Roeland Jago Douma 4 years ago
parent
commit
38730b454f

File diff suppressed because it is too large
+ 0 - 0
core/js/dist/login.js


File diff suppressed because it is too large
+ 0 - 0
core/js/dist/login.js.map


+ 8 - 0
core/src/components/login/LoginForm.vue

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

+ 2 - 1
core/src/login.js

@@ -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')

+ 5 - 0
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"
@@ -114,6 +115,10 @@ export default {
 		autoCompleteAllowed: {
 			type: Boolean,
 			default: true
+		},
+		directLogin: {
+			type: Boolean,
+			default: false
 		}
 	},
 	data() {

Some files were not shown because too many files changed in this diff