Change authenticateUser to initAuth. Use Events instead of Promise to…

… accept multiple calls.
madsrode · Aug 7, 2020 · 3f41331 · 3f41331
1 parent 41ec0d7
commit 3f41331
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 26 deletions.
diff --git a/example/src/App.tsx b/example/src/App.tsx
@@ -20,10 +20,17 @@ export default function App() {
     }
 
     if (GameCenterAuth) {
-      GameCenterAuth.authenticateUser()
-        .then((x) => setResult(x))
-        .catch((e) => console.log('e', JSON.stringify(e)));
+      const x = GameCenterAuth.onAuthenticate((i) => {
+        setResult(i);
+      });
+      GameCenterAuth.initAuth();
+
+      return () => {
+        x.remove();
+      };
     }
+
+    return () => {};
   }, []);
 
   return (

diff --git a/ios/GameAuth-Bridging-Header.h b/ios/GameAuth-Bridging-Header.h
@@ -1,2 +1,3 @@
 #import <React/RCTBridgeModule.h>
+#import <React/RCTEventEmitter.h>
 #import <GameKit/GameKit.h>
diff --git a/ios/GameAuth.m b/ios/GameAuth.m
@@ -1,9 +1,10 @@
 #import <React/RCTBridgeModule.h>
+#import <React/RCTEventEmitter.h>
 #import <GameKit/GameKit.h>
 
-@interface RCT_EXTERN_MODULE(GameAuth, NSObject)
+@interface RCT_EXTERN_MODULE(GameAuth, RCTEventEmitter)
 
-RCT_EXTERN_METHOD(authenticateUser: (RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(initAuth)
 RCT_EXTERN_METHOD(isAuthenticated: (RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(getPlayer: (RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(getServerAuth: (RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)

diff --git a/ios/GameAuth.swift b/ios/GameAuth.swift
@@ -1,9 +1,15 @@
 import GameKit
 
 @objc(GameAuth)
-class GameAuth: NSObject {
-    @objc(authenticateUser:rejecter:)
-    func authenticateUser(_ resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock ) -> Void {
+class GameAuth: RCTEventEmitter {
+  let C_OnAuthenticated: String = "OnAuthenticate";
+
+  open override func supportedEvents() -> [String] {
+    return [self.C_OnAuthenticated];
+  }
+
+    @objc
+    func initAuth() {
         let ui = UIApplication.shared.keyWindow?.rootViewController;
 
         let player = GKLocalPlayer.local
@@ -12,13 +18,9 @@ class GameAuth: NSObject {
                 ui?.present(vc!, animated: true, completion: nil);
             }
             else {
-                if(error == nil) {
-                    resolve(player.isAuthenticated)
-                } else {                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
-                    reject(error?.localizedDescription ?? "", "", error)
-                }
+                self.sendEvent(withName: self.C_OnAuthenticated, body: ["isAuthenticated":player.isAuthenticated, "error": error])
             }
-        }       
+        }      
     }
 
     @objc(isAutheticated:rejecter:)
@@ -71,7 +73,7 @@ class GameAuth: NSObject {
         }
     }
 
-    static func requiresMainQueueSetup() -> Bool {
-        return true
-    }
+    @objc static override func requiresMainQueueSetup() -> Bool {
+        return true 
+    } 
 }
diff --git a/src/index.tsx b/src/index.tsx
@@ -1,4 +1,9 @@
-import { NativeModules, DeviceEventEmitter } from 'react-native';
+import {
+  NativeModules,
+  DeviceEventEmitter,
+  NativeEventEmitter,
+  EmitterSubscription,
+} from 'react-native';
 
 interface Player {
   alias: String;
@@ -13,13 +18,6 @@ export interface IdentityVerificationSignature {
   timestamp: Number;
 }
 
-type GameCenterAuthType = {
-  authenticateUser(): Promise<Boolean>;
-  isAuthenticated(): Promise<Boolean>;
-  getPlayer(): Promise<Player>;
-  getServerAuth(): Promise<IdentityVerificationSignature>;
-};
-
 type PlayGamesAuthType = {
   signIn(): Promise<boolean>;
   signInSilent(triggerUISignInIfSilentFails: boolean): Promise<boolean>;
@@ -30,7 +28,6 @@ type PlayGamesAuthType = {
   AUTH_TOKEN_CHANGED_EVENT: string;
 };
 
-const GameCenterAuth: GameCenterAuthType | undefined = NativeModules.GameAuth;
 const PlayGamesAuth: PlayGamesAuthType | undefined =
   NativeModules.PlayGamesAuth;
 
@@ -54,4 +51,27 @@ if (PlayGamesAuth) {
   };
 }
 
+if (NativeModules.GameAuth) {
+  NativeModules.GameAuth.onAuthenticate = (
+    callback: (isAuthenticated: boolean) => void
+  ): EmitterSubscription => {
+    const e = new NativeEventEmitter(NativeModules.GameAuth);
+    return e.addListener('OnAuthenticate', (data: any) => {
+      callback(data.isAuthenticated);
+    });
+  };
+}
+
+type GameCenterAuthType = {
+  initAuth(): void;
+  isAuthenticated(): Promise<Boolean>;
+  getPlayer(): Promise<Player>;
+  getServerAuth(): Promise<IdentityVerificationSignature>;
+  onAuthenticate(
+    callback: (isAuthenticated: boolean) => void
+  ): EmitterSubscription;
+};
+
+const GameCenterAuth: GameCenterAuthType | undefined = NativeModules.GameAuth;
+
 export { GameCenterAuth, PlayGamesAuth };