This commit is contained in:
Peter Maquiran
2022-01-12 12:44:51 +01:00
parent 2f0935b0d3
commit 45284fc1a6
17 changed files with 187 additions and 302 deletions
+6 -7
View File
@@ -10,8 +10,7 @@ import { AlertController } from '@ionic/angular';
import { SessionStore } from '../store/session.service';
import { AESEncrypt } from '../services/aesencrypt.service';
import { CookieService } from 'ngx-cookie-service';
import { RocketChatClientService } from '../services/socket/rocket-chat-client.service';
import { WsChatService } from 'src/app/services/chat/ws-chat.service';
@Injectable({
providedIn: 'root'
})
@@ -30,7 +29,7 @@ export class AuthService {
public alertController: AlertController,
private aesencrypt: AESEncrypt,
private cookieService: CookieService,
private RocketChatClientService: RocketChatClientService) {
private WsChatService: WsChatService) {
this.headers = new HttpHeaders();
@@ -38,9 +37,9 @@ export class AuthService {
this.ValidatedUser = SessionStore.user
console.log('login', SessionStore.user.RochetChatUser, SessionStore.user.Password)
this.RocketChatClientService.connect(()=>{
this.WsChatService.connect(()=>{
this.RocketChatClientService.login({
this.WsChatService.login({
username: SessionStore.user.RochetChatUser,
password: SessionStore.user.Password
}).then((message) => {
@@ -117,9 +116,9 @@ export class AuthService {
}
this.RocketChatClientService.connect(()=>{
this.WsChatService.connect(()=>{
this.RocketChatClientService.login({
this.WsChatService.login({
username: SessionStore.user.RochetChatUser,
password: user.password
}).then((message) => {