Fix up merge

Author: hughns

src/domain/RootViewModel.js

@@ -93,7 +93,7 @@ export class RootViewModel extends ViewModel {
             if (oidcCallback.error) {
                 this._setSection(() => this._error = new Error(`OIDC error: ${oidcCallback.error}`));
             } else {
-                this.urlCreator.normalizeUrl();
+                this.urlRouter.normalizeUrl();
                 if (this.activeSection !== "login") {
                     this._showLogin({
                         oidc: oidcCallback,

src/domain/login/StartOIDCLoginViewModel.js

@@ -29,7 +29,7 @@ export class StartOIDCLoginViewModel extends ViewModel {
             request: this.platform.request,
             encoding: this.platform.encoding,
             crypto: this.platform.crypto,
-            urlCreator: this.urlCreator,
+            urlRouter: this.urlRouter,
         });
     }
 
@@ -60,7 +60,7 @@ export class StartOIDCLoginViewModel extends ViewModel {
         const deviceScope = this._api.generateDeviceScope();
         const p = this._api.generateParams({
             scope: `openid urn:matrix:org.matrix.msc2967.client:api:* ${deviceScope}`,
-            redirectUri: this.urlCreator.createOIDCRedirectURL(),
+            redirectUri: this.urlRouter.createOIDCRedirectURL(),
         });
         const clientId = await this._api.clientId();
         await Promise.all([

src/matrix/Client.js

@@ -203,16 +203,14 @@ export class Client {
                 }
 
                 if (loginData.expires_in) {
-                    sessionInfo.accessTokenExpiresAt = clock.now() + loginData.expires_in * 1000;
+                    sessionInfo.expiresIn = loginData.expires_in;
                 }
 
                 if (loginData.oidc_issuer) {
                     sessionInfo.oidcIssuer = loginData.oidc_issuer;
                     sessionInfo.oidcClientId = loginData.oidc_client_id;
                     sessionInfo.accountManagementUrl = loginData.oidc_account_management_url;
                 }
-
-                log.set("id", sessionId);
             } catch (err) {
                 this._error = err;
                 if (err.name === "HomeServerError") {
@@ -235,7 +233,7 @@ export class Client {
         });
     }
 
-    async _createSessionAfterAuth({deviceId, userId, accessToken, homeserver}, inspectAccountSetup, log) {
+    async _createSessionAfterAuth({deviceId, userId, accessToken, refreshToken, homeserver, expiresIn, oidcIssuer, oidcClientId, accountManagementUrl}, inspectAccountSetup, log) {
         const id = this.createNewSessionId();
         const lastUsed = this._platform.clock.now();
         const sessionInfo = {
@@ -246,14 +244,22 @@ export class Client {
             homeserver,
             accessToken,
             lastUsed,
+            refreshToken,
+            oidcIssuer,
+            oidcClientId,
+            accountManagementUrl,
         };
+        if (expiresIn) {
+            sessionInfo.accessTokenExpiresAt = lastUsed + expiresIn * 1000;
+        }
         let dehydratedDevice;
         if (inspectAccountSetup) {
             dehydratedDevice = await this._inspectAccountAfterLogin(sessionInfo, log);
             if (dehydratedDevice) {
                 sessionInfo.deviceId = dehydratedDevice.deviceId;
             }
         }
+        log.set("id", id);
         await this._platform.sessionInfoStorage.add(sessionInfo);
         // loading the session can only lead to
         // LoadStatus.Error in case of an error,

src/matrix/net/OidcApi.ts

@@ -78,16 +78,16 @@ export class OidcApi<N extends object = SegmentType> {
     _requestFn: RequestFunction;
     _encoding: any;
     _crypto: any;
-    _urlCreator: IURLRouter<N>;
+    _urlRouter: IURLRouter<N>;
     _metadataPromise: Promise<any>;
     _registrationPromise: Promise<any>;
 
-    constructor({ issuer, request, encoding, crypto, urlCreator, clientId }) {
+    constructor({ issuer, request, encoding, crypto, urlRouter, clientId }) {
         this._issuer = issuer;
         this._requestFn = request;
         this._encoding = encoding;
         this._crypto = crypto;
-        this._urlCreator = urlCreator;
+        this._urlRouter = urlRouter;
 
         if (clientId) {
             this._registrationPromise = Promise.resolve({ client_id: clientId });
@@ -97,13 +97,13 @@ export class OidcApi<N extends object = SegmentType> {
     get clientMetadata() {
         return {
             client_name: "Hydrogen Web",
-            logo_uri: this._urlCreator.absoluteUrlForAsset("icon.png"),
-            client_uri: this._urlCreator.absoluteAppUrl(),
+            logo_uri: this._urlRouter.absoluteUrlForAsset("icon.png"),
+            client_uri: this._urlRouter.absoluteAppUrl(),
             tos_uri: "https://element.io/terms-of-service",
             policy_uri: "https://element.io/privacy",
             response_types: ["code"],
             grant_types: ["authorization_code", "refresh_token"],
-            redirect_uris: [this._urlCreator.createOIDCRedirectURL()],
+            redirect_uris: [this._urlRouter.createOIDCRedirectURL()],
             id_token_signed_response_alg: "RS256",
             token_endpoint_auth_method: "none",
         };