diff --git a/Assets/GoogleSignIn/Editor/m2repository/com/google.meta b/Assets/AllIn1SpriteShader/2DRenderer-URP-Package-2021.2+.unitypackage.meta similarity index 54% rename from Assets/GoogleSignIn/Editor/m2repository/com/google.meta rename to Assets/AllIn1SpriteShader/2DRenderer-URP-Package-2021.2+.unitypackage.meta index a1cf31a7..b7c4cd42 100644 --- a/Assets/GoogleSignIn/Editor/m2repository/com/google.meta +++ b/Assets/AllIn1SpriteShader/2DRenderer-URP-Package-2021.2+.unitypackage.meta @@ -1,8 +1,5 @@ fileFormatVersion: 2 -guid: 707de6ade212a46b1ab4bf4d42325176 -folderAsset: yes -timeCreated: 1508956004 -licenseType: Free +guid: a55ee4efaad27d948ba5f03fc6d7bc80 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/GoogleSignIn/Editor/m2repository.meta b/Assets/AllIn1SpriteShader/2DRenderer-URP-Package.unitypackage.meta similarity index 54% rename from Assets/GoogleSignIn/Editor/m2repository.meta rename to Assets/AllIn1SpriteShader/2DRenderer-URP-Package.unitypackage.meta index 26cfc222..55927234 100644 --- a/Assets/GoogleSignIn/Editor/m2repository.meta +++ b/Assets/AllIn1SpriteShader/2DRenderer-URP-Package.unitypackage.meta @@ -1,8 +1,5 @@ fileFormatVersion: 2 -guid: eefc3dc8b56e545998952bd59ab36247 -folderAsset: yes -timeCreated: 1508956004 -licenseType: Free +guid: ed9b95dc6ed6d0647ad7f1a8f305385d DefaultImporter: externalObjects: {} userData: diff --git a/Assets/GoogleSignIn.meta b/Assets/GoogleSignIn.meta deleted file mode 100644 index b61c9432..00000000 --- a/Assets/GoogleSignIn.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: a089c79cc334748a5a29c5f219b7cfd4 -folderAsset: yes -timeCreated: 1490807626 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GoogleSignIn/.DS_Store b/Assets/GoogleSignIn/.DS_Store deleted file mode 100644 index ca77057a..00000000 Binary files a/Assets/GoogleSignIn/.DS_Store and /dev/null differ diff --git a/Assets/GoogleSignIn/Editor.meta b/Assets/GoogleSignIn/Editor.meta deleted file mode 100644 index d55e3f7a..00000000 --- a/Assets/GoogleSignIn/Editor.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: a7e77ece57ef34772969fad4915b1a4c -folderAsset: yes -timeCreated: 1490978071 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GoogleSignIn/Editor/.DS_Store b/Assets/GoogleSignIn/Editor/.DS_Store deleted file mode 100644 index 4d387c20..00000000 Binary files a/Assets/GoogleSignIn/Editor/.DS_Store and /dev/null differ diff --git a/Assets/GoogleSignIn/Editor/GoogleSignInDependencies.xml b/Assets/GoogleSignIn/Editor/GoogleSignInDependencies.xml deleted file mode 100644 index 821e7dc9..00000000 --- a/Assets/GoogleSignIn/Editor/GoogleSignInDependencies.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - extra-google-m2repository - - - - - - - - - - diff --git a/Assets/GoogleSignIn/Editor/GoogleSignInDependencies.xml.meta b/Assets/GoogleSignIn/Editor/GoogleSignInDependencies.xml.meta deleted file mode 100644 index 298fa3d3..00000000 --- a/Assets/GoogleSignIn/Editor/GoogleSignInDependencies.xml.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 938014c9994164100b26d82840a88fbb -labels: -- gvh -timeCreated: 1507661087 -licenseType: Pro -TextScriptImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GoogleSignIn/Editor/google-signin-plugin_v1.0.1.txt b/Assets/GoogleSignIn/Editor/google-signin-plugin_v1.0.1.txt deleted file mode 100644 index f7061862..00000000 --- a/Assets/GoogleSignIn/Editor/google-signin-plugin_v1.0.1.txt +++ /dev/null @@ -1,27 +0,0 @@ -Assets/GoogleSignIn/Editor/GoogleSignInDependencies.xml -Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.aar -Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.aar.md5 -Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.aar.sha1 -Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.pom -Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.pom.md5 -Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.pom.sha1 -Assets/GoogleSignIn/Future.cs -Assets/GoogleSignIn/GoogleSignIn.cs -Assets/GoogleSignIn/GoogleSignInConfiguration.cs -Assets/GoogleSignIn/GoogleSignInStatusCode.cs -Assets/GoogleSignIn/GoogleSignInUser.cs -Assets/GoogleSignIn/Impl/BaseObject.cs -Assets/GoogleSignIn/Impl/GoogleSignInImpl.cs -Assets/GoogleSignIn/Impl/NativeFuture.cs -Assets/GoogleSignIn/Impl/SignInHelperObject.cs -Assets/Parse/LICENSE -Assets/Parse/Plugins/Unity.Compat.dll -Assets/Parse/Plugins/Unity.Tasks.dll -Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.54.0.dll -Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.54.0.dll -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 diff --git a/Assets/GoogleSignIn/Editor/google-signin-plugin_v1.0.1.txt.meta b/Assets/GoogleSignIn/Editor/google-signin-plugin_v1.0.1.txt.meta deleted file mode 100644 index 6cffc299..00000000 --- a/Assets/GoogleSignIn/Editor/google-signin-plugin_v1.0.1.txt.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 817a6673340324b8ca85e24466f60953 -labels: -- gvh -- gvh_manifest -- gvh_version-1.0.1 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GoogleSignIn/Editor/m2repository/.DS_Store b/Assets/GoogleSignIn/Editor/m2repository/.DS_Store deleted file mode 100644 index 35a54bf0..00000000 Binary files a/Assets/GoogleSignIn/Editor/m2repository/.DS_Store and /dev/null differ diff --git a/Assets/GoogleSignIn/Editor/m2repository/com.meta b/Assets/GoogleSignIn/Editor/m2repository/com.meta deleted file mode 100644 index 9372f2b8..00000000 --- a/Assets/GoogleSignIn/Editor/m2repository/com.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: ade49ef91c70440a0baeac322ecaa2d7 -folderAsset: yes -timeCreated: 1508956004 -licenseType: Free -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GoogleSignIn/Editor/m2repository/com/.DS_Store b/Assets/GoogleSignIn/Editor/m2repository/com/.DS_Store deleted file mode 100644 index b7133245..00000000 Binary files a/Assets/GoogleSignIn/Editor/m2repository/com/.DS_Store and /dev/null differ diff --git a/Assets/GoogleSignIn/Editor/m2repository/com/google/.DS_Store b/Assets/GoogleSignIn/Editor/m2repository/com/google/.DS_Store deleted file mode 100644 index aceafef8..00000000 Binary files a/Assets/GoogleSignIn/Editor/m2repository/com/google/.DS_Store and /dev/null differ diff --git a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin.meta b/Assets/GoogleSignIn/Editor/m2repository/com/google/signin.meta deleted file mode 100644 index 4a56a312..00000000 --- a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 34b86fc2e934d482ea5f9d1f5354b0f9 -folderAsset: yes -timeCreated: 1508956004 -licenseType: Free -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/.DS_Store b/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/.DS_Store deleted file mode 100644 index f17ea321..00000000 Binary files a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/.DS_Store and /dev/null differ diff --git a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support.meta b/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support.meta deleted file mode 100644 index 1132fbfe..00000000 --- a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: e3becceb8680148d59e5bb93e5eb5a24 -folderAsset: yes -timeCreated: 1508956004 -licenseType: Free -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GoogleSignIn/Future.cs b/Assets/GoogleSignIn/Future.cs deleted file mode 100644 index df469423..00000000 --- a/Assets/GoogleSignIn/Future.cs +++ /dev/null @@ -1,84 +0,0 @@ -// -// Copyright (C) 2017 Google Inc. All Rights Reserved. -// -// 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. -// -namespace Google { - using System.Collections; - using System.Threading.Tasks; - using UnityEngine; - - /// - /// Interface for implementations of the Future API. - /// - internal interface FutureAPIImpl { - bool Pending { get; } - GoogleSignInStatusCode Status { get; } - T Result { get; } - } - - /// - /// Future return value. - /// - /// This class provides a promise of a result from a method call. - /// The typical usage is to check the Pending property until it is false. - /// At this time either the Status or Result will be available for use. - /// Result is only set if the operation was successful. - /// As a convience, a coroutine to complete a Task is provided. - /// - public class Future { - - private FutureAPIImpl apiImpl; - - internal Future(FutureAPIImpl impl) { - apiImpl = impl; - } - - /// - /// Gets a value indicating whether this - /// is pending. - /// - /// true if pending; otherwise, false. - public bool Pending { get { return apiImpl.Pending; } } - - /// - /// Gets the status. - /// - /// The status is set when Pending == false. - GoogleSignInStatusCode Status { get { return apiImpl.Status; } } - - /// - /// Gets the result. - /// - /// The result is set when Pending == false and there is no error. - /// - T Result { get { return apiImpl.Result; } } - - /// - /// Waits for result then completes the TaskCompleationSource. - /// - /// The for result. - /// Tcs. - internal IEnumerator WaitForResult(TaskCompletionSource tcs) { - yield return new WaitUntil(() => !Pending); - if (Status == GoogleSignInStatusCode.Canceled) { - tcs.SetCanceled(); - } else if (Status == GoogleSignInStatusCode.Success || - Status == GoogleSignInStatusCode.SuccessCached) { - tcs.SetResult(Result); - } else { - tcs.SetException(new GoogleSignIn.SignInException(Status)); - } - } - } -} \ No newline at end of file diff --git a/Assets/GoogleSignIn/Future.cs.meta b/Assets/GoogleSignIn/Future.cs.meta deleted file mode 100644 index 3932f1d0..00000000 --- a/Assets/GoogleSignIn/Future.cs.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: ad3b09fb652fb4ff0a68d1966f13160e -labels: -- gvh -timeCreated: 1495747145 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GoogleSignIn/GoogleSignIn.cs b/Assets/GoogleSignIn/GoogleSignIn.cs deleted file mode 100644 index c59ced72..00000000 --- a/Assets/GoogleSignIn/GoogleSignIn.cs +++ /dev/null @@ -1,202 +0,0 @@ -// -// Copyright (C) 2017 Google Inc. All Rights Reserved. -// -// 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. -// - -namespace Google { - using System; - using System.Runtime.Serialization; - using System.Threading.Tasks; - using Google.Impl; - using UnityEngine; - - /// - /// Google sign in API. - /// - /// This class implements the GoogleSignInAPI for Unity. - /// Typical usage is to set the Configuration options as needed, then - /// get the DefaultInstance and call signIn or signInSilently. See - /// the - /// Google Sign-In API documentation for more details. - /// - /// - /// private static readonly GoogleSignInConfiguration configuration = - /// new GoogleSignInConfiguration { - /// WebClientId = "", - /// RequestIdToken = true - /// }; - /// - /// public void OnSignIn() { - /// GoogleSignIn.Configuration = configuration; - /// GoogleSignIn.Configuration.UseGameSignIn = false; - /// GoogleSignIn.Configuration.RequestIdToken = true; - /// GoogleSignIn.DefaultInstance.SignIn().ContinueWith( - /// OnAuthenticationFinished); - /// } - /// - /// - /// - public class GoogleSignIn { - -#if !UNITY_ANDROID && !UNITY_IOS - static GoogleSignIn() { - Debug.LogError("This platform is not supported"); - } -#endif - - private static GoogleSignIn theInstance = null; - private static GoogleSignInConfiguration theConfiguration = null; - private ISignInImpl impl; - - /// The configuration settings for Google Sign-in. - /// The configuration should be set before calling the sign-in - /// methods. Once the configuration is set it cannot be changed. - /// - public static GoogleSignInConfiguration Configuration { - set { - // Can set the configuration until the singleton is created. - if (theInstance == null || theConfiguration == value || theConfiguration == null) { - theConfiguration = value; - } else { - throw new SignInException(GoogleSignInStatusCode.DeveloperError, - "DefaultInstance already created. " + - " Cannot change configuration after creation."); - } - } - - get { - return theConfiguration; - } - } - - /// - /// Singleton instance of this class. - /// - /// The instance. - public static GoogleSignIn DefaultInstance { - get { - if (theInstance == null) { -#if UNITY_ANDROID || UNITY_IOS - theInstance = new GoogleSignIn(new GoogleSignInImpl(Configuration)); -#else - theInstance = new GoogleSignIn(null); - throw new SignInException( - GoogleSignInStatusCode.DeveloperError, - "This platform is not supported by GoogleSignIn"); -#endif - } - return theInstance; - } - } - - internal GoogleSignIn(GoogleSignInImpl impl) { - this.impl = impl; - } - - public void EnableDebugLogging(bool flag) { - impl.EnableDebugLogging(flag); - } - - /// Starts the authentication process. - /// - /// The authenication process is started and may display account picker - /// popups and consent prompts based on the state of authentication and - /// the requested elements. - /// - public Task SignIn() { - var tcs = new TaskCompletionSource(); - SignInHelperObject.Instance.StartCoroutine( - impl.SignIn().WaitForResult(tcs)); - return tcs.Task; - } - - /// Starts the silent authentication process. - /// - /// The authenication process is started and will attempt to sign in without - /// displaying any UI. If this cannot be done, the developer should call - /// SignIn(). - /// - public Task SignInSilently() { - var tcs = new TaskCompletionSource(); - SignInHelperObject.Instance.StartCoroutine( - impl.SignInSilently().WaitForResult(tcs)); - return tcs.Task; - } - - /// - /// Signs out the User. - /// - /// Future sign-in attempts will require the user to select the - /// account to use when signing in. - /// - public void SignOut() { - theConfiguration = null; - impl.SignOut(); - } - - /// - /// Disconnect this instance. - /// - /// When the user is disconnected, it revokes all access that may - /// have been granted to this application. This includes any server side - /// access tokens derived from server auth codes. As a result, future - /// sign-in attempts will require the user to re-consent to the requested - /// scopes. - /// - public void Disconnect() { - impl.Disconnect(); - } - - /// - /// Sign in exception. This is a checked exception for handling specific - /// errors during the sign-in process. - /// - [Serializable] - public class SignInException : Exception { - internal SignInException(GoogleSignInStatusCode status) { - Status = status; - } - - public SignInException(GoogleSignInStatusCode status, string message) : - base(message) { - Status = status; - } - - public SignInException(GoogleSignInStatusCode status, string message, - Exception innerException) : base(message, innerException) { - Status = status; - } - - protected SignInException(GoogleSignInStatusCode status, - SerializationInfo info, - StreamingContext context) : - base(info, context) { - Status = status; - } - - public GoogleSignInStatusCode Status { - get; - internal set; - } - } - } - - internal interface ISignInImpl { - Future SignIn(); - Future SignInSilently(); - void EnableDebugLogging(bool flag); - void SignOut(); - void Disconnect(); - } -} // namespace Google diff --git a/Assets/GoogleSignIn/GoogleSignIn.cs.meta b/Assets/GoogleSignIn/GoogleSignIn.cs.meta deleted file mode 100644 index e289fb9f..00000000 --- a/Assets/GoogleSignIn/GoogleSignIn.cs.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: 138b984208e394be797ce8905a44fd54 -labels: -- gvh -timeCreated: 1490814915 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GoogleSignIn/GoogleSignInConfiguration.cs b/Assets/GoogleSignIn/GoogleSignInConfiguration.cs deleted file mode 100644 index d914c68d..00000000 --- a/Assets/GoogleSignIn/GoogleSignInConfiguration.cs +++ /dev/null @@ -1,63 +0,0 @@ -// -// Copyright (C) 2017 Google Inc. All Rights Reserved. -// -// 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. -// - -namespace Google { - using System.Collections.Generic; - - /// - /// Configuration properties for Google Sign-In. - /// - public class GoogleSignInConfiguration { - /// Set to true to use games signin, false for default signin. - /// - /// Note: The Games configuration is not supported on non-Android - /// platforms. - /// If games configuration is used, you must also add the - /// play-services-games libraries and dependencies. - /// See the README for more details. - /// - public bool UseGameSignIn = false; - /// Web client id associated with this app. - /// Required for requesting auth code or id token. - public string WebClientId = null; - /// Set to true for getting an auth code when authenticating. - /// - public bool RequestAuthCode = false; - /// Set to true to request to reset the refresh token. - /// Causes re-consent. - /// - public bool ForceTokenRefresh = false; - /// Request email address, requires consent. - public bool RequestEmail = false; - /// Request id token, requires consent. - public bool RequestIdToken = false; - /// Request profile information, requires consent. - public bool RequestProfile = false; - /// Hides popup UIs from games services. - /// Used with games signin to show or hide the connecting popup UI - /// and to associate an invisible view for other popups. This is - /// recommended for VR applications. This has no effect if UseGameSignIn is - /// false. - /// - public bool HidePopups = false; - /// Account name to use when authenticating, - /// null indicates use default. - public string AccountName = null; - /// Additional scopes to request, requires consent. - public IEnumerable AdditionalScopes = null; - } -} - diff --git a/Assets/GoogleSignIn/GoogleSignInConfiguration.cs.meta b/Assets/GoogleSignIn/GoogleSignInConfiguration.cs.meta deleted file mode 100644 index 0a5774a6..00000000 --- a/Assets/GoogleSignIn/GoogleSignInConfiguration.cs.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: 0c3999c0f68f04ae08f04fb3bf2a2050 -labels: -- gvh -timeCreated: 1495747213 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GoogleSignIn/GoogleSignInController.cs b/Assets/GoogleSignIn/GoogleSignInController.cs deleted file mode 100644 index 5383ed44..00000000 --- a/Assets/GoogleSignIn/GoogleSignInController.cs +++ /dev/null @@ -1,50 +0,0 @@ -using UnityEngine; -using Google; -using System.Threading.Tasks; - -public class GoogleSignInController : MonoBehaviour -{ - private GoogleSignInConfiguration configuration; - - void Awake() - { - // Set up the Google Sign-In configuration - configuration = new GoogleSignInConfiguration - { - WebClientId = "624507103444-6agok4g1q29bsb615v235jbf0k585ruk.apps.googleusercontent.com", - RequestEmail = true, - RequestIdToken = false, // ❌ We no longer request IdToken, since we use ServerAuthCode instead - RequestAuthCode = true // ✅ Enable ServerAuthCode for secure backend authentication - }; - - GoogleSignIn.Configuration = configuration; - } - - public void SignInWithGoogle() - { - GoogleSignIn.DefaultInstance.SignIn().ContinueWith(OnGoogleSignIn); - } - - private void OnGoogleSignIn(Task task) - { - if (task.IsFaulted) - { - Debug.LogError("Google Sign-In encountered an error: " + task.Exception); - } - else if (task.IsCanceled) - { - Debug.Log("Google Sign-In was canceled."); - } - else - { - GoogleSignInUser user = task.Result; - Debug.Log("✅ Google Sign-In succeeded!"); - Debug.Log("👤 Display Name: " + user.DisplayName); - Debug.Log("📧 Email: " + user.Email); - Debug.Log("🔑 Server Auth Code: " + user.AuthCode); - - // 🔹 Send this AuthCode to your backend (PlayFab, Firebase, or custom server) - // The backend will exchange this for an access token. - } - } -} diff --git a/Assets/GoogleSignIn/GoogleSignInController.cs.meta b/Assets/GoogleSignIn/GoogleSignInController.cs.meta deleted file mode 100644 index 0b41ba01..00000000 --- a/Assets/GoogleSignIn/GoogleSignInController.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 8948afce6ec0e984aa137d3f84aba688 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GoogleSignIn/GoogleSignInStatusCode.cs b/Assets/GoogleSignIn/GoogleSignInStatusCode.cs deleted file mode 100644 index 0719f2c2..00000000 --- a/Assets/GoogleSignIn/GoogleSignInStatusCode.cs +++ /dev/null @@ -1,72 +0,0 @@ -// -// Copyright (C) 2017 Google Inc. All Rights Reserved. -// -// 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. -// - -namespace Google { - - /// - /// Status code for the SignIn operations. - /// - /// All successful status codes are less than or equal to 0. - /// - public enum GoogleSignInStatusCode { - /// The operation was successful, but used the device's cache. - /// - SuccessCached = -1, - - /// The operation was successful. - Success = 0, - - /// The client attempted to call a method from an API that - /// failed to connect. - ApiNotConnected = 1, - - /// The result was canceled either due to client disconnect - /// or cancel(). - Canceled = 2, - - /// A blocking call was interrupted while waiting and did not - /// run to completion. - Interrupted = 3, - - /// The client attempted to connect to the service with an - /// invalid account name specified. - InvalidAccount = 4, - - /// Timed out while awaiting the result. - Timeout = 5, - - /// The application is misconfigured. - /// This error is not recoverable. - /// - /// The developer should look at the logs after this to determine - /// more actionable information. - /// - DeveloperError = 6, - - /// An internal error occurred. Retrying should resolve the - /// problem. - InternalError = 7, - - /// A network error occurred. Retrying should resolve the problem. - /// - NetworkError = 8, - - /// The operation failed with no more detailed information. - /// - Error = 9, - } -} // namespace GoogleSignIn - diff --git a/Assets/GoogleSignIn/GoogleSignInStatusCode.cs.meta b/Assets/GoogleSignIn/GoogleSignInStatusCode.cs.meta deleted file mode 100644 index 9a8718dd..00000000 --- a/Assets/GoogleSignIn/GoogleSignInStatusCode.cs.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: 077933fcaedac412d9762bf3e0a3be68 -labels: -- gvh -timeCreated: 1501271136 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GoogleSignIn/GoogleSignInUser.cs b/Assets/GoogleSignIn/GoogleSignInUser.cs deleted file mode 100644 index a3ea8b3f..00000000 --- a/Assets/GoogleSignIn/GoogleSignInUser.cs +++ /dev/null @@ -1,76 +0,0 @@ -// -// Copyright (C) 2017 Google Inc. All Rights Reserved. -// -// 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. -// - -namespace Google { - using System; - - /// Information for the authenticated user. - public class GoogleSignInUser { - - /// Server AuthCode to be exchanged for an auth token. - /// null if not requested, or if there was an error. - public string AuthCode { - get; - internal set; - } - - /// Email address. - /// null if not requested, or if there was an error. - public string Email { - get; - internal set; - } - - /// Id token. - /// null if not requested, or if there was an error. - public string IdToken { - get; - internal set; - } - - /// Display Name. - public string DisplayName { - get; - internal set; - } - - /// Given Name. - public string GivenName { - get; - internal set; - } - - /// Family Name. - public string FamilyName { - get; - internal set; - } - - /// Profile photo - /// Can be null if the profile is not requested, - /// or none set. - public Uri ImageUrl { - get; - internal set; - } - - /// User ID - public string UserId { - get; - internal set; - } - } -} diff --git a/Assets/GoogleSignIn/GoogleSignInUser.cs.meta b/Assets/GoogleSignIn/GoogleSignInUser.cs.meta deleted file mode 100644 index 757b4d0d..00000000 --- a/Assets/GoogleSignIn/GoogleSignInUser.cs.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: c56b92217d0144af5907627d1235e0a5 -labels: -- gvh -timeCreated: 1495747250 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GoogleSignIn/Impl.meta b/Assets/GoogleSignIn/Impl.meta deleted file mode 100644 index de5f17f2..00000000 --- a/Assets/GoogleSignIn/Impl.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 2fbe4f3ec9db4415e849f9bb89e63a92 -folderAsset: yes -timeCreated: 1502761839 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GoogleSignIn/Impl/BaseObject.cs b/Assets/GoogleSignIn/Impl/BaseObject.cs deleted file mode 100644 index 44d65013..00000000 --- a/Assets/GoogleSignIn/Impl/BaseObject.cs +++ /dev/null @@ -1,70 +0,0 @@ -// -// Copyright (C) 2017 Google Inc. All Rights Reserved. -// -// 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. -// - -namespace Google.Impl { - using System; - using System.Runtime.InteropServices; - using System.Text; - using UnityEngine; - - /// - /// Base object manages the pointer to a native object which provides the - /// implementation of a C# object. - /// - internal abstract class BaseObject : IDisposable { - // handle to native object. - private HandleRef selfHandleRef; - private static HandleRef nullSelf = new HandleRef(); - - public BaseObject(IntPtr intPtr) { - selfHandleRef = new HandleRef(this, intPtr); - } - - protected HandleRef SelfPtr() { - if (selfHandleRef.Equals(nullSelf)) { - throw new InvalidOperationException( - "Attempted to use object after it was cleaned up"); - } - return selfHandleRef; - } - - public virtual void Dispose() { - selfHandleRef = nullSelf; - } - - internal delegate UIntPtr OutStringMethod([In, Out] byte[] out_bytes, - UIntPtr out_size); - - internal static String OutParamsToString(OutStringMethod outStringMethod) { - UIntPtr requiredSize = outStringMethod(null, UIntPtr.Zero); - if (requiredSize.Equals(UIntPtr.Zero)) { - return null; - } - - string str = null; - try { - byte[] array = new byte[requiredSize.ToUInt32()]; - outStringMethod(array, requiredSize); - str = Encoding.UTF8.GetString(array, 0, - (int)requiredSize.ToUInt32() - 1); - } catch (Exception e) { - Debug.LogError("Exception creating string from char array: " + e); - str = string.Empty; - } - return str; - } - } -} diff --git a/Assets/GoogleSignIn/Impl/BaseObject.cs.meta b/Assets/GoogleSignIn/Impl/BaseObject.cs.meta deleted file mode 100644 index 286f1c84..00000000 --- a/Assets/GoogleSignIn/Impl/BaseObject.cs.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: fe250cda690a44cb08f8f7d26c9723b4 -labels: -- gvh -timeCreated: 1495748295 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GoogleSignIn/Impl/GoogleSignInImpl.cs b/Assets/GoogleSignIn/Impl/GoogleSignInImpl.cs deleted file mode 100644 index 78c8081f..00000000 --- a/Assets/GoogleSignIn/Impl/GoogleSignInImpl.cs +++ /dev/null @@ -1,187 +0,0 @@ -// -// Copyright (C) 2017 Google Inc. All Rights Reserved. -// -// 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. -// - -namespace Google.Impl { - using System; - using System.Collections.Generic; - using System.Runtime.InteropServices; - - internal class GoogleSignInImpl : BaseObject, ISignInImpl { - -#if UNITY_ANDROID - private const string DllName = "native-googlesignin"; -#else - private const string DllName = "__Internal"; -#endif - - internal GoogleSignInImpl(GoogleSignInConfiguration configuration) - : base(GoogleSignIn_Create(GetPlayerActivity())) { - - if (configuration != null) { - List scopes = new List(); - if (configuration.AdditionalScopes != null) { - scopes.AddRange(configuration.AdditionalScopes); - } - GoogleSignIn_Configure(SelfPtr(), configuration.UseGameSignIn, - configuration.WebClientId, - configuration.RequestAuthCode, - configuration.ForceTokenRefresh, - configuration.RequestEmail, - configuration.RequestIdToken, - configuration.HidePopups, - scopes.ToArray(), - scopes.Count, - configuration.AccountName); - } - } - - /// Enables/Disables verbose logging to help troubleshooting - public void EnableDebugLogging(bool flag) { - GoogleSignIn_EnableDebugLogging(SelfPtr(), flag); - } - - /// - /// Starts the authentication process. - /// - /// - /// The authenication process is started and may display account picker - /// popups and consent prompts based on the state of authentication and - /// the requested elements. - /// - public Future SignIn() { - IntPtr nativeFuture = GoogleSignIn_SignIn(SelfPtr()); - return new Future(new NativeFuture(nativeFuture)); - } - - /// - /// Starts the authentication process. - /// - /// - /// The authenication process is started and may display account picker - /// popups and consent prompts based on the state of authentication and - /// the requested elements. - /// - public Future SignInSilently() { - IntPtr nativeFuture = GoogleSignIn_SignInSilently(SelfPtr()); - return new Future(new NativeFuture(nativeFuture)); - } - - /// - /// Signs out the User. - /// - public void SignOut() { - GoogleSignIn_Signout(SelfPtr()); - } - - /// - /// Disconnects the user from the application and revokes all consent. - /// - public void Disconnect() { - GoogleSignIn_Disconnect(SelfPtr()); - } - - /// - /// Creates an instance of the native Google Sign-In implementation. - /// - /// - /// For Android this must be the JNI raw object for the parentActivity. - /// For iOS it is ignored. - /// - /// The pointer to the instance. - /// Data used in creating the instance. - [DllImport(DllName)] - static extern IntPtr GoogleSignIn_Create(IntPtr data); - - [DllImport(DllName)] - static extern void GoogleSignIn_EnableDebugLogging(HandleRef self, bool flag); - - [DllImport(DllName)] - static extern bool GoogleSignIn_Configure(HandleRef self, - bool useGameSignIn, string webClientId, - bool requestAuthCode, bool forceTokenRefresh, bool requestEmail, - bool requestIdToken, bool hidePopups, string[] additionalScopes, - int scopeCount, string accountName); - - [DllImport(DllName)] - static extern IntPtr GoogleSignIn_SignIn(HandleRef self); - - [DllImport(DllName)] - static extern IntPtr GoogleSignIn_SignInSilently(HandleRef self); - - [DllImport(DllName)] - static extern void GoogleSignIn_Signout(HandleRef self); - - [DllImport(DllName)] - static extern void GoogleSignIn_Disconnect(HandleRef self); - - [DllImport(DllName)] - internal static extern void GoogleSignIn_DisposeFuture(HandleRef self); - - [DllImport(DllName)] - internal static extern bool GoogleSignIn_Pending(HandleRef self); - - [DllImport(DllName)] - internal static extern IntPtr GoogleSignIn_Result(HandleRef self); - - [DllImport(DllName)] - internal static extern int GoogleSignIn_Status(HandleRef self); - - [DllImport(DllName)] - internal static extern UIntPtr GoogleSignIn_GetServerAuthCode( - HandleRef self, [In, Out] byte[] bytes, UIntPtr len); - - [DllImport(DllName)] - internal static extern UIntPtr GoogleSignIn_GetDisplayName(HandleRef self, - [In, Out] byte[] bytes, UIntPtr len); - - [DllImport(DllName)] - internal static extern UIntPtr GoogleSignIn_GetEmail(HandleRef self, - [In, Out] byte[] bytes, UIntPtr len); - - [DllImport(DllName)] - internal static extern UIntPtr GoogleSignIn_GetFamilyName(HandleRef self, - [In, Out] byte[] bytes, UIntPtr len); - - [DllImport(DllName)] - internal static extern UIntPtr GoogleSignIn_GetGivenName(HandleRef self, - [In, Out] byte[] bytes, UIntPtr len); - - [DllImport(DllName)] - internal static extern UIntPtr GoogleSignIn_GetIdToken(HandleRef self, - [In, Out] byte[] bytes, UIntPtr len); - - [DllImport(DllName)] - internal static extern UIntPtr GoogleSignIn_GetImageUrl(HandleRef self, - [In, Out] byte[] bytes, UIntPtr len); - - [DllImport(DllName)] - internal static extern UIntPtr GoogleSignIn_GetUserId(HandleRef self, - [In, Out] byte[] bytes, UIntPtr len); - - // Gets the Unity player activity. - // For iOS, this returns Zero. - private static IntPtr GetPlayerActivity() { -#if UNITY_ANDROID - UnityEngine.AndroidJavaClass jc = new UnityEngine.AndroidJavaClass( - "com.unity3d.player.UnityPlayer"); - return jc.GetStatic("currentActivity") - .GetRawObject(); -#else - return IntPtr.Zero; -#endif - } - } -} diff --git a/Assets/GoogleSignIn/Impl/GoogleSignInImpl.cs.meta b/Assets/GoogleSignIn/Impl/GoogleSignInImpl.cs.meta deleted file mode 100644 index d4e90199..00000000 --- a/Assets/GoogleSignIn/Impl/GoogleSignInImpl.cs.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: 9ae1f008f9f994b9c96c1a14067d7b48 -labels: -- gvh -timeCreated: 1502758941 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GoogleSignIn/Impl/NativeFuture.cs b/Assets/GoogleSignIn/Impl/NativeFuture.cs deleted file mode 100644 index 6d460f22..00000000 --- a/Assets/GoogleSignIn/Impl/NativeFuture.cs +++ /dev/null @@ -1,102 +0,0 @@ -// -// Copyright (C) 2017 Google Inc. All Rights Reserved. -// -// 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. -// - -namespace Google.Impl { - using System; - using System.Runtime.InteropServices; - - /// - /// Native future is an interal class that implements the FutureAPIImpl - /// by calling native methods which are implemented in the native code. - /// - internal class NativeFuture : BaseObject, FutureAPIImpl { - - internal NativeFuture(IntPtr ptr) : base(ptr) { - } - - public override void Dispose() { - GoogleSignInImpl.GoogleSignIn_DisposeFuture(SelfPtr()); - base.Dispose(); - } - - public bool Pending { - get { - return GoogleSignInImpl.GoogleSignIn_Pending(SelfPtr()); - } - } - - public GoogleSignInUser Result { - get { - IntPtr ptr = GoogleSignInImpl.GoogleSignIn_Result(SelfPtr()); - if (ptr != IntPtr.Zero) { - GoogleSignInUser user = new GoogleSignInUser(); - HandleRef userPtr = new HandleRef(user, ptr); - - user.DisplayName = OutParamsToString((out_string, out_size) => - GoogleSignInImpl.GoogleSignIn_GetDisplayName(userPtr, - out_string, - out_size)); - user.Email = OutParamsToString((out_string, out_size) => - GoogleSignInImpl.GoogleSignIn_GetEmail(userPtr, out_string, - out_size)); - - user.FamilyName = OutParamsToString((out_string, out_size) => - GoogleSignInImpl.GoogleSignIn_GetFamilyName(userPtr, out_string, - out_size)); - - user.GivenName = OutParamsToString((out_string, out_size) => - GoogleSignInImpl.GoogleSignIn_GetGivenName(userPtr, out_string, - out_size)); - - user.IdToken = OutParamsToString((out_string, out_size) => - GoogleSignInImpl.GoogleSignIn_GetIdToken(userPtr, out_string, - out_size)); - - user.AuthCode = OutParamsToString((out_string, out_size) => - GoogleSignInImpl.GoogleSignIn_GetServerAuthCode(userPtr, out_string, - out_size)); - - string url = OutParamsToString((out_string, out_size) => - GoogleSignInImpl.GoogleSignIn_GetImageUrl(userPtr, out_string, - out_size)); - if (url.Length > 0) { - user.ImageUrl = new System.Uri(url); - } - - user.UserId = OutParamsToString((out_string, out_size) => - GoogleSignInImpl.GoogleSignIn_GetUserId(userPtr, out_string, - out_size)); - return user; - } else { - return null; - } - } - } - - /// - /// Gets the status. - /// - /// The platform specific implementation maps the platform specific - /// code to one defined in GoogleSignStatusCode. - /// The status. - public GoogleSignInStatusCode Status { - get { - return (GoogleSignInStatusCode)GoogleSignInImpl.GoogleSignIn_Status( - SelfPtr()); - } - } - } -} diff --git a/Assets/GoogleSignIn/Impl/NativeFuture.cs.meta b/Assets/GoogleSignIn/Impl/NativeFuture.cs.meta deleted file mode 100644 index 2c44becc..00000000 --- a/Assets/GoogleSignIn/Impl/NativeFuture.cs.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: 5f1aae79b1ca4432d9d8ec382c54bf46 -labels: -- gvh -timeCreated: 1502759707 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GoogleSignIn/Impl/SignInHelperObject.cs b/Assets/GoogleSignIn/Impl/SignInHelperObject.cs deleted file mode 100644 index 6fbf3fe0..00000000 --- a/Assets/GoogleSignIn/Impl/SignInHelperObject.cs +++ /dev/null @@ -1,42 +0,0 @@ -// -// Copyright (C) 2017 Google Inc. All Rights Reserved. -// -// 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. -// -namespace Google.Impl { - using UnityEngine; - - ///Helper object to connect the Sign-in API to the Unity Game Scene. - /// - ///This class is added to the scene so that the Google Sign-in API - /// can start coroutines. - /// - public class SignInHelperObject : MonoBehaviour { - - private static SignInHelperObject instance; - - internal static SignInHelperObject Instance { - get { - if (Application.isPlaying) { - // add an invisible game object to the scene - GameObject obj = new GameObject("GoogleSignInHelperObject"); - DontDestroyOnLoad(obj); - instance = obj.AddComponent(); - } else { - instance = new SignInHelperObject(); - } - return instance; - } - } - } -} diff --git a/Assets/GoogleSignIn/Impl/SignInHelperObject.cs.meta b/Assets/GoogleSignIn/Impl/SignInHelperObject.cs.meta deleted file mode 100644 index 8f90a6b2..00000000 --- a/Assets/GoogleSignIn/Impl/SignInHelperObject.cs.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: ad98e5b48888e44eb81dd5884d3a1754 -labels: -- gvh -timeCreated: 1500486239 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GoogleSigninSDK/GoogleSignInManager.cs b/Assets/GoogleSigninSDK/GoogleSignInManager.cs index 434a314c..8e5607c2 100644 --- a/Assets/GoogleSigninSDK/GoogleSignInManager.cs +++ b/Assets/GoogleSigninSDK/GoogleSignInManager.cs @@ -1,6 +1,5 @@ using UnityEngine; using UnityEngine.UI; -using Google; using PlayFab; using PlayFab.ClientModels; using System; @@ -8,54 +7,31 @@ using System.Collections.Generic; using System.Threading.Tasks; using OneSignalSDK; using System.Collections; -using OneSignalSDK.Debug.Models; public class GoogleSignInManager : MonoBehaviour { - private GoogleSignInConfiguration configuration; + // private GoogleSignInConfiguration configuration; public Bootstrapper bootstrapper; - public Button googleSignInButton; public Button guestLoginButton; void Awake() { - configuration = new GoogleSignInConfiguration - { - WebClientId = GameConstants.Web_ClientID, - RequestEmail = true, - RequestAuthCode = true, - }; - - GoogleSignIn.Configuration = configuration; Application.quitting += SyncPlayerPrefsToPlayFabOnQuit; - } void Start() { - googleSignInButton.onClick.RemoveAllListeners(); - googleSignInButton.onClick.AddListener(SignInWithGoogle); - guestLoginButton.onClick.RemoveAllListeners(); guestLoginButton.onClick.AddListener(GuestLogin); - if (PlayerPrefs.HasKey("PlayFabID") && PlayerPrefs.HasKey("GoogleAuthCode")) - { - Debug.Log("User previously signed in with Google. Attempting silent login..."); - googleSignInButton.gameObject.SetActive(false); - guestLoginButton.gameObject.SetActive(false); - SignInSilently(); - } - else if (PlayerPrefs.HasKey("GuestMode")) + if (PlayerPrefs.HasKey("GuestMode")) { Debug.Log("Guest mode previously selected. Letting user choose again."); - googleSignInButton.gameObject.SetActive(true); guestLoginButton.gameObject.SetActive(true); } else { Debug.Log("No login info found. Showing login options."); - googleSignInButton.gameObject.SetActive(true); guestLoginButton.gameObject.SetActive(true); } } @@ -66,7 +42,6 @@ public class GoogleSignInManager : MonoBehaviour SafePlayerPrefs.SetInt("GuestMode", 1); PlayerPrefs.Save(); - googleSignInButton.gameObject.SetActive(false); guestLoginButton.gameObject.SetActive(false); PlayFabSettings.staticSettings.TitleId = GameConstants.PlayfabTitleId; @@ -97,7 +72,6 @@ public class GoogleSignInManager : MonoBehaviour error => { Debug.LogError("❌ Guest PlayFab login failed: " + error.GenerateErrorReport()); - googleSignInButton.gameObject.SetActive(true); guestLoginButton.gameObject.SetActive(true); }); } @@ -108,55 +82,10 @@ public class GoogleSignInManager : MonoBehaviour PlayerPrefs.DeleteAll(); PlayerPrefs.Save(); - googleSignInButton.interactable = false; guestLoginButton.interactable = false; - GoogleSignIn.DefaultInstance.SignIn().ContinueWith(OnGoogleSignIn); - } - - private void OnGoogleSignIn(Task task) - { - if (task.IsFaulted || task.IsCanceled) - { - Debug.LogError("Google Sign-In failed: " + task.Exception); - - googleSignInButton.gameObject.SetActive(true); - googleSignInButton.interactable = true; - - guestLoginButton.gameObject.SetActive(true); - guestLoginButton.interactable = true; - return; - } - - GoogleSignInUser user = task.Result; - string authCode = user.AuthCode; - Console.WriteLine($"[GoogleSignInManager]: authCode: " + authCode); - SafePlayerPrefs.SetString("GoogleAuthCode", authCode); - PlayerPrefs.Save(); - - LoginToPlayFab(authCode); } - - private void SignInSilently() - { - Debug.Log("Attempting Google Silent Sign-In..."); - - string storedAuthCode = PlayerPrefs.GetString("GoogleAuthCode"); - if (string.IsNullOrEmpty(storedAuthCode)) - { - Debug.LogWarning("No stored auth code found. Redirecting to Google Sign-In..."); - googleSignInButton.gameObject.SetActive(true); - googleSignInButton.interactable = true; - guestLoginButton.gameObject.SetActive(true); - guestLoginButton.interactable = true; - SignInWithGoogle(); - return; - } - - Debug.Log("[Silent Sign-In] Using stored auth code."); - LoginToPlayFab(storedAuthCode); - } - + private void LoginToPlayFab(string authCode) { PlayFabSettings.staticSettings.TitleId = GameConstants.PlayfabTitleId; @@ -182,7 +111,6 @@ public class GoogleSignInManager : MonoBehaviour LoadPlayerPrefsFromPlayFab(() => { - googleSignInButton.gameObject.SetActive(false); guestLoginButton.gameObject.SetActive(false); bootstrapper.StartGame(); }); @@ -219,10 +147,7 @@ public class GoogleSignInManager : MonoBehaviour private void OnPlayFabLoginFailure(PlayFabError error) { Debug.LogError("❌ PlayFab Login Failed: " + error.GenerateErrorReport()); - - googleSignInButton.gameObject.SetActive(true); - googleSignInButton.interactable = true; - + guestLoginButton.gameObject.SetActive(true); guestLoginButton.interactable = true; } @@ -298,15 +223,12 @@ public class GoogleSignInManager : MonoBehaviour PlayerPrefs.Save(); // 3) Sign out of Google - GoogleSignIn.DefaultInstance.SignOut(); // 4) Unlink OneSignal from this user OneSignal.Logout(); // 5) Bring back your login buttons - googleSignInButton.gameObject.SetActive(true); guestLoginButton.gameObject.SetActive(true); - googleSignInButton.interactable = true; guestLoginButton.interactable = true; Debug.Log("✅ User fully signed out."); diff --git a/Assets/PipeOut/Scenes/Loading.unity b/Assets/PipeOut/Scenes/Loading.unity index 93e7c727..6a7ad541 100644 --- a/Assets/PipeOut/Scenes/Loading.unity +++ b/Assets/PipeOut/Scenes/Loading.unity @@ -152,7 +152,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: bootstrapper: {fileID: 1407567916} - googleSignInButton: {fileID: 1119814872} guestLoginButton: {fileID: 843293979} --- !u!4 &11358293 Transform: @@ -169,53 +168,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!21 &79986214 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: 2DxFX/Standard/Shiny_Reflect - m_Shader: {fileID: 4800000, guid: 6fc94ae14d17d3642b09718b5b932fd2, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex2: - m_Texture: {fileID: 2800000, guid: 6ed1aafd335608e48aa3198044a161df, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Alpha: 0 - - _ColorMask: 15 - - _Distortion: 0.6972395 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _Value2: 0.5 - - _Value3: 1 - - _Value4: 0 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] --- !u!1 &83133762 GameObject: m_ObjectHideFlags: 0 @@ -349,7 +301,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Guest Login + m_text: Play m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, @@ -911,7 +863,6 @@ RectTransform: - {fileID: 83133763} - {fileID: 1304068013} - {fileID: 843293978} - - {fileID: 1119814871} m_Father: {fileID: 408891932} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -2410,126 +2361,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 843293977} m_CullTransparentMesh: 1 ---- !u!1 &1119814870 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1119814871} - - component: {fileID: 1119814874} - - component: {fileID: 1119814873} - - component: {fileID: 1119814872} - m_Layer: 5 - m_Name: GoogleSignInButton - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1119814871 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1119814870} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 439213424} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 430} - m_SizeDelta: {x: 388.9806, y: 88.9099} - m_Pivot: {x: 0.5, y: 0} ---- !u!114 &1119814872 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1119814870} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1119814873} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &1119814873 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1119814870} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2d53a66c391dadc4b8ad1347e8c7682f, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1119814874 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1119814870} - m_CullTransparentMesh: 1 --- !u!1 &1133943486 GameObject: m_ObjectHideFlags: 0 @@ -2800,7 +2631,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 79986214} + m_Material: {fileID: 1735102579} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -3198,6 +3029,53 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -81.76999} m_SizeDelta: {x: 0, y: -163.55} m_Pivot: {x: 0.5, y: 0.5} +--- !u!21 &1735102579 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: 2DxFX/Standard/Shiny_Reflect + m_Shader: {fileID: 4800000, guid: 6fc94ae14d17d3642b09718b5b932fd2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex2: + m_Texture: {fileID: 2800000, guid: 6ed1aafd335608e48aa3198044a161df, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Alpha: 0 + - _ColorMask: 15 + - _Distortion: 0.26489937 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _Value2: 0.5 + - _Value3: 1 + - _Value4: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!1 &1797903891 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Plugins/iOS/GoogleSignIn.meta b/Assets/Plugins/iOS/GoogleSignIn.meta deleted file mode 100644 index c4ea38dc..00000000 --- a/Assets/Plugins/iOS/GoogleSignIn.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 07c86a3f84f494e589218ed67d10255a -folderAsset: yes -timeCreated: 1490995894 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/iOS/GoogleSignIn/.DS_Store b/Assets/Plugins/iOS/GoogleSignIn/.DS_Store deleted file mode 100644 index 5008ddfc..00000000 Binary files a/Assets/Plugins/iOS/GoogleSignIn/.DS_Store and /dev/null differ diff --git a/Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.mm b/Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.mm deleted file mode 100644 index e82393a1..00000000 --- a/Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.mm +++ /dev/null @@ -1,328 +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.h" -#import -#import -#import -#import -#import - -#import - -// These values are in the Unity plugin code. The iOS specific -// codes are mapped to these. -static const int kStatusCodeSuccessCached = -1; -static const int kStatusCodeSuccess = 0; -static const int kStatusCodeApiNotConnected = 1; -static const int kStatusCodeCanceled = 2; -static const int kStatusCodeInterrupted = 3; -static const int kStatusCodeInvalidAccount = 4; -static const int kStatusCodeTimeout = 5; -static const int kStatusCodeDeveloperError = 6; -static const int kStatusCodeInternalError = 7; -static const int kStatusCodeNetworkError = 8; -static const int kStatusCodeError = 9; - -static NSString *cachedLoginHint = nil; -static NSArray *cachedAdditionalScopes = nil; - -/** - * Helper method to pause the Unity player. This is done when showing any UI. - */ -void UnpauseUnityPlayer() { - dispatch_async(dispatch_get_main_queue(), ^{ - if (UnityIsPaused() > 0) { - UnityPause(0); - } - }); -} - -// result for pending operation. Access to this should be protected using the -// resultLock. -struct SignInResult { - int result_code; - bool finished; - GIDGoogleUser *user; - NSString *serverAuthCode; -}; - -std::unique_ptr currentResult_; - -NSRecursiveLock *resultLock = [NSRecursiveLock alloc]; - -/** - * These are the external "C" methods that are imported by the Unity C# code. - * The parameters are intended to be primative, easy to marshall. - */ -extern "C" { -/** - * This method does nothing in the iOS implementation. It is here - * to make the API uniform between Android and iOS. - */ -void *GoogleSignIn_Create(void *data) { return NULL; } - -void GoogleSignIn_EnableDebugLogging(void *unused, bool flag) { - if (flag) { - NSLog(@"GoogleSignIn: No optional logging available on iOS"); - } -} - -/** - * Configures the GIDSignIn instance. The first parameter is unused in iOS. - * It is here to make the API between Android and iOS uniform. - */ -bool GoogleSignIn_Configure(void *unused, bool useGameSignIn, - const char *webClientId, bool requestAuthCode, - bool forceTokenRefresh, bool requestEmail, - bool requestIdToken, bool hidePopups, - const char **additionalScopes, int scopeCount, - const char *accountName) { - - int scopeSize = scopeCount; - - if (scopeSize) { - NSMutableArray *tmpary = - [[NSMutableArray alloc] initWithCapacity:scopeSize]; - for (int i = 0; i < scopeCount; i++) { - [tmpary addObject:[NSString stringWithUTF8String:additionalScopes[i]]]; - } - - cachedAdditionalScopes = tmpary; - } - - if (accountName) { - cachedLoginHint = [NSString stringWithUTF8String:accountName]; - } - - return !useGameSignIn; -} - -/** - Starts the sign-in process. Returns and error result if error, null otherwise. - */ -static SignInResult *startSignIn() { - bool busy = false; - [resultLock lock]; - if (!currentResult_ || currentResult_->finished) { - currentResult_.reset(new SignInResult()); - currentResult_->result_code = 0; - currentResult_->finished = false; - currentResult_->user = nil; - currentResult_->serverAuthCode = nil; - } else { - busy = true; - } - [resultLock unlock]; - - if (busy) { - NSLog(@"ERROR: There is already a pending sign-in operation."); - // Returned to the caller, should be deleted by calling - // GoogleSignIn_DisposeFuture(). - return new SignInResult{.result_code = kStatusCodeDeveloperError, - .finished = true}; - } - 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(_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. - */ -void *GoogleSignIn_SignIn() { - SignInResult *result = startSignIn(); - if (!result) { - [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(); - } - return result; -} - -/** - * Attempt a silent sign-in. Return value is the pointer to the currentResult - * object. - */ -void *GoogleSignIn_SignInSilently() { - SignInResult *result = startSignIn(); - if (!result) { - [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(); - } - return result; -} - -void GoogleSignIn_Signout() { - GIDSignIn *signIn = GIDSignIn.sharedInstance; - [signIn signOut]; -} - -void GoogleSignIn_Disconnect() { - GIDSignIn *signIn = GIDSignIn.sharedInstance; - // 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) { - volatile bool ret; - [resultLock lock]; - ret = !result->finished; - [resultLock unlock]; - return ret; -} - -SignInResult *GoogleSignIn_Result(SignInResult *result) { - if (result && result->finished) { - return result; - } - return nullptr; -} - -int GoogleSignIn_Status(SignInResult *result) { - if (result) { - return result->result_code; - } - return kStatusCodeDeveloperError; -} - -void GoogleSignIn_DisposeFuture(SignInResult *result) { - if (result == currentResult_.get()) { - currentResult_.reset(nullptr); - } else { - delete result; - } -} - -/** - * Private helper function to copy NSString to char*. If the destination is - * non-null, the contents of src are copied up to len bytes (using strncpy). The - * then len is returned. Otherwise returns length of the string to copy + 1. - */ -static size_t CopyNSString(NSString *src, char *dest, size_t len) { - if (dest && src && len) { - const char *string = [src UTF8String]; - strncpy(dest, string, len); - return len; - } - return src ? src.length + 1 : 0; -} - -size_t GoogleSignIn_GetServerAuthCode(SignInResult *gresult, char *buf, - size_t len) { - NSString *val = gresult->serverAuthCode; - return CopyNSString(val, buf, len); -} - -size_t GoogleSignIn_GetDisplayName(SignInResult *gresult, char *buf, - size_t len) { - NSString *val = [gresult->user.profile name]; - return CopyNSString(val, buf, len); -} - -size_t GoogleSignIn_GetEmail(SignInResult *gresult, char *buf, size_t len) { - NSString *val = [gresult->user.profile email]; - return CopyNSString(val, buf, len); -} - -size_t GoogleSignIn_GetFamilyName(SignInResult *gresult, char *buf, size_t len) { - NSString *val = [gresult->user.profile familyName]; - return CopyNSString(val, buf, len); -} - -size_t GoogleSignIn_GetGivenName(SignInResult *gresult, char *buf, size_t len) { - NSString *val = [gresult->user.profile givenName]; - return CopyNSString(val, buf, len); -} - -size_t GoogleSignIn_GetIdToken(SignInResult *gresult, char *buf, size_t len) { - NSString *val = [gresult->user.idToken tokenString]; - return CopyNSString(val, buf, len); -} - -size_t GoogleSignIn_GetImageUrl(SignInResult *gresult, char *buf, size_t len) { - NSURL *url = [gresult->user.profile imageURLWithDimension:128]; - NSString *val = url ? [url absoluteString] : nullptr; - return CopyNSString(val, buf, len); -} - -size_t GoogleSignIn_GetUserId(SignInResult *gresult, char *buf, size_t len) { - NSString *val = [gresult->user userID]; - return CopyNSString(val, buf, len); -} -} // extern "C" diff --git a/Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.mm.meta b/Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.mm.meta deleted file mode 100644 index d33a9650..00000000 --- a/Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.mm.meta +++ /dev/null @@ -1,35 +0,0 @@ -fileFormatVersion: 2 -guid: 521784ee6b2184e0e947a8fd1508afbc -labels: -- gvh -timeCreated: 1510357716 -licenseType: Pro -PluginImporter: - serializedVersion: 2 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - isOverridable: 0 - platformData: - data: - first: - Any: - second: - enabled: 0 - settings: {} - data: - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - data: - first: - iPhone: iOS - second: - enabled: 1 - settings: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.h b/Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.h deleted file mode 100644 index 97fdef8e..00000000 --- a/Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.h +++ /dev/null @@ -1,37 +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.h" -#import - -// Controller to handle Google SignIn. The AppController methods are swizzled -// into the UnityAppController in order to avoid breaking other code that needs -// to handle these messages also. -@interface UnityAppController (GoogleSignInAppController) -// These are the implementations for GSI. The signatures match the -// AppController methods. -- (BOOL)application:(UIApplication *)application - didFinishLaunchingWithOptions:(NSDictionary *)launchOptions; - -- (BOOL)application:(UIApplication *)application - openURL:(NSURL *)url - options:(NSDictionary *)options; - -- (BOOL)application:(UIApplication *)application - openURL:(NSURL *)url - sourceApplication:(NSString *)sourceApplication - annotation:(id)annotation; - -@end diff --git a/Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.h.meta b/Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.h.meta deleted file mode 100644 index fc4d5558..00000000 --- a/Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.h.meta +++ /dev/null @@ -1,26 +0,0 @@ -fileFormatVersion: 2 -guid: ce40e3e7b37a54617a4683dfc0479c71 -labels: -- gvh -timeCreated: 1490998272 -licenseType: Pro -PluginImporter: - serializedVersion: 1 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - isOverridable: 0 - platformData: - Any: - enabled: 0 - settings: {} - Editor: - enabled: 0 - settings: - DefaultValueInitialized: true - iOS: - enabled: 1 - settings: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.mm b/Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.mm deleted file mode 100644 index cd56042f..00000000 --- a/Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.mm +++ /dev/null @@ -1,113 +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 "GoogleSignInAppController.h" -#import -#import -#import - -/* - * Create a category to customize the application. When this is loaded the - * method for the existing application and GoogleSignIn are swizzled into the - * other's class selector. Then we call our "own" msthod which is actually the - * original application's implementation. See more info at: - * https://developer.apple.com/library/content/documentation/Cocoa/Conceptual/ProgrammingWithObjectiveC/CustomizingExistingClasses/CustomizingExistingClasses.html - */ - -@implementation UnityAppController (GoogleSignInController) - -/* - Called when the category is loaded. This is where the methods are swizzled - out. - */ -+ (void)load { - Method original; - Method swizzled; - - original = class_getInstanceMethod( - self, @selector(application:didFinishLaunchingWithOptions:)); - swizzled = class_getInstanceMethod( - self, - @selector(GoogleSignInAppController:didFinishLaunchingWithOptions:)); - method_exchangeImplementations(original, swizzled); - - original = class_getInstanceMethod( - self, @selector(application:openURL:sourceApplication:annotation:)); - swizzled = class_getInstanceMethod( - self, @selector - (GoogleSignInAppController:openURL:sourceApplication:annotation:)); - method_exchangeImplementations(original, swizzled); - - original = - class_getInstanceMethod(self, @selector(application:openURL:options:)); - swizzled = class_getInstanceMethod( - self, @selector(GoogleSignInAppController:openURL:options:)); - method_exchangeImplementations(original, swizzled); -} - -- (BOOL)GoogleSignInAppController:(UIApplication *)application - didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - - // IMPORTANT: IF you are not supplying a GoogleService-Info.plist in your - // project that contains the client id, you need to set the client id here. - - NSString *path = [[NSBundle mainBundle] pathForResource:@"GoogleService-Info" - ofType:@"plist"]; - NSDictionary *dict = [NSDictionary dictionaryWithContentsOfFile:path]; - NSString *clientId = [dict objectForKey:@"CLIENT_ID"]; - NSString *serverClientID = [dict objectForKey:@"SERVER_CLIENT_ID"]; - - // Setup the Sign-In instance. - GIDConfiguration *config = [[GIDConfiguration alloc] initWithClientID:clientId serverClientID:serverClientID]; - [GIDSignIn.sharedInstance setConfiguration:config]; - - // looks like it's just calling itself, but the implementations were swapped - // so we're actually calling the original once we're done - return [self GoogleSignInAppController:application - didFinishLaunchingWithOptions:launchOptions]; -} - -/** - * Handle the auth URL - */ -- (BOOL)GoogleSignInAppController:(UIApplication *)application - openURL:(NSURL *)url - sourceApplication:(NSString *)sourceApplication - annotation:(id)annotation { - BOOL handled = [self GoogleSignInAppController:application - openURL:url - sourceApplication:sourceApplication - annotation:annotation]; - - return [GIDSignIn.sharedInstance handleURL:url] || - handled; -} - -/** - * Handle the auth URL. - */ -- (BOOL)GoogleSignInAppController:(UIApplication *)app - openURL:(NSURL *)url - options:(NSDictionary *)options { - - BOOL handled = - [self GoogleSignInAppController:app openURL:url options:options]; - - return [GIDSignIn.sharedInstance handleURL:url] || - handled; -} - -@end diff --git a/Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.mm.meta b/Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.mm.meta deleted file mode 100644 index 8e0a46a3..00000000 --- a/Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.mm.meta +++ /dev/null @@ -1,26 +0,0 @@ -fileFormatVersion: 2 -guid: 50b2e1c9319e4446e9dbd9b183790472 -labels: -- gvh -timeCreated: 1490998272 -licenseType: Pro -PluginImporter: - serializedVersion: 1 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - isOverridable: 0 - platformData: - Any: - enabled: 0 - settings: {} - Editor: - enabled: 0 - settings: - DefaultValueInitialized: true - iOS: - enabled: 1 - settings: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/HomeScene.cs b/Assets/Scripts/HomeScene.cs index 38b53fbf..c42b5220 100644 --- a/Assets/Scripts/HomeScene.cs +++ b/Assets/Scripts/HomeScene.cs @@ -15,7 +15,6 @@ U should buy the asset from home store if u use it in your project! using MS; using System.Collections.Generic; using DG.Tweening; -using Google; using OneSignalSDK; using PlayFab; using PlayFab.ClientModels; @@ -431,7 +430,6 @@ public class HomeScene : MonoBehaviour PlayerPrefs.Save(); // 3) Sign out of Google - GoogleSignIn.DefaultInstance.SignOut(); // 4) Unlink OneSignal from this user OneSignal.Logout(); diff --git a/Assets/Scripts/TimerManager.cs b/Assets/Scripts/TimerManager.cs index 5a24bb8e..90b2d283 100644 --- a/Assets/Scripts/TimerManager.cs +++ b/Assets/Scripts/TimerManager.cs @@ -1,4 +1,3 @@ -using Google.Impl; using System; using TMPro; using UnityEngine; diff --git a/Assets/Scripts/Top10RankChecker.cs b/Assets/Scripts/Top10RankChecker.cs index 34124985..e0a8c1bc 100644 --- a/Assets/Scripts/Top10RankChecker.cs +++ b/Assets/Scripts/Top10RankChecker.cs @@ -1,7 +1,6 @@ using UnityEngine; using PlayFab; using PlayFab.ClientModels; -using Google.Impl; using MS; using TMPro; // Required for TextMeshPro using System;