From bb18af414b9ef60f7a232ee9f83f9faeeb4ebdac Mon Sep 17 00:00:00 2001
From: RMidhunSuresh <hi@midhun.dev>
Date: Thu, 25 Nov 2021 15:18:03 +0530
Subject: [PATCH 1/2] Convert SessionInfoStorage.js to ts

---
 ...onInfoStorage.js => SessionInfoStorage.ts} | 35 +++++++++++++++----
 src/platform/web/Platform.js                  |  2 +-
 2 files changed, 29 insertions(+), 8 deletions(-)
 rename src/matrix/sessioninfo/localstorage/{SessionInfoStorage.js => SessionInfoStorage.ts} (64%)

diff --git a/src/matrix/sessioninfo/localstorage/SessionInfoStorage.js b/src/matrix/sessioninfo/localstorage/SessionInfoStorage.ts
similarity index 64%
rename from src/matrix/sessioninfo/localstorage/SessionInfoStorage.js
rename to src/matrix/sessioninfo/localstorage/SessionInfoStorage.ts
index ce795916..fd407c6a 100644
--- a/src/matrix/sessioninfo/localstorage/SessionInfoStorage.js
+++ b/src/matrix/sessioninfo/localstorage/SessionInfoStorage.ts
@@ -14,12 +14,33 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-export class SessionInfoStorage {
-    constructor(name) {
+interface ISessionInfo {
+    id: string;
+    deviceId: string;
+    userId: string;
+    homeserver: string;
+    homeServer: string;
+    accessToken: string;
+    lastUsed: number;
+}
+
+// todo: this should probably be in platform/types?
+interface ISessionInfoStorage {
+    getAll(): Promise<ISessionInfo[]>;
+    updateLastUsed(id: string, timestamp: number): Promise<void>;
+    get(id: string): Promise<ISessionInfo | undefined>;
+    add(sessionInfo: ISessionInfo): Promise<void>;
+    delete(sessionId: string): Promise<void>;
+}
+
+export class SessionInfoStorage implements ISessionInfoStorage {
+    private readonly _name: string;
+
+    constructor(name: string) {
         this._name = name;
     }
 
-    getAll() {
+    getAll(): Promise<ISessionInfo[]> {
         const sessionsJson = localStorage.getItem(this._name);
         if (sessionsJson) {
             const sessions = JSON.parse(sessionsJson);
@@ -30,7 +51,7 @@ export class SessionInfoStorage {
         return Promise.resolve([]);
     }
 
-    async updateLastUsed(id, timestamp) {
+    async updateLastUsed(id: string, timestamp: number): Promise<void> {
         const sessions = await this.getAll();
         if (sessions) {
             const session = sessions.find(session => session.id === id);
@@ -41,20 +62,20 @@ export class SessionInfoStorage {
         }
     }
 
-    async get(id) {
+    async get(id: string): Promise<ISessionInfo | undefined> {
         const sessions = await this.getAll();
         if (sessions) {
             return sessions.find(session => session.id === id);
         }
     }
 
-    async add(sessionInfo) {
+    async add(sessionInfo: ISessionInfo): Promise<void> {
         const sessions = await this.getAll();
         sessions.push(sessionInfo);
         localStorage.setItem(this._name, JSON.stringify(sessions));
     }
 
-    async delete(sessionId) {
+    async delete(sessionId: string): Promise<void> {
         let sessions = await this.getAll();
         sessions = sessions.filter(s => s.id !== sessionId);
         localStorage.setItem(this._name, JSON.stringify(sessions));
diff --git a/src/platform/web/Platform.js b/src/platform/web/Platform.js
index f6cd2895..67f747ab 100644
--- a/src/platform/web/Platform.js
+++ b/src/platform/web/Platform.js
@@ -17,7 +17,7 @@ limitations under the License.
 import {createFetchRequest} from "./dom/request/fetch.js";
 import {xhrRequest} from "./dom/request/xhr.js";
 import {StorageFactory} from "../../matrix/storage/idb/StorageFactory";
-import {SessionInfoStorage} from "../../matrix/sessioninfo/localstorage/SessionInfoStorage.js";
+import {SessionInfoStorage} from "../../matrix/sessioninfo/localstorage/SessionInfoStorage";
 import {SettingsStorage} from "./dom/SettingsStorage.js";
 import {Encoding} from "./utils/Encoding.js";
 import {OlmWorker} from "../../matrix/e2ee/OlmWorker.js";

From 0c464608616c54a20d1e96e3da69af9e2939c9cf Mon Sep 17 00:00:00 2001
From: RMidhunSuresh <hi@midhun.dev>
Date: Thu, 2 Dec 2021 11:20:40 +0530
Subject: [PATCH 2/2] Add comment

---
 src/matrix/sessioninfo/localstorage/SessionInfoStorage.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/matrix/sessioninfo/localstorage/SessionInfoStorage.ts b/src/matrix/sessioninfo/localstorage/SessionInfoStorage.ts
index fd407c6a..ebe575f6 100644
--- a/src/matrix/sessioninfo/localstorage/SessionInfoStorage.ts
+++ b/src/matrix/sessioninfo/localstorage/SessionInfoStorage.ts
@@ -19,7 +19,7 @@ interface ISessionInfo {
     deviceId: string;
     userId: string;
     homeserver: string;
-    homeServer: string;
+    homeServer: string; // deprecate this over time
     accessToken: string;
     lastUsed: number;
 }