.

Author: skadefro

OpenFlow/src/Messages/Message.ts

@@ -416,6 +416,10 @@ export class Message {
                 if ((msg.onesignalid != null && msg.onesignalid != undefined && msg.onesignalid != "") ||
                     (msg.onesignalid != null && msg.onesignalid != undefined && msg.onesignalid != "")) {
                 }
+                if (msg.gpslocation != null && msg.gpslocation != undefined && msg.gpslocation != "") {
+                    user.gpslocation = msg.gpslocation;
+                }
+
                 Audit.LoginSuccess(tuser, type, "websocket", cli.remoteip);
                 msg.jwt = Crypt.createToken(user);
                 msg.user = tuser;

OpenFlow/src/Messages/SigninMessage.ts

@@ -4,17 +4,18 @@ import { TokenUser } from "../TokenUser";
 export class SigninMessage implements IReplyMessage {
     public error: string;
 
-    public realm:string;
-    public firebasetoken:string;
-    public onesignalid:string;
+    public realm: string;
+    public firebasetoken: string;
+    public onesignalid: string;
+    public gpslocation: any;
 
-    public validate_only:boolean = false;
-    public username:string;
-    public password:string;
-    public user:TokenUser;
-    public jwt:string;
-    public rawAssertion:string;
-    static assign(o:any):SigninMessage {
+    public validate_only: boolean = false;
+    public username: string;
+    public password: string;
+    public user: TokenUser;
+    public jwt: string;
+    public rawAssertion: string;
+    static assign(o: any): SigninMessage {
         if (typeof o === "string" || o instanceof String) {
             return Object.assign(new SigninMessage(), JSON.parse(o.toString()));
         }

OpenFlow/src/User.ts

@@ -27,6 +27,7 @@ export class User extends Base {
     sid: string;
     firebasetoken: string;
     onesignalid: string;
+    gpslocation: any;
     federationids: FederationId[] = [];
     roles: Rolemember[] = [];
     HasRoleName(name: string): Boolean {

OpenFlow/src/public/CommonControllers.ts

@@ -23,6 +23,20 @@ module openflow {
             return value;
         };
     };
+    var gpsparameters: any = null;
+    export function getgpsparameters() {
+        return gpsparameters;
+    }
+    function iosListenGPSocation() {
+        try {
+            (window as any).bridge.on('gps_location', (parameters) => {
+                gpsparameters = parameters;
+            });
+        } catch (error) {
+            console.error(error);
+        }
+    }
+
     export class api {
         static $inject = ["$rootScope", "$location", "WebSocketClient"];
         public messageQueue: IHashTable<messagequeue> = {};
@@ -49,6 +63,11 @@ module openflow {
                 var log = { message: message, url: url, linenumber: linenumber, _type: "error" };
                 this.Insert("jslog", log);
             }
+            try {
+                iosListenGPSocation();
+            } catch (error) {
+                console.log(error);
+            }
 
 
             var cleanup = $rootScope.$on('queuemessage', (event, data: QueueMessage) => {

OpenFlow/src/public/Message.ts

@@ -45,6 +45,7 @@ module openflow {
         public realm: string;
         public firebasetoken: string;
         public onesignalid: string;
+        public gpslocation: any;
         public username: string;
         public password: string;
         public user: TokenUser;

OpenFlow/src/public/WebSocketClient.ts

@@ -143,6 +143,7 @@ module openflow {
                     } catch (error) {
                         console.log(error);
                     }
+                    q.gpslocation = openflow.getgpsparameters();
                     console.debug("signing in with token");
                     var msg: Message = new Message(); msg.command = "signin"; msg.data = JSON.stringify(q);
                     var a: any = await this.Send(msg);

VERSION

@@ -1 +1 @@
-0.0.136
+0.0.137