This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 827
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Get rid of support for legacy login params
Signed-off-by: Michael Telatynski <[email protected]>
- Loading branch information
Showing
1 changed file
with
1 addition
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,6 +2,7 @@ | |
Copyright 2015, 2016 OpenMarket Ltd | ||
Copyright 2017 Vector Creations Ltd | ||
Copyright 2018 New Vector Ltd | ||
Copyright 2019 Michael Telatynski <[email protected]> | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
|
@@ -87,40 +88,30 @@ export default class Login { | |
const isEmail = username.indexOf("@") > 0; | ||
|
||
let identifier; | ||
let legacyParams; // parameters added to support old HSes | ||
if (phoneCountry && phoneNumber) { | ||
identifier = { | ||
type: 'm.id.phone', | ||
country: phoneCountry, | ||
number: phoneNumber, | ||
}; | ||
// No legacy support for phone number login | ||
} else if (isEmail) { | ||
identifier = { | ||
type: 'm.id.thirdparty', | ||
medium: 'email', | ||
address: username, | ||
}; | ||
legacyParams = { | ||
medium: 'email', | ||
address: username, | ||
}; | ||
} else { | ||
identifier = { | ||
type: 'm.id.user', | ||
user: username, | ||
}; | ||
legacyParams = { | ||
user: username, | ||
}; | ||
} | ||
|
||
const loginParams = { | ||
password: pass, | ||
identifier: identifier, | ||
initial_device_display_name: this._defaultDeviceDisplayName, | ||
}; | ||
Object.assign(loginParams, legacyParams); | ||
|
||
const tryFallbackHs = (originalError) => { | ||
return sendLoginRequest( | ||
|