Updated the SDK

iOS
TG9six 1 month ago
parent a23c6f534b
commit 5be830c1f3

BIN
.DS_Store vendored

Binary file not shown.

BIN
Assets/.DS_Store vendored

Binary file not shown.

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CLIENT_ID</key>
<string>1021701058525-vp54583d95oknnamu739smqfihhoivnk.apps.googleusercontent.com</string>
<key>REVERSED_CLIENT_ID</key>
<string>com.googleusercontent.apps.1021701058525-vp54583d95oknnamu739smqfihhoivnk</string>
<key>SERVER_CLIENT_ID</key>
<string>1021701058525-72qg4sbvqv3m3q7it4eck2h86ekoflla.apps.googleusercontent.com</string>
<key>BUNDLE_ID</key>
<string>com.rizze.pipuzzle</string>
</dict>
</plist>

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: a55ee4efaad27d948ba5f03fc6d7bc80 guid: 1b9e8786ff7ad4966bcef466f4935744
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
userData: userData:

Binary file not shown.

Binary file not shown.

@ -12,7 +12,7 @@
<!-- iOS Cocoapod dependencies can be specified by each iosPod element. --> <!-- iOS Cocoapod dependencies can be specified by each iosPod element. -->
<iosPods> <iosPods>
<iosPod name="GoogleSignIn" version="&lt; 5.0.0" bitcodeEnabled="false" <iosPod name="GoogleSignIn" version="8.0.0" bitcodeEnabled="false"
minTargetSdk="6.0"> minTargetSdk="6.0">
</iosPod> </iosPod>
</iosPods> </iosPods>

@ -2,9 +2,9 @@ fileFormatVersion: 2
guid: 938014c9994164100b26d82840a88fbb guid: 938014c9994164100b26d82840a88fbb
labels: labels:
- gvh - gvh
- gvh_version-1.0.4 timeCreated: 1507661087
licenseType: Pro
TextScriptImporter: TextScriptImporter:
externalObjects: {}
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<dependencies>
<!-- Internal library dependency generated at build time. -->
<androidPackages>
<androidPackage spec="com.google.signin:google-signin-support:1.0.4">
<repositories>
<repository>Assets/GoogleSignIn/Editor/m2repository</repository>
</repositories>
</androidPackage>
</androidPackages>
</dependencies>

@ -1,10 +0,0 @@
fileFormatVersion: 2
guid: e8689106c65f445c19cec6044d615c19
labels:
- gvh
- gvh_version-1.0.4
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

@ -1,33 +1,27 @@
Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.89.0.dll Assets/GoogleSignIn/Editor/GoogleSignInDependencies.xml
Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.89.0.dll Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.aar
Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.aar.md5
Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.89.0.dll Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.aar.sha1
Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.mm Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.pom
Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.h Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.pom.md5
Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.h Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.pom.sha1
Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.mm Assets/GoogleSignIn/Future.cs
Assets/Parse/LICENSE
Assets/Parse/Plugins/Unity.Compat.dll
Assets/Parse/Plugins/Unity.Tasks.dll
Assets/SignInSample/MainScene.unity
Assets/SignInSample/SigninSampleScript.cs
Assets/GoogleSignIn/Impl/GoogleSignInImpl.cs
Assets/GoogleSignIn/Impl/SignInHelperObject.cs
Assets/GoogleSignIn/Impl/NativeFuture.cs
Assets/GoogleSignIn/Impl/BaseObject.cs
Assets/GoogleSignIn/GoogleSignIn.cs Assets/GoogleSignIn/GoogleSignIn.cs
Assets/GoogleSignIn/GoogleSignInConfiguration.cs Assets/GoogleSignIn/GoogleSignInConfiguration.cs
Assets/GoogleSignIn/Future.cs
Assets/GoogleSignIn/GoogleSignInUser.cs
Assets/GoogleSignIn/GoogleSignInStatusCode.cs Assets/GoogleSignIn/GoogleSignInStatusCode.cs
Assets/GoogleSignIn/Editor/GoogleSignInDependencies.xml Assets/GoogleSignIn/GoogleSignInUser.cs
Assets/GoogleSignIn/Editor/GoogleSignInSupportDependencies.xml Assets/GoogleSignIn/Impl/BaseObject.cs
Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/maven-metadata.xml Assets/GoogleSignIn/Impl/GoogleSignInImpl.cs
Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/maven-metadata.xml.md5 Assets/GoogleSignIn/Impl/NativeFuture.cs
Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/maven-metadata.xml.sha1 Assets/GoogleSignIn/Impl/SignInHelperObject.cs
Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.pom.md5 Assets/Parse/LICENSE
Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.srcaar.sha1 Assets/Parse/Plugins/Unity.Compat.dll
Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.pom.sha1 Assets/Parse/Plugins/Unity.Tasks.dll
Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.srcaar Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.54.0.dll
Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.pom Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.54.0.dll
Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.srcaar.md5 Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll
Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.54.0.dll
Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.54.0.txt
Assets/Plugins/Android/native-googlesignin-release.aar
Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.h
Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.mm

