mirrors/vector-im-hydrogen-web
1
0
Fork 0
mirror of https://github.com/vector-im/hydrogen-web.git synced 2024-12-23 03:25:12 +01:00
Code Issues Projects Releases Wiki Activity

make startWithFinishedRegistration more broadly useful

Browse Source
This commit is contained in:
Bruno Windels 2022-10-14 10:17:32 +02:00
parent dcba6d1500
commit f46d2c1bf5
3 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/matrix/Client.js
View File

@ -146,18 +146,13 @@ export class Client {
return registration;
}
async startWithFinishedRegistration(registration) {
this._platform.logger.run("startWithFinishedRegistration", async (log) => {
const sessionInfo = registration.sessionInfo;
if (!sessionInfo) {
throw new Error("Registration.sessionInfo is not available; are you sure that registration is finished?");
}
await this.startWithSessionInfo({
accessToken: sessionInfo.access_token,
deviceId: sessionInfo.device_id,
userId: sessionInfo.user_id,
homeserver: registration.homeserver,
}, true, log);
/** Method to start client after registration or with given access token.
* To start the client after registering, use `startWithAuthData(registration.authData)`.
* `homeserver` won't be resolved or normalized using this method,
* use `lookupHomeserver` first if needed (not needed after registration) */
async startWithAuthData({accessToken, deviceId, userId, homeserver}) {
this._platform.logger.run("startWithAuthData", async (log) => {
await this._createSessionAfterAuth({accessToken, deviceId, userId, homeserver}, true, log);
});
}
@ -200,12 +195,12 @@ export class Client {
}
return;
}
await this.startWithSessionInfo(sessionInfo, inspectAccountSetup, log);
await this._createSessionAfterAuth(sessionInfo, inspectAccountSetup, log);
});
}
async startWithSessionInfo({deviceId, userId, accessToken, homeserver}, inspectAccountSetup, log) {
await log.wrap("startWithSessionInfo", async (l) => {
async _createSessionAfterAuth({deviceId, userId, accessToken, homeserver}, inspectAccountSetup, log) {
await log.wrap("_createSessionAfterAuth", async (l) => {
const id = this.createNewSessionId();
const lastUsed = this._platform.clock.now();
const sessionInfo = {

16
src/matrix/registration/Registration.ts
View File

@ -25,6 +25,7 @@ import type {
RegistrationResponseMoreDataNeeded,
RegistrationResponse,
RegistrationResponseSuccess,
AuthData,
RegistrationParams,
} from "./types";
@ -34,7 +35,7 @@ export class Registration {
private readonly _hsApi: HomeServerApi;
private readonly _accountDetails: AccountDetails;
private readonly _flowSelector: FlowSelector;
private _sessionInfo?: RegistrationResponseSuccess;
private _registerResponse?: RegistrationResponseSuccess;
public readonly homeserver: string;
constructor(homeserver: string, hsApi: HomeServerApi, accountDetails: AccountDetails, flowSelector?: FlowSelector) {
@ -93,7 +94,7 @@ export class Registration {
private async parseRegistrationResponse(response: RegistrationResponse, currentStage: BaseRegistrationStage) {
switch (response.status) {
case 200:
this._sessionInfo = response;
this._registerResponse = response;
return undefined;
case 401:
if (response.completed?.includes(currentStage.type)) {
@ -119,7 +120,14 @@ export class Registration {
}
}
get sessionInfo(): RegistrationResponseSuccess | undefined {
return this._sessionInfo;
get authData(): AuthData | undefined {
if (this._registerResponse) {
return {
accessToken: this._registerResponse.access_token,
homeserver: this.homeserver,
userId: this._registerResponse.user_id,
deviceId: this._registerResponse.device_id,
};
}
}
}

7
src/matrix/registration/types.ts
View File

@ -38,6 +38,13 @@ export type RegistrationResponseSuccess = {
status: 200;
}
export type AuthData = {
userId: string;
deviceId: string;
homeserver: string;
accessToken?: string;
}
export type RegistrationFlow = {
stages: string[];
}