mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-21 05:45:50 +00:00
Merge branch 'feature/websocket' of https://bitbucket.org/equilibriumito/gabinete-digital into feature/websocket
This commit is contained in:
@@ -119,7 +119,6 @@ export class LoginPage implements OnInit {
|
||||
this.changeProfileService.run()
|
||||
await this.authService.loginChat(this.userattempt);
|
||||
this.getToken();
|
||||
alert('redirect')
|
||||
this.router.navigateByUrl('/ping', { replaceUrl: true });
|
||||
}
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@ export class AuthService {
|
||||
this.WsChatService.connect();
|
||||
this.WsChatService.login().then((message) => {
|
||||
console.log('rocket chat login successfully', message)
|
||||
this.WsChatService.temporaryStatus('online')
|
||||
this.WsChatService.setStatus('online')
|
||||
}).catch((message)=>{
|
||||
console.log('rocket chat login failed', message)
|
||||
})
|
||||
@@ -117,7 +117,7 @@ export class AuthService {
|
||||
this.WsChatService.connect();
|
||||
this.WsChatService.login().then((message) => {
|
||||
console.log('rocket chat login successfully', message)
|
||||
this.WsChatService.temporaryStatus('online')
|
||||
this.WsChatService.setStatus('online')
|
||||
}).catch((message)=>{
|
||||
console.log('rocket chat login failed', message)
|
||||
})
|
||||
|
||||
@@ -61,12 +61,15 @@ export class WsChatService {
|
||||
this.ws.registerCallback({type:'Onmessage', funx:(message)=>{
|
||||
if(message.id == requestId ) { // same request send
|
||||
|
||||
if(message.result.token) {
|
||||
this.isLogin = true
|
||||
if(message.result) {
|
||||
if(message.result.token) {
|
||||
|
||||
this.isLogin = true
|
||||
|
||||
this.ws.wsMsgQueue()
|
||||
this.ws.wsMsgQueue()
|
||||
|
||||
resolve(message)
|
||||
resolve(message)
|
||||
}
|
||||
} else {
|
||||
this.isLogin = false
|
||||
reject(message)
|
||||
@@ -174,7 +177,7 @@ export class WsChatService {
|
||||
});
|
||||
}
|
||||
|
||||
temporaryStatus(status: 'online' | 'busy' | 'away' | 'offline') {
|
||||
setStatus(status: 'online' | 'busy' | 'away' | 'offline') {
|
||||
|
||||
const requestId = uuidv4()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user