PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Update generated Riot permalinks

Browse source 
Also adds some safety around the Riot URL to ensure it mostly looks like a URL
This commit is contained in:
Travis Ralston 2019-09-30 16:05:28 -06:00
parent 199dfa7bf9
commit 8acaa3ce95
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/utils/permalinks/RiotPermalinkConstructor.js
View file

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
import PermalinkConstructor from "./PermalinkConstructor"; import PermalinkConstructor, {PermalinkParts} from "./PermalinkConstructor";
/** /**
* Generates permalinks that self-reference the running webapp * Generates permalinks that self-reference the running webapp
@ -26,31 +26,31 @@ export default class RiotPermalinkConstructor extends PermalinkConstructor {
constructor(riotUrl: string) { constructor(riotUrl: string) {
super(); super();
this._riotUrl = riotUrl; this._riotUrl = riotUrl;
if (!this._riotUrl.startsWith("http:") && !this._riotUrl.startsWith("https:")) {
throw new Error("Riot prefix URL does not appear to be an HTTP(S) URL");
}
} }
forEvent(roomId: string, eventId: string, serverCandidates: string[]): string { forEvent(roomId: string, eventId: string, serverCandidates: string[]): string {
// TODO: Fix URL return `${this._riotUrl}/#/room/${roomId}/${eventId}${this.encodeServerCandidates(serverCandidates)}`;
return `${this._riotUrl}/#/${roomId}/${eventId}${this.encodeServerCandidates(serverCandidates)}`;
} }
forRoom(roomIdOrAlias: string, serverCandidates: string[]): string { forRoom(roomIdOrAlias: string, serverCandidates: string[]): string {
// TODO: Fix URL return `${this._riotUrl}/#/room/${roomIdOrAlias}${this.encodeServerCandidates(serverCandidates)}`;
return `${this._riotUrl}/#/${roomIdOrAlias}${this.encodeServerCandidates(serverCandidates)}`;
} }
forUser(userId: string): string { forUser(userId: string): string {
// TODO: Fix URL return `${this._riotUrl}/#/user/${userId}`;
return `${this._riotUrl}/#/${userId}`;
} }
forGroup(groupId: string): string { forGroup(groupId: string): string {
// TODO: Fix URL return `${this._riotUrl}/#/group/${groupId}`;
return `${this._riotUrl}/#/${groupId}`;
} }
isPermalinkHost(testHost: string): boolean { isPermalinkHost(testHost: string): boolean {
// TODO: Actual check const parsedUrl = new URL(this._riotUrl);
return testHost === this._riotUrl; return testHost === (parsedUrl.host || parsedUrl.hostname); // one of the hosts should match
} }
encodeServerCandidates(candidates: string[]) { encodeServerCandidates(candidates: string[]) {