diff --git a/config.xml b/config.xml index 7f89a02af..8636e7231 100644 --- a/config.xml +++ b/config.xml @@ -101,14 +101,14 @@ 1109370933 - 2995684404 + 2677140979 246097737 - 2366819154 + 624868211 @@ -136,7 +136,7 @@ 8.0.0.00-20210308-063916 - + en diff --git a/google-services.json b/google-services.json new file mode 100644 index 000000000..0a455bcff --- /dev/null +++ b/google-services.json @@ -0,0 +1,40 @@ +{ + "project_info": { + "project_number": "800733765231", + "firebase_url": "https://gabinete-digital-2020.firebaseio.com", + "project_id": "gabinete-digital-2020", + "storage_bucket": "gabinete-digital-2020.appspot.com" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:800733765231:android:e7ffc0b310037d9f13779a", + "android_client_info": { + "package_name": "com.gpr.gabinetedigital" + } + }, + "oauth_client": [ + { + "client_id": "800733765231-92oa7ib62ob0pkouphb5i5sp01vkalid.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyD0pfW45DLoW6mqvZRklJdbfSTskW22Fok" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "800733765231-92oa7ib62ob0pkouphb5i5sp01vkalid.apps.googleusercontent.com", + "client_type": 3 + } + ] + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file diff --git a/package.json b/package.json index fde1ff19c..9d10e1521 100644 --- a/package.json +++ b/package.json @@ -123,8 +123,8 @@ }, "platforms": [ "browser", - "android", - "ios" + "ios", + "android" ] }, "main": "karma.conf.js", @@ -133,4 +133,4 @@ "url": "git+https://Kayaya@bitbucket.org/equilibriumito/gabinete-digital.git" }, "license": "ISC" -} +} \ No newline at end of file diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index 7037111b7..a038345a1 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -4,7 +4,7 @@ import { Component, OnInit, NgZone } from '@angular/core'; import { EventsService } from '../services/events.service'; import { Event } from '../models/event.model'; import { ProcessesService } from '../services/processes.service'; -import { ModalController } from '@ionic/angular'; +import { ModalController, AlertController } from '@ionic/angular'; //import { AlertController } from 'ionic-angular'; /* import { Plugins, PushNotification, PushNotificationToken, PushNotificationActionPerformed, Modals } from '@capacitor/core'; */ import { Router } from '@angular/router'; @@ -25,7 +25,7 @@ export class HomePage implements OnInit { totalExpediente = 0; profile: string; - constructor(private zone: NgZone,private eventService: EventsService, private processesbackend: ProcessesService, private router: Router, private modalController: ModalController) { + constructor(private zone: NgZone,private eventService: EventsService, private processesbackend: ProcessesService, private router: Router, private modalController: ModalController, public alertCtrl: AlertController) { router.events.subscribe((val) => { document.querySelectorAll('ion-modal').forEach((e)=>e.remove()) @@ -135,6 +135,7 @@ export class HomePage implements OnInit { (response) => { // Will display "Hello world" in an alert dialog. alert("Success: " + response.responseText); + this.MFPushNotification() }, (error) => { @@ -188,35 +189,30 @@ export class HomePage implements OnInit { } -/* securityCheck() { + securityCheck() { - var PincodeChallengeHandler = WL.Client.createSecurityCheckChallengeHandler("UserLogin"); - this.registerChallengeHandler(PincodeChallengeHandler); + this.registerChallengeHandler(); } - registerChallengeHandler(PincodeChallengeHandler) { - PincodeChallengeHandler = WL.Client.createSecurityCheckChallengeHandler("PinCodeAttempts"); + registerChallengeHandler() { + alert('--> Pi called'); + let PincodeChallengeHandler = WL.Client.createSecurityCheckChallengeHandler("PinCodeAttempts"); PincodeChallengeHandler.handleChallenge = ((challenge: any) => { - console.log('--> PincodeChallengeHandler.handleChallenge called'); + alert('--> PincodeChallengeHandler.handleChallenge called'); this.displayLoginChallenge(challenge, PincodeChallengeHandler); }); } - displayLoginChallenge(response, PincodeChallengeHandler) { + async displayLoginChallenge(response, PincodeChallengeHandler) { if (response.errorMsg) { var msg = response.errorMsg + '
Remaining attempts: ' + response.remainingAttempts; console.log('--> displayLoginChallenge ERROR: ' + msg); } - let prompt = this.alertCtrl.create({ - title: 'MFP Gateway', + const prompt = await this.alertCtrl.create({ + header: 'MFP Gateway', message: msg, inputs: [ - { - name: 'username', - placeholder: 'please enter the name', - type: 'clientid' - }, { name: 'pin', placeholder: 'please enter the pincode', @@ -245,7 +241,7 @@ export class HomePage implements OnInit { ] }); prompt.present(); -} */ +} diff --git a/src/assets/js/index.js b/src/assets/js/index.js new file mode 100644 index 000000000..a2b0dfc2d --- /dev/null +++ b/src/assets/js/index.js @@ -0,0 +1,22 @@ +function wlCommonInit() { + + WLAuthorizationManager.obtainAccessToken() + + .then( + + function (accessToken) { + alert('Index sucsse: ', accessToken) + + }, + + function (error) { + alert('Index error: ', error) + + + } + + ); + + + +} \ No newline at end of file diff --git a/src/assets/js/wldirectudpate.js b/src/assets/js/wldirectudpate.js index 8f9a334f5..9d0ae6fb0 100644 --- a/src/assets/js/wldirectudpate.js +++ b/src/assets/js/wldirectudpate.js @@ -5,7 +5,7 @@ function wlCommonInit(){ wl_directUpdateChallengeHandler.handleDirectUpdate = function(directUpdateData, directUpdateContext) { // Create a dialog. navigator.notification.confirm( - 'Custom dialog body text', + 'Actualização Disponivel', // Handle dialog buttons. function(buttonIndex) { if (buttonIndex == 1) { @@ -14,8 +14,8 @@ function wlCommonInit(){ wl_directUpdateChallengeHandler.submitFailure(); } }, - 'Custom dialog title text', - ['Update'] + 'ctualização Disponivel', + ['Actualizar'] ); }; diff --git a/src/index.html b/src/index.html index 624ff63ae..ae8d2c052 100644 --- a/src/index.html +++ b/src/index.html @@ -7,6 +7,9 @@ + + +