Matrix-Mirrors/matrix-dimension
1
0
Fork 0
mirror of https://github.com/turt2live/matrix-dimension.git synced 2024-10-01 05:05:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Change the authorization flow for the sticker picker"

Browse Source 
This reverts commit f28f817ca2.
This commit is contained in:
Travis Ralston 2018-05-20 17:41:06 -06:00
parent 11772f54e7
commit a249d6dd68
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
web/app/widget-wrappers/sticker-picker/sticker-picker.component.ts
View File

@ -22,7 +22,7 @@ export class StickerPickerWidgetWrapperComponent extends CapableWidget implement
private stickerWidgetApiSubscription: Subscription;
constructor(private activatedRoute: ActivatedRoute,
constructor(activatedRoute: ActivatedRoute,
private media: MediaService,
private scalarApi: ScalarServerApiService,
private stickerApi: StickerApiService) {
@ -30,15 +30,23 @@ export class StickerPickerWidgetWrapperComponent extends CapableWidget implement
this.supportsStickers = true;
let params: any = activatedRoute.snapshot.queryParams;
let token = params.scalar_token;
if (!token) token = localStorage.getItem("dim-scalar-token");
else localStorage.setItem("dim-scalar-token", token);
if (!params.widgetId) {
console.error("No widgetId query parameter");
this.authError = true;
} else {
ScalarWidgetApi.widgetId = params.widgetId;
}
SessionStorage.scalarToken = token;
this.authError = !token;
}
public async ngOnInit() {
public ngOnInit() {
super.ngOnInit();
this.stickerWidgetApiSubscription = ScalarWidgetApi.requestReceived.subscribe(request => {
if (request.action === "visibility") {
@ -46,21 +54,6 @@ export class StickerPickerWidgetWrapperComponent extends CapableWidget implement
ScalarWidgetApi.replyAcknowledge(request);
}
});
let params: any = this.activatedRoute.snapshot.queryParams;
try {
await this.loadAccount(params.scalar_token);
localStorage.setItem("dim-scalar-token", params.scalar_token);
} catch (e) {
console.error(e);
try {
await this.loadAccount(localStorage.getItem("dim-scalar-token"))
} catch (e2) {
console.error(e2);
this.authError = true;
this.isLoading = false;
}
}
this.loadStickers();
}
@ -73,15 +66,20 @@ export class StickerPickerWidgetWrapperComponent extends CapableWidget implement
return this.media.getThumbnailUrl(mxc, width, height, method, true);
}
private async loadAccount(scalarToken: string) {
SessionStorage.scalarToken = scalarToken;
private async loadStickers() {
if (this.authError) return; // Don't bother
if (!SessionStorage.userId) {
try {
const info = await this.scalarApi.getAccount();
SessionStorage.userId = info.user_id;
console.log("Dimension scalar_token belongs to " + SessionStorage.userId);
} catch (e) {
console.error(e);
this.authError = true;
return;
}
}
private async loadStickers() {
if (this.authError) return; // Don't bother
console.log("Attempting to load available stickers...");
try {