move ios code and dub in loginctrl

Author: skadefro

OpenFlow/src/public/Controllers.ts

@@ -333,6 +333,34 @@ module openflow {
             q.username = this.username; q.password = this.password;
             var msg: Message = new Message(); msg.command = "signin"; msg.data = JSON.stringify(q);
             try {
+                var _android: WebAppInterface = null;
+                try {
+                    _android = android;
+                } catch (error) {
+                }
+                if (_android != null) {
+                    q.realm = "android";
+                    try {
+                        console.debug("getFirebaseToken");
+                        q.firebasetoken = _android.getFirebaseToken();
+                    } catch (error) {
+                        console.log(error);
+                    }
+                    try {
+                        console.debug("getOneSignalRegisteredId");
+                        q.onesignalid = _android.getOneSignalRegisteredId();
+                    } catch (error) {
+                        console.log(error);
+                    }
+                }
+                try {
+                    console.debug("iosGetOnesignalToken");
+                    var results = await openflow.iosGetOnesignalToken();
+                    q.onesignalid = results.token;
+                } catch (error) {
+                    console.log(error);
+                }
+
                 var a: any = await this.WebSocketClient.Send(msg);
                 var result: SigninMessage = a;
                 if (result.user == null) { return; }

OpenFlow/src/public/WebSocketClient.ts

@@ -4,7 +4,7 @@ module openflow {
     interface IHashTable<T> {
         [key: string]: T;
     }
-    interface WebAppInterface {
+    export interface WebAppInterface {
         getFirebaseToken(): any;
         getOneSignalRegisteredId(): any;
         isProductPurchased(): any;
@@ -15,7 +15,7 @@ module openflow {
         createNotification(displayname: string, message: string): void;
 
     }
-    declare var android: WebAppInterface;
+    export declare var android: WebAppInterface;
 
     type QueuedMessageCallback = (msg: any) => any;
     export class QueuedMessage {
@@ -28,6 +28,20 @@ module openflow {
         public id: string;
         public message: any;
     }
+    export function iosGetOnesignalToken() {
+        return new Promise<any>(async (resolve, reject) => {
+            try {
+                (window as any).bridge.post('onesignaltoken', {}, (results, error) => {
+                    if (error) { return reject(error); }
+                    resolve(results.token);
+                    console.log(results.token);
+                });
+            } catch (error) {
+                reject(error);
+            }
+        });
+
+    }
     export class WebSocketClient {
         private _socketObject: ReconnectingWebSocket = null;
         private _url: string = null;
@@ -76,20 +90,6 @@ module openflow {
                 callback(this.user);
             });
         }
-        iosGetOnesignalToken() {
-            return new Promise<any>(async (resolve, reject) => {
-                try {
-                    (window as any).bridge.post('onesignaltoken', {}, (results, error) => {
-                        if (error) { return reject(error); }
-                        resolve(results.token);
-                        console.log(results.token);
-                    });
-                } catch (error) {
-                    reject(error);
-                }
-            });
-
-        }
         private async onopen(evt: Event): Promise<void> {
             console.log("WebSocketClient::onopen: connected");
             var me: WebSocketClient = WebSocketClient.instance;
@@ -128,13 +128,13 @@ module openflow {
                         } catch (error) {
                             console.log(error);
                         }
-                        try {
-                            console.debug("iosGetOnesignalToken");
-                            var results = await this.iosGetOnesignalToken();
-                            q.onesignalid = results.token;
-                        } catch (error) {
-                            console.log(error);
-                        }
+                    }
+                    try {
+                        console.debug("iosGetOnesignalToken");
+                        var results = await iosGetOnesignalToken();
+                        q.onesignalid = results.token;
+                    } catch (error) {
+                        console.log(error);
                     }
                     console.debug("signing in");
                     var msg: Message = new Message(); msg.command = "signin"; msg.data = JSON.stringify(q);

VERSION

@@ -1 +1 @@
-0.0.126
+0.0.127