@ -1,9 +1,9 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: a67d5f0cfc09749e6b1ce13e8b8e6e1d guid: 817a6673340324b8ca85e24466f60953
labels: labels:
- gvh - gvh
- gvh_manifest - gvh_manifest
- gvh_version-1.0.4 - gvh_version-1.0.1
TextScriptImporter: TextScriptImporter:
externalObjects: {} externalObjects: {}
userData: userData:

@ -1,10 +0,0 @@
fileFormatVersion: 2
guid: 001a15402063b4df983ba8bc4ddb269f
folderAsset: yes
timeCreated: 1537405253
licenseType: Pro
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.signin</groupId>
<artifactId>google-signin-support</artifactId>
<version>1.0.4</version>
<packaging>srcaar</packaging>
</project>

@ -1,10 +0,0 @@
fileFormatVersion: 2
guid: 907bf7a19cd7848cabf1f641f61343ee
labels:
- gvh
- gvh_version-1.0.4
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

@ -1,10 +0,0 @@
fileFormatVersion: 2
guid: a3f74b3d329a24e81a6c6f9f1d2f46f1
labels:
- gvh
- gvh_version-1.0.4
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

@ -1,10 +0,0 @@
fileFormatVersion: 2
guid: e1a3ff77f802d43818521ff3db2bf944
labels:
- gvh
- gvh_version-1.0.4
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

@ -1,10 +0,0 @@
fileFormatVersion: 2
guid: 79f9d122dd99b483282294f3b1f1bd36
labels:
- gvh
- gvh_version-1.0.4
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

@ -1,10 +0,0 @@
fileFormatVersion: 2
guid: 6eab7a3cbdbf34cffaf951dc9210a32c
labels:
- gvh
- gvh_version-1.0.4
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

@ -1,10 +0,0 @@
fileFormatVersion: 2
guid: d508eb0e16bb14c8a962b343e755ef01
labels:
- gvh
- gvh_version-1.0.4
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<groupId>com.google.signin</groupId>
<artifactId>google-signin-support</artifactId>
<versioning>
<release>1.0.4</release>
<versions>
<version>1.0.4</version>
</versions>
<lastUpdated>20180920010048</lastUpdated>
</versioning>
</metadata>

@ -1,10 +0,0 @@
fileFormatVersion: 2
guid: c020582c1a85d47c7934908f00a0bd37
labels:
- gvh
- gvh_version-1.0.4
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

@ -1,10 +0,0 @@
fileFormatVersion: 2
guid: 16b8065a143bb4277af08381a56157dd
labels:
- gvh
- gvh_version-1.0.4
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

@ -2,9 +2,9 @@ fileFormatVersion: 2
guid: ad3b09fb652fb4ff0a68d1966f13160e guid: ad3b09fb652fb4ff0a68d1966f13160e
labels: labels:
- gvh - gvh
- gvh_version-1.0.4 timeCreated: 1495747145
licenseType: Pro
MonoImporter: MonoImporter:
externalObjects: {}
serializedVersion: 2 serializedVersion: 2
defaultReferences: [] defaultReferences: []
executionOrder: 0 executionOrder: 0

@ -2,9 +2,9 @@ fileFormatVersion: 2
guid: 138b984208e394be797ce8905a44fd54 guid: 138b984208e394be797ce8905a44fd54
labels: labels:
- gvh - gvh
- gvh_version-1.0.4 timeCreated: 1490814915
licenseType: Pro
MonoImporter: MonoImporter:
externalObjects: {}
serializedVersion: 2 serializedVersion: 2
defaultReferences: [] defaultReferences: []
executionOrder: 0 executionOrder: 0

@ -2,9 +2,9 @@ fileFormatVersion: 2
guid: 0c3999c0f68f04ae08f04fb3bf2a2050 guid: 0c3999c0f68f04ae08f04fb3bf2a2050
labels: labels:
- gvh - gvh
- gvh_version-1.0.4 timeCreated: 1495747213
licenseType: Pro
MonoImporter: MonoImporter:
externalObjects: {}
serializedVersion: 2 serializedVersion: 2
defaultReferences: [] defaultReferences: []
executionOrder: 0 executionOrder: 0

@ -2,9 +2,9 @@ fileFormatVersion: 2
guid: 077933fcaedac412d9762bf3e0a3be68 guid: 077933fcaedac412d9762bf3e0a3be68
labels: labels:
- gvh - gvh
- gvh_version-1.0.4 timeCreated: 1501271136
licenseType: Pro
MonoImporter: MonoImporter:
externalObjects: {}
serializedVersion: 2 serializedVersion: 2
defaultReferences: [] defaultReferences: []
executionOrder: 0 executionOrder: 0

