From 826dad2ad099080651f988ed9c64bb5107666715 Mon Sep 17 00:00:00 2001 From: nova Date: Thu, 12 Dec 2019 18:23:41 +0530 Subject: [PATCH] cleanup of frontend --- chatto/src/main/javascript/ts/src/main.ts | 1 + .../ts/src/model/ChatModelHelper.ts | 18 +++++--------- .../main/javascript/ts/src/model/UserModel.ts | 7 +++--- .../ts/src/service/SJCLEncryptionService.ts | 6 ++--- .../main/javascript/ts/src/view/ChatView.ts | 24 +++++++------------ chatto/src/main/resources/templates/chat.html | 2 +- 6 files changed, 22 insertions(+), 36 deletions(-) diff --git a/chatto/src/main/javascript/ts/src/main.ts b/chatto/src/main/javascript/ts/src/main.ts index fc3d299..f21fe8c 100644 --- a/chatto/src/main/javascript/ts/src/main.ts +++ b/chatto/src/main/javascript/ts/src/main.ts @@ -130,3 +130,4 @@ ns.success("Welcome"); const ss = FuseSearchService.getInstance([""]); const test = Builder().build(); + diff --git a/chatto/src/main/javascript/ts/src/model/ChatModelHelper.ts b/chatto/src/main/javascript/ts/src/model/ChatModelHelper.ts index 5bd6760..ed826fc 100644 --- a/chatto/src/main/javascript/ts/src/model/ChatModelHelper.ts +++ b/chatto/src/main/javascript/ts/src/model/ChatModelHelper.ts @@ -1,17 +1,13 @@ -import { ChatMessageDTO } from "../dto/ChatMessageDTO"; - import * as log from "loglevel"; - -import { ChatMessageViewModel } from "../viewmodel/ChatMessageViewModel"; - -import { JsonAPI } from "../singleton/JsonAPI"; - -import { fetchErrorHandler } from "./FetchErrorHandler"; - +import { ChatMessageDTO } from "../dto/ChatMessageDTO"; import { EncryptionService } from "../service/EncryptionService"; import { SJCLEncryptionService } from "../service/SJCLEncryptionService"; -import { ChatModel } from "./ChatModel" +import { JsonAPI } from "../singleton/JsonAPI"; import { Sprintf } from "../singleton/Sprintf"; +import { ChatMessageViewModel } from "../viewmodel/ChatMessageViewModel"; +import { ChatModel } from "./ChatModel"; +import { fetchErrorHandler } from "./FetchErrorHandler"; + export class ChatModelHelper { private static readonly _encryptionService: EncryptionService = new SJCLEncryptionService(); @@ -26,8 +22,6 @@ export class ChatModelHelper { return data.map(vm => this.toChatMessageVM(vm, passphrase)); } } - - // return null; } private static toChatMessageVM(chatMessageDTO: ChatMessageDTO, passphrase: string): ChatMessageViewModel { diff --git a/chatto/src/main/javascript/ts/src/model/UserModel.ts b/chatto/src/main/javascript/ts/src/model/UserModel.ts index 916f2c0..68d98bc 100644 --- a/chatto/src/main/javascript/ts/src/model/UserModel.ts +++ b/chatto/src/main/javascript/ts/src/model/UserModel.ts @@ -67,7 +67,7 @@ export class UserModel implements Subject { */ public getActiveUsers(): void { if(JsonAPI.authToken!= null){ - this.getActiveUsersAjax(JsonAPI.authToken, JsonAPI.ACTIVE_USERS_GET) + this.getActiveUsersAjax(JsonAPI.authToken) .then(data => { // // activeUsers = data; // sessionStorage.setItem('activeUsers', JSON.stringify(data)); @@ -82,10 +82,9 @@ export class UserModel implements Subject { } } - async getActiveUsersAjax(authToken2: string, URL: string): Promise { + async getActiveUsersAjax(authToken: string): Promise { let headers = new Headers(); - // headers.append('Authorization', basicAuthToken); - headers.append('X-AUTH-TOKEN', authToken2); + headers.append('X-AUTH-TOKEN', authToken); let response = await fetch(JsonAPI.ACTIVE_USERS_GET, { method: 'GET', headers: headers diff --git a/chatto/src/main/javascript/ts/src/service/SJCLEncryptionService.ts b/chatto/src/main/javascript/ts/src/service/SJCLEncryptionService.ts index 913bea2..15d4d2c 100644 --- a/chatto/src/main/javascript/ts/src/service/SJCLEncryptionService.ts +++ b/chatto/src/main/javascript/ts/src/service/SJCLEncryptionService.ts @@ -3,12 +3,12 @@ import * as sjcl from "sjcl"; import { MessageCipherDTO } from "../dto/MessageCipherDTO"; export class SJCLEncryptionService implements EncryptionService { - private readonly params = { mode: "gcm", ts: 128, adata: "", iter: 10000} + private readonly params = { mode: "gcm", ts: 128, adata: "", iter: 10000 } public encrypt(passphrase: string, plainText: string): MessageCipherDTO { // @ts-ignore return JSON.parse(sjcl.encrypt(passphrase, plainText, this.params) as string) as MessageCipherDTO; - } - + } + public decrypt(passphrase: string, cipher: MessageCipherDTO): string { return sjcl.decrypt(passphrase, JSON.stringify(cipher), undefined, undefined); } diff --git a/chatto/src/main/javascript/ts/src/view/ChatView.ts b/chatto/src/main/javascript/ts/src/view/ChatView.ts index b4b3872..f187e40 100644 --- a/chatto/src/main/javascript/ts/src/view/ChatView.ts +++ b/chatto/src/main/javascript/ts/src/view/ChatView.ts @@ -1,27 +1,19 @@ -import { Observer } from "../observe/Observer"; -import { TemplateFactory } from "../template/TemplateFactory"; -import { ChatModel } from "../model/ChatModel"; -import { ChatMessageViewModel } from "../viewmodel/ChatMessageViewModel"; -import * as log from 'loglevel'; import * as DOMPurify from 'dompurify'; -import { MarkDownService } from "../service/MarkDownService"; -import { MarkDownItMarkDownService } from "../service/MarkDownItMarkDownService"; -import { JsonAPI } from "../singleton/JsonAPI"; +import * as log from 'loglevel'; +import { ChatMessageDTO } from "../dto/ChatMessageDTO"; import { MessageCipherDTO } from "../dto/MessageCipherDTO"; -import { SJCLEncryptionService } from "../service/SJCLEncryptionService"; +import { ChatModel } from "../model/ChatModel"; +import { Observer } from "../observe/Observer"; import { EncryptionService } from "../service/EncryptionService"; -import { ChatMessageDTO } from "../dto/ChatMessageDTO"; -import { fetchHandler } from "./FetchHandler"; +import { MarkDownService } from "../service/MarkDownService"; +import { JsonAPI } from "../singleton/JsonAPI"; +import { ChatMessageViewModel } from "../viewmodel/ChatMessageViewModel"; import { ChatViewDeps } from "./ChatViewDeps"; +import { fetchHandler } from "./FetchHandler"; export class ChatView implements Observer { private readonly _chatModel: ChatModel; private readonly _messageContainer: HTMLElement; - // private readonly _messageSendTemplate = TemplateFactory.getTemplate('msg_container_send_template'); - // private readonly _messageReceiveTemplate = TemplateFactory.getTemplate('msg_container_template'); - // private readonly _markdownService: MarkDownService = new MarkDownItMarkDownService(); - // private readonly _encryptionService: EncryptionService = new SJCLEncryptionService(); - private readonly _messageSendTemplate: Handlebars.TemplateDelegate; private readonly _messageReceiveTemplate: Handlebars.TemplateDelegate; private readonly _markdownService: MarkDownService; diff --git a/chatto/src/main/resources/templates/chat.html b/chatto/src/main/resources/templates/chat.html index 3c5c0ba..d37250f 100644 --- a/chatto/src/main/resources/templates/chat.html +++ b/chatto/src/main/resources/templates/chat.html @@ -128,7 +128,7 @@
- +