butter/keanu-weblite
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Guest access work

Browse source
This commit is contained in:
N-Pex 2020-11-25 10:02:24 +01:00
parent a164571218
commit 5589131c86
5 changed files with 138 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

69
src/services/matrix.service.js
View file

@ -31,7 +31,7 @@ export default {
computed: {
ready() {
return this.matrixClient != null;
return this.matrixClient != null && this.matrixClientReady;
},
currentUser() {
@ -41,32 +41,40 @@ export default {
currentRoomId() {
return this.$store.state.currentRoomId;
},
currentRoom() {
return this.getRoom(this.currentRoomId);
},
},
methods: {
login(user) {
const tempMatrixClient = sdk.createClient(user.server);
var retUser;
return tempMatrixClient
.login("m.login.password", { user: user.username, password: user.password, type: "m.login.password" })
.then((response) => {
localStorage.setItem('user', JSON.stringify(response));
return response;
})
var promiseLogin;
if (user.is_guest) {
promiseLogin = tempMatrixClient
.registerGuest({}, undefined)
.then((response) => {
console.log("Response", response);
response.is_guest = true;
localStorage.setItem('user', JSON.stringify(response));
return response;
})
} else {
promiseLogin = tempMatrixClient
.login("m.login.password", { user: user.username, password: user.password, type: "m.login.password" })
.then((response) => {
localStorage.setItem('user', JSON.stringify(response));
return response;
})
}
return promiseLogin
.then(user => {
retUser = user;
return this.getMatrixClient(user);
})
.then(() => {
// Ready to use! Start by loading rooms.
this.initClient();
return retUser;
})
},
logout() {
@ -87,6 +95,18 @@ export default {
},
async getMatrixClient(user) {
if (this.matrixClientReady) {
return new Promise((resolve,ignoredreject) => {
resolve(user);
})
} else if (this.matrixClient) {
return new Promise((resolve,ignoredreject) => {
this.matrixClient.once('Matrix.initialized', (ignoredclient) => {
resolve(user);
});
})
}
const matrixStore = new sdk.MemoryStore(window.localStorage);
const webStorageSessionStore = new sdk.WebStorageSessionStore(
window.localStorage
@ -104,9 +124,13 @@ export default {
sessionStore: webStorageSessionStore,
deviceId: user.device_id,
accessToken: user.access_token,
timelineSupport: true
timelineSupport: true,
unstableClientRelationAggregation: true
}
this.matrixClient = sdk.createClient(opts);
if (user.is_guest) {
this.matrixClient.setGuest(true);
}
return this.matrixClient
.initCrypto()
.then(() => {
@ -136,7 +160,12 @@ export default {
)
});
}
});
})
.then(() => {
// Ready to use! Start by loading rooms.
this.initClient();
return user;
})
},
addMatrixClientListeners(client) {
@ -159,7 +188,7 @@ export default {
Vue.set(room, "topic", event.getContent().topic);
}
}
break;
break;
case "m.room.avatar": {
const room = this.matrixClient.getRoom(event.getRoomId());
@ -167,7 +196,7 @@ export default {
Vue.set(room, "avatar", room.getAvatarUrl(this.matrixClient.getHomeserverUrl(), 80, 80, "scale", true));
}
}
break;
break;
}
},