@ -2,9 +2,9 @@ fileFormatVersion: 2
guid: c56b92217d0144af5907627d1235e0a5 guid: c56b92217d0144af5907627d1235e0a5
labels: labels:
- gvh - gvh
- gvh_version-1.0.4 timeCreated: 1495747250
licenseType: Pro
MonoImporter: MonoImporter:
externalObjects: {}
serializedVersion: 2 serializedVersion: 2
defaultReferences: [] defaultReferences: []
executionOrder: 0 executionOrder: 0

@ -2,9 +2,9 @@ fileFormatVersion: 2
guid: fe250cda690a44cb08f8f7d26c9723b4 guid: fe250cda690a44cb08f8f7d26c9723b4
labels: labels:
- gvh - gvh
- gvh_version-1.0.4 timeCreated: 1495748295
licenseType: Pro
MonoImporter: MonoImporter:
externalObjects: {}
serializedVersion: 2 serializedVersion: 2
defaultReferences: [] defaultReferences: []
executionOrder: 0 executionOrder: 0

@ -2,9 +2,9 @@ fileFormatVersion: 2
guid: 9ae1f008f9f994b9c96c1a14067d7b48 guid: 9ae1f008f9f994b9c96c1a14067d7b48
labels: labels:
- gvh - gvh
- gvh_version-1.0.4 timeCreated: 1502758941
licenseType: Pro
MonoImporter: MonoImporter:
externalObjects: {}
serializedVersion: 2 serializedVersion: 2
defaultReferences: [] defaultReferences: []
executionOrder: 0 executionOrder: 0

@ -2,9 +2,9 @@ fileFormatVersion: 2
guid: 5f1aae79b1ca4432d9d8ec382c54bf46 guid: 5f1aae79b1ca4432d9d8ec382c54bf46
labels: labels:
- gvh - gvh
- gvh_version-1.0.4 timeCreated: 1502759707
licenseType: Pro
MonoImporter: MonoImporter:
externalObjects: {}
serializedVersion: 2 serializedVersion: 2
defaultReferences: [] defaultReferences: []
executionOrder: 0 executionOrder: 0

@ -2,9 +2,9 @@ fileFormatVersion: 2
guid: ad98e5b48888e44eb81dd5884d3a1754 guid: ad98e5b48888e44eb81dd5884d3a1754
labels: labels:
- gvh - gvh
- gvh_version-1.0.4 timeCreated: 1500486239
licenseType: Pro
MonoImporter: MonoImporter:
externalObjects: {}
serializedVersion: 2 serializedVersion: 2
defaultReferences: [] defaultReferences: []
executionOrder: 0 executionOrder: 0

@ -1,5 +1,6 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: ed9b95dc6ed6d0647ad7f1a8f305385d guid: b89b30ed1d3a642f78f85c1740272368
folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
userData: userData:

@ -0,0 +1,5 @@
<linker>
<assembly fullname="OneSignal.Core" preserve="all" />
<assembly fullname="OneSignal.Android" preserve="all" />
<assembly fullname="OneSignal.iOS" preserve="all" />
</linker>

@ -1,8 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: f3911d467587242978192a8723c68395 guid: a0d82b509bc0d45148624fd1203d3d65
labels:
- gvh
- gvh_version-1.0.4
TextScriptImporter: TextScriptImporter:
externalObjects: {} externalObjects: {}
userData: userData:

@ -169,7 +169,7 @@ Transform:
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!21 &70808961 --- !u!21 &79986214
Material: Material:
serializedVersion: 8 serializedVersion: 8
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -204,7 +204,7 @@ Material:
m_Floats: m_Floats:
- _Alpha: 0 - _Alpha: 0
- _ColorMask: 15 - _ColorMask: 15
- _Distortion: 1.1646811 - _Distortion: 0.6972395
- _Stencil: 0 - _Stencil: 0
- _StencilComp: 8 - _StencilComp: 8
- _StencilOp: 0 - _StencilOp: 0
@ -995,7 +995,7 @@ Transform:
m_GameObject: {fileID: 509783898} m_GameObject: {fileID: 509783898}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 324.34393, y: 886.0344, z: 473073.66} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
@ -2800,7 +2800,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 70808961} m_Material: {fileID: 79986214}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}

Binary file not shown.

