From e86b7749c5cc4e5e85f4d356b5d18c446ef9bcec Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Tue, 8 Feb 2022 14:22:32 +0100 Subject: [PATCH] auto login chat --- src/app/guards/auth.guard.ts | 5 ++- .../set-room-owner/set-room-owner.page.ts | 1 - .../book-meeting-modal.page.ts | 1 - src/app/pages/login/login.page.ts | 1 - src/app/services/auth.service.ts | 45 +++++++++---------- src/app/services/functions/file.service.ts | 4 +- .../shared/chat/new-group/new-group.page.ts | 1 - src/app/store/session.service.ts | 6 +-- 8 files changed, 31 insertions(+), 33 deletions(-) diff --git a/src/app/guards/auth.guard.ts b/src/app/guards/auth.guard.ts index 74a8e799d..b0724113e 100644 --- a/src/app/guards/auth.guard.ts +++ b/src/app/guards/auth.guard.ts @@ -1,6 +1,7 @@ import { Injectable } from '@angular/core'; import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot, UrlTree, Router } from '@angular/router'; import { Observable } from 'rxjs'; +import { AuthService } from '../services/auth.service'; import { LocalstoreService } from '../store/localstore.service'; import { SessionStore } from '../store/session.service'; @@ -10,7 +11,8 @@ import { SessionStore } from '../store/session.service'; export class AuthGuard implements CanActivate { constructor( private router:Router, - private localstoreService: LocalstoreService + private localstoreService: LocalstoreService, + private authService: AuthService, ){} canActivate( @@ -25,6 +27,7 @@ export class AuthGuard implements CanActivate { this.router.navigate(['/']); return false } else { + this.authService.loginChat(SessionStore.user) return true } } diff --git a/src/app/modals/set-room-owner/set-room-owner.page.ts b/src/app/modals/set-room-owner/set-room-owner.page.ts index ac9939bf2..89d728161 100644 --- a/src/app/modals/set-room-owner/set-room-owner.page.ts +++ b/src/app/modals/set-room-owner/set-room-owner.page.ts @@ -84,7 +84,6 @@ export class SetRoomOwnerPage implements OnInit { } this.chatService.addGroupOwner(body).subscribe((res)=>{ - alert('here'); console.log(res); this.close(); this.toastService._successMessage('Operação realizada com sucesso'); diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts index 87b8de6dd..08d599ff8 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts @@ -261,7 +261,6 @@ export class BookMeetingModalPage implements OnInit { } if(this.task.FsId == '8') { - alert('Chegou') const loader = this.toastService.loading() try { switch (this.loggeduser.Profile) { diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index 7373f3c72..46be42992 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -100,7 +100,6 @@ export class LoginPage implements OnInit { // login to API successfully if (attempt) { - if (attempt.UserId == SessionStore.user.UserId) { await this.authService.SetSession(attempt, this.userattempt); await this.authService.loginChat(this.userattempt); diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts index f26ca9f5e..5a04f1b6d 100644 --- a/src/app/services/auth.service.ts +++ b/src/app/services/auth.service.ts @@ -103,44 +103,41 @@ export class AuthService { } } - //Login to rocketChat server - async loginChat(user: UserForm) { - const expireDate = new Date(new Date().getTime() + 60*1000); + //Login to rocketChat server2 + //user: UserForm + async loginChat(user: any) { + + const expirationMinutes = 60; + let date = new Date().getTime(); + let expirationDate = new Date(new Date().getTime() + expirationMinutes*60*1000); + let postData = { - "user": user.username, - "password": user.password, + "user": user.RochetChatUser, + "password": user.Password, } let responseChat = await this.httpService.post('login', postData).toPromise(); if(responseChat) { - - setTimeout(()=>{ - - this.WsChatService.connect(); - this.WsChatService.login().then((message) => { - console.log('rocket chat login successfully', message) - this.WsChatService.setStatus('online') - }).catch((message)=>{ - console.log('rocket chat login failed', message) - }) - }, 1) - - console.log('Login to Rocket chat OK'); + console.log('Login to Rocket chat OK', responseChat); this.ValidatedUserChat = responseChat; localStorage.setItem('userChat', JSON.stringify(responseChat)); this.storageService.store(AuthConnstants.AUTH, responseChat); - - this.autologout(10000); - - return true; - + //return true; } else{ console.log('Network error'); this.presentAlert('Network error'); - return false; + //return false; } + + this.autoLoginChat(expirationDate.getTime() - date, user); + } + + async autoLoginChat(expirationDate:number, user:any){ + setTimeout(()=>{ + this.loginChat(user); + }, expirationDate) } autologout(expirationDate:number){ diff --git a/src/app/services/functions/file.service.ts b/src/app/services/functions/file.service.ts index f864b398f..d696224de 100644 --- a/src/app/services/functions/file.service.ts +++ b/src/app/services/functions/file.service.ts @@ -336,7 +336,7 @@ export class FileService { quality: 50, // allowEditing: true, resultType: CameraResultType.Uri, - source: CameraSource.Camera + source: CameraSource.Photos }); @@ -378,6 +378,8 @@ export class FileService { //loader.remove(); }); */ } + + addPictureToChat(roomId) { console.log('add picture to chat') diff --git a/src/app/shared/chat/new-group/new-group.page.ts b/src/app/shared/chat/new-group/new-group.page.ts index 9bcc2eddc..75b4f7d37 100644 --- a/src/app/shared/chat/new-group/new-group.page.ts +++ b/src/app/shared/chat/new-group/new-group.page.ts @@ -67,7 +67,6 @@ export class NewGroupPage implements OnInit{ } /* ngOnDestroy(){ - alert('Destroy') this.dataService.set("newGroup", false); this.dataService.set("task", null); this.dataService.set("newGroupName", ''); diff --git a/src/app/store/session.service.ts b/src/app/store/session.service.ts index 3e480e7bc..e1f510138 100644 --- a/src/app/store/session.service.ts +++ b/src/app/store/session.service.ts @@ -12,7 +12,7 @@ class SessionService { // main data private _user = new UserSession() // local storage keyName - private keyName: string; + private keyName: string; constructor() { @@ -73,7 +73,7 @@ class SessionService { return false } return this._user.PIN.length >= 2 - + } reset(user) { @@ -98,4 +98,4 @@ class SessionService { } -export const SessionStore = new SessionService() \ No newline at end of file +export const SessionStore = new SessionService()