diff --git a/package-lock.json b/package-lock.json index a54f17c7a..47cdcaf0b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2087,6 +2087,22 @@ "@types/cordova": "^0.0.34" } }, + "@ionic-native/sqlite": { + "version": "5.31.1", + "resolved": "https://registry.npmjs.org/@ionic-native/sqlite/-/sqlite-5.31.1.tgz", + "integrity": "sha512-X26n+6mvqyv94ADG67lHOmDj/Ha+ZVbHztwsWzbvBqmnmgck9y+mo8ndC47UKIXRA/8lwoGMyAtJAfE81eT3mg==", + "requires": { + "@types/cordova": "^0.0.34" + } + }, + "@ionic-native/sqlite-porter": { + "version": "5.31.1", + "resolved": "https://registry.npmjs.org/@ionic-native/sqlite-porter/-/sqlite-porter-5.31.1.tgz", + "integrity": "sha512-dBIp0f85Qn6KRymOg5dZxlfZTiyMDXRYiO1Eg44UxIsNZx7qchZg63wMRWyZmdnFWMfvYjAbkJ3NKiumqR1z3w==", + "requires": { + "@types/cordova": "^0.0.34" + } + }, "@ionic-native/status-bar": { "version": "5.31.1", "resolved": "https://registry.npmjs.org/@ionic-native/status-bar/-/status-bar-5.31.1.tgz", diff --git a/package.json b/package.json index 1d6b831df..3420375d5 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,8 @@ "@ionic-native/in-app-browser": "^5.28.0", "@ionic-native/ionic-webview": "^5.30.0", "@ionic-native/splash-screen": "^5.31.1", + "@ionic-native/sqlite": "^5.31.1", + "@ionic-native/sqlite-porter": "^5.31.1", "@ionic-native/status-bar": "^5.0.0", "@ionic-native/wheel-selector": "^5.31.1", "@ionic/angular": "^5.5.4", diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index 28432bd98..aacee9eea 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -229,8 +229,6 @@ export class HomePage implements OnInit { } async viewPublications(folderId) { - - const modal = await this.modalController.create({ component: ViewPublicationsPage, /* enterAnimation, diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index 845d2d270..3a163d5f9 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -9,6 +9,7 @@ import { ContactsPage } from './messages/contacts/contacts.page'; import { MessagesPage } from './messages/messages.page'; import { NewGroupPage } from './new-group/new-group.page'; import { NewchatPage } from './newchat/newchat.page'; +import { Storage } from '@ionic/storage'; @Component({ selector: 'app-chat', @@ -24,7 +25,7 @@ export class ChatPage implements OnInit { X_User_Id:any; X_Auth_Token:any; - loggedUser: any; + private loggedUser: any; /* Set segment variable */ segment:string; allGroups: any[]; @@ -42,20 +43,29 @@ export class ChatPage implements OnInit { private chatService: ChatService, private modalController: ModalController, private authService: AuthService, + private storage:Storage, ) { this.headers = new HttpHeaders(); - this.headers = this.headers.set('X-User-Id', 'GqjNWiLrGEHRna7Zn'); - this.headers = this.headers.set('X-Auth-Token', 'SJwIgtlqfloPK696fpc2VBvyDluipuIHKB_0Q6-9ycJ'); + /* this.headers = this.headers.set('X-User-Id', 'GqjNWiLrGEHRna7Zn'); + this.headers = this.headers.set('X-Auth-Token', 'SJwIgtlqfloPK696fpc2VBvyDluipuIHKB_0Q6-9ycJ'); */ + } ngOnInit() { this.segment = "Contactos"; + this.authService.userData$.subscribe((res:any)=>{ this.loggedUser=res; console.log(this.loggedUser); }); - this.load(); + this.storage.get('userDataKey').then(val=> { + let t = JSON.parse(unescape(atob(val))); + this.loggedUser=t; + this.load(); + }) + + } onSegmentChange(){ diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts index 64000e982..3081a164b 100644 --- a/src/app/services/auth.service.ts +++ b/src/app/services/auth.service.ts @@ -52,12 +52,9 @@ export class AuthService { result = await this.http.get(service, options).toPromise(); response = await this.http.post(environment.apiURL + "UserAuthentication/Login", '', this.opts).toPromise(); - /* this.http.post(environment.apiURL + "UserAuthentication/Login", '', this.opts).subscribe(res=>{ - this.storageService.store(AuthConnstants.USER, res); - this.ValidatedUser = user; - response = user; - console.log(user); - }); */ + + console.log(response); + if (result) { diff --git a/src/app/services/chat.service.ts b/src/app/services/chat.service.ts index 64d026274..f205bc1cd 100644 --- a/src/app/services/chat.service.ts +++ b/src/app/services/chat.service.ts @@ -87,6 +87,7 @@ export class ChatService { //Load messages from roomId getAllDirectMessages(){ + console.log(this.options); return this.http.get(environment.apiChatUrl+'im.list', this.options); } //Load messages from roomId diff --git a/src/app/services/database.service.spec.ts b/src/app/services/database.service.spec.ts new file mode 100644 index 000000000..1b3f513b1 --- /dev/null +++ b/src/app/services/database.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { DatabaseService } from './database.service'; + +describe('DatabaseService', () => { + let service: DatabaseService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(DatabaseService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/services/database.service.ts b/src/app/services/database.service.ts new file mode 100644 index 000000000..6b7d033f7 --- /dev/null +++ b/src/app/services/database.service.ts @@ -0,0 +1,9 @@ +import { Injectable } from '@angular/core'; + +@Injectable({ + providedIn: 'root' +}) +export class DatabaseService { + + constructor() { } +} diff --git a/src/app/services/storage.service.ts b/src/app/services/storage.service.ts index 2ec3db7e7..ddf454338 100644 --- a/src/app/services/storage.service.ts +++ b/src/app/services/storage.service.ts @@ -15,11 +15,9 @@ const { Storage } = Plugins; */ } // Get the value async get(key: string) { - const ret = await this.storage.get(key).then((val) => { - return val; - }); + const ret = await this.storage.get(key).then((val) => { return val; }); return JSON.parse(unescape(atob(ret))); - } + } /* // Get the value async get(storageKey: string) {