validate user permision on chat

This commit is contained in:
Peter Maquiran
2024-08-23 11:10:52 +01:00
parent 92b2b33e46
commit c9b50620fe
20 changed files with 253 additions and 99 deletions
@@ -60,7 +60,6 @@ export class GroupContactsPage implements OnInit {
if(addMembers.isOk()) {
console.log('addMembers', addMembers)
// this.addContacts(this.roomId);
this.openGroupMessage.emit(this.roomId);
this.chatServiceService.getRoomById(this.roomId);
@@ -167,7 +167,7 @@ export class ContactsPage implements OnInit {
if(result.isOk()) {
this.openMessage.emit(result.value.data.id);
this.openMessage.emit(result.value.id);
} else if(result.error instanceof HttpErrorResponse) {
this.httpErrorHandle.httpStatusHandle(result.error)
@@ -8,7 +8,7 @@
<span *ngIf="roomStatus$ | async as roomStatus"><ion-icon *ngIf="roomStatus" class="online" name="ellipse"></ion-icon></span>
</div>
<div class="right">
<button title="Menu" class="btn-no-color" (click)="_openMessagesOptions()">
<button title="Menu" class="btn-no-color" (click)="_openMessagesOptions()" *ngIf="roomType == RoomTypeEnum.Group">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/theme/blue/icons-menu.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-menu.svg">
</ion-icon>
@@ -75,13 +75,13 @@
(error)="onImageError()"
>
<div *ngIf="SessionStore.user.UserId == message.sender.wxUserId">
<div *ngIf="SessionStore.user.UserId == message.sender.wxUserId && message.oneShot == true">
Mandou uma mensagen com visualização única
</div>
<!-- <div *ngIf="SessionStore.user.UserId != message.sender.wxUserId && message.oneShot == true"> -->
<div *ngIf="message.oneShot == true" class="cursor-pointer">
<div *ngIf="SessionStore.user.UserId != message.sender.wxUserId && message.oneShot == true">
<!-- <div *ngIf="message.oneShot == true" class="cursor-pointer"> -->
<div (click)="viewOnce($event, message, i)">
Abrir a visualização única
</div>
@@ -117,7 +117,7 @@
<fa-icon [matMenuTriggerFor]="beforeMenu" icon="chevron-down" class="message-options-icon cursor-pointer"></fa-icon>
<mat-menu #beforeMenu="matMenu" xPosition="before">
<button (click)="messageDelete(message)" class="menuButton">Apagar mensagem</button>
<button (click)="editMessage(message)" class="menuButton">Editar mensagem</button>
<button *ngIf="!message.hasAttachment" (click)="editMessage(message)" class="menuButton">Editar mensagem</button>
<button (click)="toggleEmojiPicker(message)" class="menuButton">Reagir mensagem</button>
</mat-menu>
</div>
@@ -40,8 +40,8 @@ import { SpeakerService, StartRecordingResultError, StopRecordingResultError } f
import { compressImageBase64 } from 'src/app/utils/imageCompressore';
import { ChatPopoverPage } from '../../modal/chat-popover/chat-popover.page';
import { LastMessage } from '../../utils/lastMessage';
import { UserTypingLocalRepository } from 'src/app/module/chat/data/repository/user-typing-local-data-source.service';
import { UserTypingRemoteRepositoryService } from 'src/app/module/chat/data/repository/user-typing-live-data-source.service';
import { UserTypingLocalRepository } from 'src/app/module/chat/data/repository/typing/user-typing-local-data-source.service';
import { UserTypingRemoteRepositoryService } from 'src/app/module/chat/data/repository/typing/user-typing-live-data-source.service';
import { MessageLocalDataSourceService } from 'src/app/module/chat/data/repository/message/message-local-data-source.service';
import { RoomType } from "src/app/module/chat/domain/entity/group";
import { RoomTable } from 'src/app/module/chat/infra/database/dexie/schema/room';
@@ -67,6 +67,8 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
downloadProgess = 0;
roomType!: RoomType
RoomTypeEnum = RoomType
@Input() roomId: string;
@Input() showMessages: string;
@@ -137,6 +139,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
messageDeleteSubject: Subscription
messageUpdateSubject: Subscription
messageSendSubject: Subscription
messageTypingSubject: Subscription
messages1: {[key: string]: MessageEntity[]} = {}
MessageAttachmentFileType = MessageAttachmentFileType
@@ -177,7 +180,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
ngOnChanges(changes: SimpleChanges): void {
this.roomData$ = this.RoomLocalRepository.getRoomByIdLive(this.roomId)
this.roomData$.subscribe(e => {
@@ -198,20 +200,34 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
this.roomMembers$ = this.MemberListLocalRepository.getRoomMemberByIdLive(this.roomId).pipe(
tap((members) => {
this.totalMembers = members.length
for(const member of members) {
if(member.wxUserId == SessionStore.user.UserId) {
this.isAdmin = member.isAdmin
}
}
})
)
this.roomStatus$ = this.MemberListLocalRepository.allMemberOnline(this.roomId)
this.chatServiceService.getRoomById(this.roomId)
this.userTypingLocalRepository.getUserTypingLive().subscribe((e) => {
const arrayNames = e.map(e => e.userName)
this.messageTypingSubject?.unsubscribe()
this.messageTypingSubject = this.userTypingLocalRepository.getUserTypingLiveByRoomId(this.roomId).subscribe((e) => {
const arrayNames = e.filter((b)=> b.userId != SessionStore.user.UserId).map(e => e.userName)
this.userTyping$ = e as any
const uniqueArray = [...new Set(arrayNames)];
(this.myInputRef.nativeElement as HTMLDivElement).innerHTML = '::'+ uniqueArray
})
console.log({uniqueArray})
if(uniqueArray.length >= 1) {
(this.myInputRef.nativeElement as HTMLDivElement).innerHTML = uniqueArray + '...'
} else {
(this.myInputRef.nativeElement as HTMLDivElement).innerHTML = ''
}
}) as any
}
messageStatus(message: MessageEntity) {
@@ -242,7 +258,9 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
this.messages1[this.roomId] = []
this.messages1[this.roomId] = messages
this.messages1[this.roomId].push(LastMessage)
if(messages.length >= 1) {
this.messages1[this.roomId].push(LastMessage)
}
this.loadAttachment()
setTimeout(() => {
@@ -11,6 +11,7 @@ import { HttpErrorResponse } from '@angular/common/http';
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'
import { ChatServiceService } from 'src/app/module/chat/domain/chat-service.service'
import { UDate } from 'src/app/utils/date';
import { ToastService } from 'src/app/services/toast.service';
@Component({
selector: 'app-new-group',
@@ -53,7 +54,8 @@ export class NewGroupPage implements OnInit{
private RouteService: RouteService,
private viewContainerRef: ViewContainerRef,
private httpErrorHandle: HttpErrorHandle,
private ChatServiceService: ChatServiceService
private ChatServiceService: ChatServiceService,
private toastService: ToastService,
)
{
this.loggedUserChat = SessionStore.user.ChatData['data'];
@@ -130,9 +132,11 @@ export class NewGroupPage implements OnInit{
})
if(result.isOk()) {
this.addGroupMessage.emit(result.value.data.id);
this.addGroupMessage.emit(result.value.id);
} else if(result.error instanceof HttpErrorResponse) {
this.httpErrorHandle.httpStatusHandle(result.error)
} else {
this.toastService._badRequest('Por favor, contacta um administrador.');
}
}
@@ -19,13 +19,13 @@
<ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
<br *ngIf="showLoader">
<button (click)="addUser()" class="btn-cancel" shape="round">Adicionar</button>
<button *ngIf="isAdmin" (click)="addUser()" class="btn-cancel" shape="round">Adicionar</button>
<button (click)="leaveGroup()" class="btn-cancel" shape="round">Sair do Grupo</button>
<button (click)="openChangeGroupName()" class="btn-cancel btn-cancel mt-10" shape="round" style="min-width: 192px;">Alterar
<button *ngIf="isAdmin" (click)="openChangeGroupName()" class="btn-cancel btn-cancel mt-10" shape="round" style="min-width: 192px;">Alterar
nome do grupo</button>
<button (click)="setRoomOwner()" class="btn-cancel" shape="round">Adicionar admin</button>
<button *ngIf="isAdmin" (click)="setRoomOwner()" class="btn-cancel" shape="round">Adicionar admin</button>
<div class="solid"></div>
<button (click)="close('cancel')" full class="btn-cancel mobile-only" shape="round">Cancelar</button>
<button (click)="deleteGroup()" class="btn-delete" shape="round">Apagar grupo</button>
<button *ngIf="isAdmin" (click)="deleteGroup()" class="btn-delete" shape="round">Apagar grupo</button>
</div>
</ion-content>
@@ -42,8 +42,8 @@ import { allowedDocExtension } from 'src/app/utils/allowedDocExtension';
import { JSFileToDataUrl } from 'src/app/utils/ToBase64';
import { RoomLocalRepository } from 'src/app/module/chat/data/repository/room/room-local-repository.service'
import { MemberListLocalRepository } from 'src/app/module/chat/data/repository/member-list-local-repository.service'
import { UserTypingLocalRepository } from 'src/app/module/chat/data/repository/user-typing-local-data-source.service';
import { UserTypingRemoteRepositoryService } from 'src/app/module/chat/data/repository/user-typing-live-data-source.service';
import { UserTypingLocalRepository } from 'src/app/module/chat/data/repository/typing/user-typing-local-data-source.service';
import { UserTypingRemoteRepositoryService } from 'src/app/module/chat/data/repository/typing/user-typing-live-data-source.service';
import { MessageLocalDataSourceService } from 'src/app/module/chat/data/repository/message/message-local-data-source.service';
import { MessageEnum } from 'src/app/module/chat/domain/use-case/message-create-use-case.service';
import { RoomType } from "src/app/module/chat/domain/entity/group";
+31
View File
@@ -0,0 +1,31 @@
# Gabinete Digital Chat
## Descrição
Este modulo que permite aos utilizadores criar grupos, enviar mensagens em tempo real e visualizar detalhes do grupo. O administrador do grupo é destacado na lista de membros, proporcionando uma forma clara e eficaz de gerir a comunicação em grupos.
## Funcionalidades
<!-- - **Criação e Gestão de Grupos**: Os utilizadores podem criar grupos, adicionar/remover membros e gerir detalhes do grupo. -->
- **Exibição de Detalhes do Grupo**: Visualização de informações como nome do grupo, lista de membros e destaque do administrador.
## Requisitos
### Requisitos Funcionais
- Exibição de detalhes do grupo e destaque do administrador.
### Requisitos Não Funcionais
- **Usabilidade**
- A interface do utilizador deve ser intuitiva e fácil de navegar.
- Os detalhes do grupo e a identificação do administrador devem ser claramente visíveis e de fácil acesso.
<!-- - **Desempenho**
- Baixa latência (<200ms) para entrega de mensagens.
- **Segurança**
- Comunicação encriptada de ponta a ponta. -->
## Utilização
<!-- - **Envio de Mensagens**: Envie e receba mensagens instantaneamente dentro dos grupos. -->
- **Gestão de Grupos**: O administrador do grupo pode adicionar ou remover membros e alterar os detalhes do grupo.