@ -1,20 +0,0 @@
/**
* Copyright 2017 Google Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#import <GoogleSignIn/GIDSignIn.h>
@interface GoogleSignInHandler
: NSObject <GIDSignInDelegate, GIDSignInUIDelegate>
@end

@ -1,35 +0,0 @@
fileFormatVersion: 2
guid: 62c129704e1ec48179ba285e1af154b8
labels:
- gvh
- gvh_version-1.0.4
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
Any:
second:
enabled: 0
settings: {}
- first:
Editor: Editor
second:
enabled: 0
settings:
DefaultValueInitialized: true
- first:
iPhone: iOS
second:
enabled: 1
settings: {}
userData:
assetBundleName:
assetBundleVariant:

@ -14,10 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
#import "GoogleSignIn.h" #import "GoogleSignIn.h"
#import <GoogleSignIn/GIDAuthentication.h>
#import <GoogleSignIn/GIDGoogleUser.h> #import <GoogleSignIn/GIDGoogleUser.h>
#import <GoogleSignIn/GIDProfileData.h> #import <GoogleSignIn/GIDProfileData.h>
#import <GoogleSignIn/GIDSignIn.h> #import <GoogleSignIn/GIDSignIn.h>
#import <GoogleSignIn/GIDToken.h>
#import <GoogleSignIn/GIDSignInResult.h>
#import <memory> #import <memory>
@ -35,6 +36,9 @@ static const int kStatusCodeInternalError = 7;
static const int kStatusCodeNetworkError = 8; static const int kStatusCodeNetworkError = 8;
static const int kStatusCodeError = 9; static const int kStatusCodeError = 9;
static NSString *cachedLoginHint = nil;
static NSArray<NSString *> *cachedAdditionalScopes = nil;
/** /**
* Helper method to pause the Unity player. This is done when showing any UI. * Helper method to pause the Unity player. This is done when showing any UI.
*/ */
@ -51,96 +55,14 @@ void UnpauseUnityPlayer() {
struct SignInResult { struct SignInResult {
int result_code; int result_code;
bool finished; bool finished;
GIDGoogleUser *user;
NSString *serverAuthCode;
}; };
std::unique_ptr<SignInResult> currentResult_; std::unique_ptr<SignInResult> currentResult_;
NSRecursiveLock *resultLock = [NSRecursiveLock alloc]; NSRecursiveLock *resultLock = [NSRecursiveLock alloc];
@implementation GoogleSignInHandler
/**
* Overload the presenting of the UI so we can pause the Unity player.
*/
- (void)signIn:(GIDSignIn *)signIn
presentViewController:(UIViewController *)viewController {
UnityPause(true);
[UnityGetGLViewController() presentViewController:viewController
animated:YES
completion:nil];
}
/**
* Overload the dismissing so we can resume the Unity player.
*/
- (void)signIn:(GIDSignIn *)signIn
dismissViewController:(UIViewController *)viewController {
UnityPause(false);
[UnityGetGLViewController() dismissViewControllerAnimated:YES completion:nil];
}
/**
* The sign-in flow has finished and was successful if |error| is |nil|.
* Map the errors from the iOS SDK back to the Android values for consistency's
* sake in the Unity layer.
*/
- (void)signIn:(GIDSignIn *)signIn
didSignInForUser:(GIDGoogleUser *)user
withError:(NSError *)_error {
if (_error == nil) {
if (currentResult_) {
currentResult_->result_code = kStatusCodeSuccess;
currentResult_->finished = true;
} else {
NSLog(@"No currentResult to set status on!");
}
NSLog(@"didSignInForUser: SUCCESS");
} else {
NSLog(@"didSignInForUser: %@", _error.localizedDescription);
if (currentResult_) {
switch (_error.code) {
case kGIDSignInErrorCodeUnknown:
currentResult_->result_code = kStatusCodeError;
break;
case kGIDSignInErrorCodeKeychain:
currentResult_->result_code = kStatusCodeInternalError;
break;
case kGIDSignInErrorCodeNoSignInHandlersInstalled:
currentResult_->result_code = kStatusCodeDeveloperError;
break;
case kGIDSignInErrorCodeHasNoAuthInKeychain:
currentResult_->result_code = kStatusCodeError;
break;
case kGIDSignInErrorCodeCanceled:
currentResult_->result_code = kStatusCodeCanceled;
break;
default:
NSLog(@"Unmapped error code: %ld, returning Error",
static_cast<long>(_error.code));
currentResult_->result_code = kStatusCodeError;
}
currentResult_->finished = true;
UnpauseUnityPlayer();
} else {
NSLog(@"No currentResult to set status on!");
}
}
}
// Finished disconnecting |user| from the app successfully if |error| is |nil|.
- (void)signIn:(GIDSignIn *)signIn
didDisconnectWithUser:(GIDGoogleUser *)user
withError:(NSError *)_error {
if (_error == nil) {
NSLog(@"didDisconnectWithUser: SUCCESS");
} else {
NSLog(@"didDisconnectWithUser: %@", _error);
}
}
@end
/** /**
* These are the external "C" methods that are imported by the Unity C# code. * These are the external "C" methods that are imported by the Unity C# code.
* The parameters are intended to be primative, easy to marshall. * The parameters are intended to be primative, easy to marshall.
@ -168,12 +90,6 @@ bool GoogleSignIn_Configure(void *unused, bool useGameSignIn,
bool requestIdToken, bool hidePopups, bool requestIdToken, bool hidePopups,
const char **additionalScopes, int scopeCount, const char **additionalScopes, int scopeCount,
const char *accountName) { const char *accountName) {
if (webClientId) {
[GIDSignIn sharedInstance].serverClientID =
[NSString stringWithUTF8String:webClientId];
}
[GIDSignIn sharedInstance].shouldFetchBasicProfile = true;
int scopeSize = scopeCount; int scopeSize = scopeCount;
@ -184,12 +100,11 @@ bool GoogleSignIn_Configure(void *unused, bool useGameSignIn,
[tmpary addObject:[NSString stringWithUTF8String:additionalScopes[i]]]; [tmpary addObject:[NSString stringWithUTF8String:additionalScopes[i]]];
} }
[GIDSignIn sharedInstance].scopes = tmpary; cachedAdditionalScopes = tmpary;
} }
if (accountName) { if (accountName) {
[GIDSignIn sharedInstance].loginHint = cachedLoginHint = [NSString stringWithUTF8String:accountName];
[NSString stringWithUTF8String:accountName];
} }
return !useGameSignIn; return !useGameSignIn;
@ -205,6 +120,8 @@ static SignInResult *startSignIn() {
currentResult_.reset(new SignInResult()); currentResult_.reset(new SignInResult());
currentResult_->result_code = 0; currentResult_->result_code = 0;
currentResult_->finished = false; currentResult_->finished = false;
currentResult_->user = nil;
currentResult_->serverAuthCode = nil;
} else { } else {
busy = true; busy = true;
} }
@ -220,13 +137,60 @@ static SignInResult *startSignIn() {
return nullptr; return nullptr;
} }
/**
* The sign-in flow has finished and was successful if |error| is |nil|.
* Map the errors from the iOS SDK back to the Android values for consistency's
* sake in the Unity layer.
*/
void HandleSignInError(NSError * _Nullable _error) {
NSLog(@"didSignInForUser: %@", _error.localizedDescription);
if (currentResult_) {
switch (_error.code) {
case kGIDSignInErrorCodeUnknown:
currentResult_->result_code = kStatusCodeError;
break;
case kGIDSignInErrorCodeKeychain:
currentResult_->result_code = kStatusCodeInternalError;
break;
case kGIDSignInErrorCodeHasNoAuthInKeychain:
currentResult_->result_code = kStatusCodeError;
break;
case kGIDSignInErrorCodeCanceled:
currentResult_->result_code = kStatusCodeCanceled;
break;
default:
NSLog(@"Unmapped error code: %ld, returning Error", static_cast<long>(_error.code));
currentResult_->result_code = kStatusCodeError;
}
currentResult_->finished = true;
UnpauseUnityPlayer();
} else {
NSLog(@"No currentResult to set status on!");
}
}
/** /**
* Sign-In. The return value is a pointer to the currentResult object. * Sign-In. The return value is a pointer to the currentResult object.
*/ */
void *GoogleSignIn_SignIn() { void *GoogleSignIn_SignIn() {
SignInResult *result = startSignIn(); SignInResult *result = startSignIn();
if (!result) { if (!result) {
[[GIDSignIn sharedInstance] signIn]; [GIDSignIn.sharedInstance signInWithPresentingViewController:UnityGetGLViewController() hint:cachedLoginHint additionalScopes:cachedAdditionalScopes completion:^(GIDSignInResult * _Nullable _result, NSError * _Nullable _error) {
if (_error == nil) {
if (currentResult_) {
currentResult_->result_code = kStatusCodeSuccess;
currentResult_->finished = true;
currentResult_->user = _result.user;
currentResult_->serverAuthCode = _result.serverAuthCode;
} else {
NSLog(@"No currentResult to set status on!");
}
NSLog(@"didSignInForUser: SUCCESS");
} else {
HandleSignInError(_error);
}
}];
result = currentResult_.get(); result = currentResult_.get();
} }
return result; return result;
@ -239,20 +203,40 @@ void *GoogleSignIn_SignIn() {
void *GoogleSignIn_SignInSilently() { void *GoogleSignIn_SignInSilently() {
SignInResult *result = startSignIn(); SignInResult *result = startSignIn();
if (!result) { if (!result) {
[[GIDSignIn sharedInstance] signInSilently]; [GIDSignIn.sharedInstance restorePreviousSignInWithCompletion:^(GIDGoogleUser * _Nullable _user, NSError * _Nullable _error) {
if (_error == nil) {
if (currentResult_) {
currentResult_->result_code = kStatusCodeSuccess;
currentResult_->finished = true;
currentResult_->user = _user;
} else {
NSLog(@"No currentResult to set status on!");
}
NSLog(@"didSignInForUser: SUCCESS");
} else {
HandleSignInError(_error);
}
}];
result = currentResult_.get(); result = currentResult_.get();
} }
return result; return result;
} }
void GoogleSignIn_Signout() { void GoogleSignIn_Signout() {
GIDSignIn *signIn = [GIDSignIn sharedInstance]; GIDSignIn *signIn = GIDSignIn.sharedInstance;
[signIn signOut]; [signIn signOut];
} }
void GoogleSignIn_Disconnect() { void GoogleSignIn_Disconnect() {
GIDSignIn *signIn = [GIDSignIn sharedInstance]; GIDSignIn *signIn = GIDSignIn.sharedInstance;
[signIn disconnect]; // Finished disconnecting |user| from the app successfully if |error| is |nil|.
[signIn disconnectWithCompletion:^(NSError *_Nullable _error) {
if (_error == nil) {
NSLog(@"didDisconnectWithUser: SUCCESS");
} else {
NSLog(@"didDisconnectWithUser: %@", _error);
}
}];
} }
bool GoogleSignIn_Pending(SignInResult *result) { bool GoogleSignIn_Pending(SignInResult *result) {
@ -263,10 +247,9 @@ bool GoogleSignIn_Pending(SignInResult *result) {
return ret; return ret;
} }
GIDGoogleUser *GoogleSignIn_Result(SignInResult *result) { SignInResult *GoogleSignIn_Result(SignInResult *result) {
if (result && result->finished) { if (result && result->finished) {
GIDGoogleUser *guser = [GIDSignIn sharedInstance].currentUser; return result;
return guser;
} }
return nullptr; return nullptr;
} }
@ -300,46 +283,46 @@ static size_t CopyNSString(NSString *src, char *dest, size_t len) {
return src ? src.length + 1 : 0; return src ? src.length + 1 : 0;
} }
size_t GoogleSignIn_GetServerAuthCode(GIDGoogleUser *guser, char *buf, size_t GoogleSignIn_GetServerAuthCode(SignInResult *gresult, char *buf,
size_t len) { size_t len) {
NSString *val = [guser serverAuthCode]; NSString *val = gresult->serverAuthCode;
return CopyNSString(val, buf, len); return CopyNSString(val, buf, len);
} }
size_t GoogleSignIn_GetDisplayName(GIDGoogleUser *guser, char *buf, size_t GoogleSignIn_GetDisplayName(SignInResult *gresult, char *buf,
size_t len) { size_t len) {
NSString *val = [guser.profile name]; NSString *val = [gresult->user.profile name];
return CopyNSString(val, buf, len); return CopyNSString(val, buf, len);
} }
size_t GoogleSignIn_GetEmail(GIDGoogleUser *guser, char *buf, size_t len) { size_t GoogleSignIn_GetEmail(SignInResult *gresult, char *buf, size_t len) {
NSString *val = [guser.profile email]; NSString *val = [gresult->user.profile email];
return CopyNSString(val, buf, len); return CopyNSString(val, buf, len);
} }
size_t GoogleSignIn_GetFamilyName(GIDGoogleUser *guser, char *buf, size_t len) { size_t GoogleSignIn_GetFamilyName(SignInResult *gresult, char *buf, size_t len) {
NSString *val = [guser.profile familyName]; NSString *val = [gresult->user.profile familyName];
return CopyNSString(val, buf, len); return CopyNSString(val, buf, len);
} }
size_t GoogleSignIn_GetGivenName(GIDGoogleUser *guser, char *buf, size_t len) { size_t GoogleSignIn_GetGivenName(SignInResult *gresult, char *buf, size_t len) {
NSString *val = [guser.profile givenName]; NSString *val = [gresult->user.profile givenName];
return CopyNSString(val, buf, len); return CopyNSString(val, buf, len);
} }
size_t GoogleSignIn_GetIdToken(GIDGoogleUser *guser, char *buf, size_t len) { size_t GoogleSignIn_GetIdToken(SignInResult *gresult, char *buf, size_t len) {
NSString *val = [guser.authentication idToken]; NSString *val = [gresult->user.idToken tokenString];
return CopyNSString(val, buf, len); return CopyNSString(val, buf, len);
} }
size_t GoogleSignIn_GetImageUrl(GIDGoogleUser *guser, char *buf, size_t len) { size_t GoogleSignIn_GetImageUrl(SignInResult *gresult, char *buf, size_t len) {
NSURL *url = [guser.profile imageURLWithDimension:128]; NSURL *url = [gresult->user.profile imageURLWithDimension:128];
NSString *val = url ? [url absoluteString] : nullptr; NSString *val = url ? [url absoluteString] : nullptr;
return CopyNSString(val, buf, len); return CopyNSString(val, buf, len);
} }
size_t GoogleSignIn_GetUserId(GIDGoogleUser *guser, char *buf, size_t len) { size_t GoogleSignIn_GetUserId(SignInResult *gresult, char *buf, size_t len) {
NSString *val = [guser userID]; NSString *val = [gresult->user userID];
return CopyNSString(val, buf, len); return CopyNSString(val, buf, len);
} }
} // extern "C" } // extern "C"

@ -2,34 +2,34 @@ fileFormatVersion: 2
guid: 521784ee6b2184e0e947a8fd1508afbc guid: 521784ee6b2184e0e947a8fd1508afbc
labels: labels:
- gvh - gvh
- gvh_version-1.0.4 timeCreated: 1510357716
licenseType: Pro
PluginImporter: PluginImporter:
externalObjects: {}
serializedVersion: 2 serializedVersion: 2
iconMap: {} iconMap: {}
executionOrder: {} executionOrder: {}
defineConstraints: []
isPreloaded: 0 isPreloaded: 0
isOverridable: 0 isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData: platformData:
- first: data:
Any: first:
second: Any:
enabled: 0 second:
settings: {} enabled: 0
- first: settings: {}
Editor: Editor data:
second: first:
enabled: 0 Editor: Editor
settings: second:
DefaultValueInitialized: true enabled: 0
- first: settings:
iPhone: iOS DefaultValueInitialized: true
second: data:
enabled: 1 first:
settings: {} iPhone: iOS
second:
enabled: 1
settings: {}
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

@ -2,32 +2,23 @@ fileFormatVersion: 2
guid: ce40e3e7b37a54617a4683dfc0479c71 guid: ce40e3e7b37a54617a4683dfc0479c71
labels: labels:
- gvh - gvh
- gvh_version-1.0.4 timeCreated: 1490998272
licenseType: Pro
PluginImporter: PluginImporter:
externalObjects: {} serializedVersion: 1
serializedVersion: 2
iconMap: {} iconMap: {}
executionOrder: {} executionOrder: {}
defineConstraints: []
isPreloaded: 0 isPreloaded: 0
isOverridable: 0 isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData: platformData:
- first: Any:
Any:
second:
enabled: 0 enabled: 0
settings: {} settings: {}
- first: Editor:
Editor: Editor
second:
enabled: 0 enabled: 0
settings: settings:
DefaultValueInitialized: true DefaultValueInitialized: true
- first: iOS:
iPhone: iOS
second:
enabled: 1 enabled: 1
settings: {} settings: {}
userData: userData:

@ -15,11 +15,10 @@
*/ */
#import "GoogleSignInAppController.h" #import "GoogleSignInAppController.h"
#import <GoogleSignIn/GoogleSignIn.h>
#import <GoogleSignIn/GIDSignIn.h>
#import <objc/runtime.h> #import <objc/runtime.h>
// Handles Google SignIn UI and events.
GoogleSignInHandler *gsiHandler;
/* /*
* Create a category to customize the application. When this is loaded the * Create a category to customize the application. When this is loaded the
* method for the existing application and GoogleSignIn are swizzled into the * method for the existing application and GoogleSignIn are swizzled into the
@ -69,14 +68,11 @@ GoogleSignInHandler *gsiHandler;
ofType:@"plist"]; ofType:@"plist"];
NSDictionary *dict = [NSDictionary dictionaryWithContentsOfFile:path]; NSDictionary *dict = [NSDictionary dictionaryWithContentsOfFile:path];
NSString *clientId = [dict objectForKey:@"CLIENT_ID"]; NSString *clientId = [dict objectForKey:@"CLIENT_ID"];
NSString *serverClientID = [dict objectForKey:@"SERVER_CLIENT_ID"];
gsiHandler = [GoogleSignInHandler alloc];
// Setup the Sign-In instance. // Setup the Sign-In instance.
GIDSignIn *signIn = [GIDSignIn sharedInstance]; GIDConfiguration *config = [[GIDConfiguration alloc] initWithClientID:clientId serverClientID:serverClientID];
signIn.clientID = clientId; [GIDSignIn.sharedInstance setConfiguration:config];
signIn.uiDelegate = gsiHandler;
signIn.delegate = gsiHandler;
// looks like it's just calling itself, but the implementations were swapped // looks like it's just calling itself, but the implementations were swapped
// so we're actually calling the original once we're done // so we're actually calling the original once we're done
@ -96,9 +92,7 @@ GoogleSignInHandler *gsiHandler;
sourceApplication:sourceApplication sourceApplication:sourceApplication
annotation:annotation]; annotation:annotation];
return [[GIDSignIn sharedInstance] handleURL:url return [GIDSignIn.sharedInstance handleURL:url] ||
sourceApplication:sourceApplication
annotation:annotation] ||
handled; handled;
} }
@ -112,12 +106,7 @@ GoogleSignInHandler *gsiHandler;
BOOL handled = BOOL handled =
[self GoogleSignInAppController:app openURL:url options:options]; [self GoogleSignInAppController:app openURL:url options:options];
return [[GIDSignIn sharedInstance] return [GIDSignIn.sharedInstance handleURL:url] ||
handleURL:url
sourceApplication:
options[UIApplicationOpenURLOptionsSourceApplicationKey]
annotation:
options[UIApplicationOpenURLOptionsAnnotationKey]] ||
handled; handled;
} }

@ -2,32 +2,23 @@ fileFormatVersion: 2
guid: 50b2e1c9319e4446e9dbd9b183790472 guid: 50b2e1c9319e4446e9dbd9b183790472
labels: labels:
- gvh - gvh
- gvh_version-1.0.4 timeCreated: 1490998272
licenseType: Pro
PluginImporter: PluginImporter:
externalObjects: {} serializedVersion: 1
serializedVersion: 2
iconMap: {} iconMap: {}
executionOrder: {} executionOrder: {}
defineConstraints: []
isPreloaded: 0 isPreloaded: 0
isOverridable: 0 isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData: platformData:
- first: Any:
Any:
second:
enabled: 0 enabled: 0
settings: {} settings: {}
- first: Editor:
Editor: Editor
second:
enabled: 0 enabled: 0
settings: settings:
DefaultValueInitialized: true DefaultValueInitialized: true
- first: iOS:
iPhone: iOS
second:
enabled: 1 enabled: 1
settings: {} settings: {}
userData: userData:

@ -20,6 +20,7 @@ public class GoogleSignInIOSBuildPatch
plist.ReadFromFile(plistPath); plist.ReadFromFile(plistPath);
PlistElementDict rootDict = plist.root; PlistElementDict rootDict = plist.root;
// Optional: can be removed if not used by your native code
rootDict.SetString("GIDClientID", GameConstants.iOS_ClientID); rootDict.SetString("GIDClientID", GameConstants.iOS_ClientID);
PlistElementArray urlTypes = rootDict.CreateArray("CFBundleURLTypes"); PlistElementArray urlTypes = rootDict.CreateArray("CFBundleURLTypes");
@ -28,49 +29,9 @@ public class GoogleSignInIOSBuildPatch
schemes.AddString(GameConstants.iOS_URL_Scheme); schemes.AddString(GameConstants.iOS_URL_Scheme);
plist.WriteToFile(plistPath); plist.WriteToFile(plistPath);
Debug.Log("✅ Patched Info.plist with GIDClientID and URL scheme."); Debug.Log("✅ Patched Info.plist with URL scheme.");
// === Modify UnityAppController.mm === // DO NOT PATCH UnityAppController.mm — GIDSignIn.clientID is removed in SDK v6+
string appControllerPath = Path.Combine(pathToBuiltProject, "Classes", "UnityAppController.mm");
if (!File.Exists(appControllerPath))
{
Debug.LogWarning("⚠️ UnityAppController.mm not found.");
return;
}
string content = File.ReadAllText(appControllerPath);
// 1. Inject #import if missing
string importLine = "#import <GoogleSignIn/GoogleSignIn.h>";
if (!content.Contains(importLine))
{
int importInsertIndex = content.IndexOf("#import");
if (importInsertIndex >= 0)
{
int endOfLine = content.IndexOf("\n", importInsertIndex);
content = content.Insert(endOfLine + 1, importLine + "\n");
}
}
// 2. Inject GIDSignIn client ID line
string injection = $"[GIDSignIn sharedInstance].clientID = @\"{GameConstants.iOS_ClientID}\";";
if (!content.Contains(injection))
{
string marker = "didFinishLaunchingWithOptions:(NSDictionary*)launchOptions";
int markerIndex = content.IndexOf(marker);
if (markerIndex >= 0)
{
int braceIndex = content.IndexOf("{", markerIndex);
if (braceIndex >= 0)
{
content = content.Insert(braceIndex + 1, "\n " + injection);
}
}
}
File.WriteAllText(appControllerPath, content);
Debug.Log("✅ Patched UnityAppController.mm with GIDSignIn setup.");
} }
} }
#endif #endif
Loading…
Cancel
Save