solved unauthorized rockect chat url

This commit is contained in:
tiago.kayaya
2021-10-05 10:18:38 +01:00
parent 3f99ea222c
commit 5d4490e287
8 changed files with 34 additions and 30 deletions
+11 -11
View File
@@ -95,7 +95,7 @@ export class HomePage implements OnInit {
}
goto(url) {
this.router.navigate([url])
}
@@ -106,10 +106,10 @@ export class HomePage implements OnInit {
/* this.network.checkNetworkConnection;
this.network.checkNetworkDisconnection; */
// console.log('Active route ', this.router.url)
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
this.webnotification.webconnection();
this.webnotification.onReceviNotificationWeb();
/* this.webnotification.webconnection();
this.webnotification.onReceviNotificationWeb(); */
} else {
this.mobilefirstConnect();
this.notificationsService.getAndpostToken2();
@@ -132,13 +132,13 @@ export class HomePage implements OnInit {
if(window['WLAuthorizationManager']) {
if(window['WLAuthorizationManager'].obtainAccessToken) {
window['WLAuthorizationManager'].obtainAccessToken("").then((token) => {
console.log('MobileFirst Server connect: Success ' + token);
var resourceRequest = new WLResourceRequest("/adapters/javaAdapter/resource/greet/",
WLResourceRequest.GET
);
resourceRequest.setQueryParameter("name", "world");
resourceRequest.send().then(
(response) => {
@@ -178,7 +178,7 @@ export class HomePage implements OnInit {
synchro.registerCallback('Offline',()=>{
})
synchro.conected
@@ -186,7 +186,7 @@ export class HomePage implements OnInit {
synchro.registerCallback('Notification', (DataArray)=> {
this.webNotificationPopupService.sendNotification(DataArray)
this.storageService.get('Notifications').then((data:any)=>{
data.push(DataArray)
this.storageService.store("Notifications", data)
@@ -196,7 +196,7 @@ export class HomePage implements OnInit {
a.push(DataArray)
this.storageService.store("Notifications",a)
})
}, 'any')
@@ -204,7 +204,7 @@ export class HomePage implements OnInit {
document.addEventListener('pause', function () {
// console.log('App going to background');
});
document.addEventListener('resume', function () {
// console.log('App coming to foreground');
});
+3 -1
View File
@@ -65,7 +65,7 @@ export class AuthService {
}
SetSession(response: LoginUserRespose, user:UserForm) {
const session: UserSession = Object.assign(SessionStore.user, response)
const session: UserSession = Object.assign(SessionStore.user, response)
if (response) {
if( session.RoleID == 100000014) {
@@ -102,6 +102,8 @@ export class AuthService {
console.log('Login to Rocket chat OK');
this.ValidatedUserChat = responseChat;
localStorage.setItem('userChat', JSON.stringify(responseChat));
localStorage.setItem('Meteor.loginToken', JSON.stringify(responseChat['data'].userId));
localStorage.setItem('Meteor.userId', JSON.stringify(responseChat['data'].authToken));
this.storageService.store(AuthConnstants.AUTH, responseChat);
return true;
}
+1 -3
View File
@@ -9,7 +9,6 @@ import { Storage } from '@ionic/storage';
import { Message } from 'src/app/models/message.model';
import { Observable, Subject } from "rxjs/Rx";
import { WebsocketService } from './websocket.service';
import { FileService } from './functions/file.service';
@Injectable({
providedIn: 'root'
@@ -32,7 +31,6 @@ export class ChatService {
private authService: AuthService,
private storage: Storage,
private storageService:StorageService,
private fileService: FileService,
//private wsService: WebsocketService,
)
{
@@ -63,7 +61,7 @@ export class ChatService {
};
let fullUrl = "https://www.tabularium.pt/" + url;
return this.http.get(fullUrl, optionsc).subscribe(()=>{
this.fileService.viewDocumentByUrl(url)
//this.fileService.viewDocumentByUrl(url)
});
}
+1 -1
View File
@@ -252,7 +252,7 @@ export class FileService {
}
viewDocumentByUrl(url) {
const browser = this.iab.create(url,"_blank");
const browser = this.iab.create(url,"_parent");
browser.show();
}
}
@@ -51,7 +51,7 @@
<div>
<div class="file">
<!-- <canvas id="pdf_canvas"></canvas> -->
<div (click)="viewDocument(file.title_link)" class="file-details add-ellipsis" *ngIf="msg.file">
<div (click)="viewDocument(file.title_link, msg.file.type)" class="file-details add-ellipsis" *ngIf="msg.file">
<span *ngIf="msg.file.type" class="cursor-pointer">
<fa-icon *ngIf="msg.file.type == 'application/pdf'" icon="file-pdf" class="pdf-icon"></fa-icon>
<fa-icon *ngIf="msg.file.type == 'application/word'" icon="file-word" class="word-icon"></fa-icon>
+10 -5
View File
@@ -14,6 +14,7 @@ import { ChatMessageStore } from 'src/app/store/chat/chat-message.service';
import { ChatUserStorage } from 'src/app/store/chat/chat-user.service';
import { TimeService } from 'src/app/services/functions/time.service';
import { FileService } from 'src/app/services/functions/file.service';
import { HttpClient, HttpHeaders } from '@angular/common/http';
@Component({
selector: 'app-messages',
@@ -68,6 +69,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
private timeService: TimeService,
private fileService: FileService,
private gestureController: GestureController,
private http:HttpClient,
) {
this.loggedUser = authService.ValidatedUserChat['data'];
@@ -239,11 +241,14 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
})
}
viewDocument(url:string){
this.fileService.viewDocumentByUrl(url);
/* this.chatService.getDocumentDetails(url).subscribe(res => {
console.log(res);
}) */
viewDocument(url:string, documentType?:string){
if(documentType == "application/webtrix"){
this.fileService.viewDocumentByUrl(url);
}
else{
let fullUrl = "https://www.tabularium.pt" + url;
this.fileService.viewDocumentByUrl(fullUrl);
}
}
getChatMembers() {