nova
/
Chatto
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
Browse Source

frnt: Applied null pattern to chatdto

master
Rohan Sircar 4 years ago
parent
e32283a60b
commit
aff632a091
2 changed files with 223 additions and 171 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      chatto/src/main/javascript/ts/src/dto/ChatMessageDTO.ts
  2. 384
      chatto/src/main/javascript/ts/src/model/ChatModelHelper.ts

10
chatto/src/main/javascript/ts/src/dto/ChatMessageDTO.ts
View File

@ -1,8 +1,8 @@
import { MessageCipherDTO } from "./MessageCipherDTO";
export class ChatMessageDTO {
public toUser: string | undefined;
public fromUser: string | undefined;
public messageCipher!: MessageCipherDTO;
public messageTime: Date | undefined | null;
}
public toUser: string = "";
public fromUser: string = "";
public messageCipher!: MessageCipherDTO;
public messageTime: Date = new Date();
}

384
chatto/src/main/javascript/ts/src/model/ChatModelHelper.ts
View File

@ -8,188 +8,240 @@ import { ChatMessageViewModel } from "../viewmodel/ChatMessageViewModel";
import { fetchErrorHandler } from "./FetchErrorHandler";
export class ChatModelHelper {
private readonly _encryptionService: EncryptionService;
private readonly _notificationService: NotificationService;
private readonly _encryptionService: EncryptionService;
private readonly _notificationService: NotificationService;
constructor(
encryptionService: EncryptionService,
notificationService: NotificationService
) {
this._encryptionService = encryptionService;
this._notificationService = notificationService;
}
constructor(encryptionService: EncryptionService, notificationService: NotificationService) {
this._encryptionService = encryptionService;
this._notificationService = notificationService;
public async getMessages(
userName: string,
passphrase: string,
page: number | null,
lastMessageTime: Date | null,
op: string
): Promise<ChatMessageViewModel[]> {
switch (op) {
case "page": {
const data: ChatMessageDTO[] = await this._getPaginatedMessagesAjax(
userName,
page!
);
const cVMs = Promise.all(
data.map((vm) => this._toChatMessageVMAsync(vm, passphrase)).reverse()
);
return cVMs;
}
case "new": {
const data: ChatMessageDTO[] = await this._getPaginatedMessagesAjax(
userName,
page!
);
const cVMs = Promise.all(
data.map((vm) => this._toChatMessageVMAsync(vm, passphrase)).reverse()
);
return cVMs;
}
case "update": {
const data: ChatMessageDTO[] = await this._getNewMessagesAjax(
userName,
lastMessageTime!
);
const cVMs = Promise.all(
data.map((vm) => this._toChatMessageVMAsync(vm, passphrase)).reverse()
);
return cVMs;
}
default: {
log.error("Invalid operation");
return Array();
}
}
}
public async getMessages(userName: string, passphrase: string, page: number | null, lastMessageTime: Date | null, op: string): Promise<ChatMessageViewModel[]> {
switch (op) {
case "page": {
const data: ChatMessageDTO[] = await this._getPaginatedMessagesAjax(userName, page!);
const cVMs = Promise.all(data.map(vm => this._toChatMessageVMAsync(vm, passphrase)).reverse());
return cVMs;
}
case "new": {
const data: ChatMessageDTO[] = await this._getPaginatedMessagesAjax(userName, page!);
const cVMs = Promise.all(data.map(vm => this._toChatMessageVMAsync(vm, passphrase)).reverse());
return cVMs;
}
case "update": {
const data: ChatMessageDTO[] = await this._getNewMessagesAjax(userName, lastMessageTime!);
const cVMs = Promise.all(data.map(vm => this._toChatMessageVMAsync(vm, passphrase)).reverse());
return cVMs;
}
default: {
log.error("Invalid operation");
return Array();
}
}
public async isPassphraseValid(
passphrase: string,
userName: string
): Promise<boolean> {
const messages: ChatMessageDTO[] = await this._getPaginatedMessagesAjax(
userName,
0
);
if (messages.length === 0) return true;
try {
this._encryptionService.decrypt(passphrase, messages[0].messageCipher);
} catch (error) {
return false;
}
return true;
}
public async isPassphraseValid(passphrase: string, userName: string): Promise<boolean> {
const messages: ChatMessageDTO[] = await this._getPaginatedMessagesAjax(userName, 0);
if (messages.length === 0) return true;
try {
this._encryptionService.decrypt(passphrase, messages[0].messageCipher)
} catch (error) {
return false;
}
return true
}
private async _toChatMessageVMAsync(
chatMessageDTO: ChatMessageDTO,
passphrase: string
): Promise<ChatMessageViewModel> {
const vm = new ChatMessageViewModel();
vm.fromUser = chatMessageDTO.fromUser;
vm.toUser = chatMessageDTO.toUser;
// vm.messageTime = chatMessageDTO.messageTime;
chatMessageDTO.messageTime == null
? log.error("Message time somehow null")
: (vm.messageTime = chatMessageDTO.messageTime);
vm.message = await this._encryptionService.decryptAsPromise(
passphrase,
chatMessageDTO.messageCipher
);
return vm;
}
private async _toChatMessageVMAsync(chatMessageDTO: ChatMessageDTO, passphrase: string): Promise<ChatMessageViewModel> {
const vm = new ChatMessageViewModel();
vm.fromUser = chatMessageDTO.fromUser;
vm.toUser = chatMessageDTO.toUser;
// vm.messageTime = chatMessageDTO.messageTime;
chatMessageDTO.messageTime == null ? log.error("Message time somehow null") : vm.messageTime = chatMessageDTO.messageTime;
vm.message = await this._encryptionService.decryptAsPromise(passphrase, chatMessageDTO.messageCipher);
return vm;
}
private _toChatMessageVM(
chatMessageDTO: ChatMessageDTO,
passphrase: string
): ChatMessageViewModel {
const vm = new ChatMessageViewModel();
vm.fromUser = chatMessageDTO.fromUser;
vm.toUser = chatMessageDTO.toUser;
// vm.messageTime = chatMessageDTO.messageTime;
chatMessageDTO.messageTime == null
? log.error("Message time somehow null")
: (vm.messageTime = chatMessageDTO.messageTime);
vm.message = this._encryptionService.decrypt(
passphrase,
chatMessageDTO.messageCipher
) as string;
return vm;
}
private _toChatMessageVM(chatMessageDTO: ChatMessageDTO, passphrase: string): ChatMessageViewModel {
const vm = new ChatMessageViewModel();
vm.fromUser = chatMessageDTO.fromUser;
vm.toUser = chatMessageDTO.toUser;
// vm.messageTime = chatMessageDTO.messageTime;
chatMessageDTO.messageTime == null ? log.error("Message time somehow null") : vm.messageTime = chatMessageDTO.messageTime;
vm.message = this._encryptionService.decrypt(passphrase, chatMessageDTO.messageCipher) as string;
return vm;
private async _getAllMessagesAjax(toUser: string): Promise<any> {
const headers = new Headers();
if (JsonAPI.authToken == null) {
log.error("authToken null");
return;
}
private async _getAllMessagesAjax(toUser: string): Promise<any> {
const headers = new Headers();
if (JsonAPI.authToken == null) {
log.error("authToken null");
return;
};
headers.append('X-AUTH-TOKEN', JsonAPI.authToken);
const url = Sprintf(JsonAPI.CHAT_MESSAGES_GET, toUser);
log.debug(url)
const response = await fetch(url, {
method: 'GET',
headers: headers
});
log.debug(response.clone());
if (fetchErrorHandler(response.clone(), this._notificationService)) {
return null;
}
const data: Promise<any> = await response.json();
return data;
headers.append("X-AUTH-TOKEN", JsonAPI.authToken);
const url = Sprintf(JsonAPI.CHAT_MESSAGES_GET, toUser);
log.debug(url);
const response = await fetch(url, {
method: "GET",
headers: headers,
});
log.debug(response.clone());
if (fetchErrorHandler(response.clone(), this._notificationService)) {
return null;
}
const data: Promise<any> = await response.json();
return data;
}
private async _getPaginatedMessagesAjax(toUser: string, page: number): Promise<any> {
const headers = new Headers();
if (JsonAPI.authToken == null) {
log.error("authToken null");
return;
};
headers.append('X-AUTH-TOKEN', JsonAPI.authToken);
const url = Sprintf(JsonAPI.CHAT_MESSAGE_PAGE_GET, toUser, page, 5);
log.debug(url)
const response = await fetch(url, {
method: 'GET',
headers: headers
});
log.debug(response.clone());
if (fetchErrorHandler(response.clone(), this._notificationService)) {
return null;
}
const data: Promise<any> = await response.json();
function func(data: any) {
const d1 = data.map((d: any) => {
if (d.messageTime == null)
return null;
private async _getPaginatedMessagesAjax(
toUser: string,
page: number
): Promise<any> {
const headers = new Headers();
if (JsonAPI.authToken == null) {
log.error("authToken null");
return;
}
headers.append("X-AUTH-TOKEN", JsonAPI.authToken);
const url = Sprintf(JsonAPI.CHAT_MESSAGE_PAGE_GET, toUser, page, 5);
log.debug(url);
const response = await fetch(url, {
method: "GET",
headers: headers,
});
log.debug(response.clone());
if (fetchErrorHandler(response.clone(), this._notificationService)) {
return null;
}
const data: Promise<any> = await response.json();
function func(data: any) {
const d1 = data.map((d: any) => {
if (d.messageTime == null) return null;
d.messageTime = new Date(d.messageTime)
return d;
});
return d1;
}
const data2 = func(data)
return data2;
d.messageTime = new Date(d.messageTime);
return d;
});
return d1;
}
const data2 = func(data);
return data2;
}
private async _getMessagesAjax(toUser: string, lastMessageTimeStamp: Date): Promise<any> {
const headers = new Headers();
if (JsonAPI.authToken == null) {
log.error("authToken null");
return;
};
headers.append('X-AUTH-TOKEN', JsonAPI.authToken);
// const url = Sprintf(JsonAPI.CHAT_MESSAGES_GET, toUser, page, 5);
// log.debug(url)
const response = await fetch(`/api/chat/get/messages/${toUser}`, {
method: 'GET',
headers: headers
});
log.debug(response.clone());
if (fetchErrorHandler(response.clone(), this._notificationService)) {
return null;
}
const data: Promise<any> = await response.json();
function func(data: any) {
const d1 = data.map((d: any) => {
if (d.messageTime == null)
return null;
private async _getMessagesAjax(
toUser: string,
lastMessageTimeStamp: Date
): Promise<any> {
const headers = new Headers();
if (JsonAPI.authToken == null) {
log.error("authToken null");
return;
}
headers.append("X-AUTH-TOKEN", JsonAPI.authToken);
// const url = Sprintf(JsonAPI.CHAT_MESSAGES_GET, toUser, page, 5);
// log.debug(url)
const response = await fetch(`/api/chat/get/messages/${toUser}`, {
method: "GET",
headers: headers,
});
log.debug(response.clone());
if (fetchErrorHandler(response.clone(), this._notificationService)) {
return null;
}
const data: Promise<any> = await response.json();
function func(data: any) {
const d1 = data.map((d: any) => {
if (d.messageTime == null) return null;
d.messageTime = new Date(d.messageTime)
return d;
});
return d1;
}
const data2 = func(data)
return data2;
d.messageTime = new Date(d.messageTime);
return d;
});
return d1;
}
const data2 = func(data);
return data2;
}
private async _getNewMessagesAjax(toUser: string, lastMessageTimeStamp: Date): Promise<any> {
const headers = new Headers();
if (JsonAPI.authToken == null) {
log.error("authToken null");
return;
};
headers.append('X-AUTH-TOKEN', JsonAPI.authToken);
// const url = Sprintf(JsonAPI.CHAT_MESSAGES_GET, toUser, page, 5);
// log.debug(url)
// log.debug(lastMessageTimeStamp);
// log.debug(lastMessageTimeStamp.toISOString())
const response = await fetch(`/api/chat/get/messages/${toUser}/${lastMessageTimeStamp.toISOString()}`, {
method: 'GET',
headers: headers
});
log.debug(response.clone());
if (fetchErrorHandler(response.clone(), this._notificationService)) {
return null;
}
const data: Promise<any> = await response.json();
function func(data: any) {
const d1 = data.map((d: any) => {
if (d.messageTime == null)
return null;
private async _getNewMessagesAjax(
toUser: string,
lastMessageTimeStamp: Date
): Promise<any> {
const headers = new Headers();
if (JsonAPI.authToken == null) {
log.error("authToken null");
return;
}
headers.append("X-AUTH-TOKEN", JsonAPI.authToken);
// const url = Sprintf(JsonAPI.CHAT_MESSAGES_GET, toUser, page, 5);
// log.debug(url)
// log.debug(lastMessageTimeStamp);
// log.debug(lastMessageTimeStamp.toISOString())
const response = await fetch(
`/api/chat/get/messages/${toUser}/${lastMessageTimeStamp.toISOString()}`,
{
method: "GET",
headers: headers,
}
);
log.debug(response.clone());
if (fetchErrorHandler(response.clone(), this._notificationService)) {
return null;
}
const data: Promise<any> = await response.json();
function func(data: any) {
const d1 = data.map((d: any) => {
if (d.messageTime == null) return null;
d.messageTime = new Date(d.messageTime)
return d;
});
return d1;
}
const data2 = func(data)
log.debug("LOOK HERE NOW ", data, data2)
return data2;
d.messageTime = new Date(d.messageTime);
return d;
});
return d1;
}
}
const data2 = func(data);
return data2;
}
}
Write Preview
Loading…
Cancel
Save