Skip to content

[App Check] Preliminary test of App Check 12 (Swift implementation) integration #626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
paulb777 wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

[App Check] Preliminary test of App Check 12 (Swift implementation) integration #626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
27a2305
fix test
paulb777 Aug 21, 2026
aedfc76
Fix isPrepared logic in GIDAppCheck to check error instead of token
paulb777 Aug 21, 2026
239b0de
podspec testing
paulb777 Aug 21, 2026
82b7331
Address code review findings in GIDAppCheck
paulb777 Aug 22, 2026
3147ebb
appcheck 12 is now released
ncooke3 Sep 24, 2026
088b8f8
will revert: fix ci
ncooke3 Sep 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/unit_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
# See #400 (https://github.com/google/GoogleSignIn-iOS/issues/400)
run: |
pod lib lint ${{ matrix.podspec }} --verbose \
${{ matrix.includePodspecFlag }} ${{ matrix.flag }}
${{ matrix.includePodspecFlag }} ${{ matrix.flag }} --sources=https://github.com/firebase/SpecsDev.git,https://github.com/firebase/SpecsStaging.git,https://cdn.cocoapods.org/
spm-build-test:
runs-on: ${{ matrix.os }}
strategy:
Expand Down
2 changes: 1 addition & 1 deletion GoogleSignIn.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ The Google Sign-In SDK allows users to sign in with their Google account from th
]
s.ios.framework = 'UIKit'
s.osx.framework = 'AppKit'
s.dependency 'AppCheckCore', '~> 11.0'
s.dependency 'AppCheckCore', '~> 12.0'

@ncooke3 ncooke3 Sep 24, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Before merging. Revert so CocoaPods is only compatible with AppCheckCore 11.x

Suggested change
s.dependency 'AppCheckCore', '~> 12.0'
s.dependency 'AppCheckCore', '~> 11.0'

s.dependency 'AppAuth', '~> 3.0'
s.dependency 'GTMAppAuth', '~> 6.0'
s.dependency 'GTMSessionFetcher/Core', '>= 3.3', '< 6.0'
Expand Down
2 changes: 1 addition & 1 deletion GoogleSignIn/Sources/GIDAppCheck/Implementations/Fake/GIDAppCheckProviderFake.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#import <Foundation/Foundation.h>

#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
#import <AppCheckCore/GACAppCheckProvider.h>
@import AppCheckCore;

@ncooke3 ncooke3 Aug 25, 2026 •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To investigate more:

Suggested change
@import AppCheckCore;
#if __has_include(<AppCheckCore/GACAppCheckProvider.h>)
#import <AppCheckCore/GACAppCheckProvider.h> // Supports AppCheck v11
#else
@import AppCheckCore; // Supports AppCheck v12
#endif // __has_include(<AppCheckCore/GACAppCheckProvider.h>)

@paulb777 paulb777 Sep 4, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As long as we stick to SPM, @import AppCheckCore; works fine with both AppCheck 11 and 12.


@class GACAppCheckToken;

Expand Down
2 changes: 1 addition & 1 deletion GoogleSignIn/Sources/GIDAppCheck/Implementations/Fake/GIDAppCheckProviderFake.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST

#import <AppCheckCore/GACAppCheckToken.h>
@import AppCheckCore;

NSUInteger const kGIDAppCheckProviderFakeError = 1;

Expand Down
16 changes: 3 additions & 13 deletions GoogleSignIn/Sources/GIDAppCheck/Implementations/GIDAppCheck.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,7 @@

#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST

#import <AppCheckCore/GACAppCheck.h>
#import <AppCheckCore/GACAppCheckSettings.h>
#import <AppCheckCore/GACAppCheckTokenResult.h>
#import <AppCheckCore/GACAppAttestProvider.h>
#import <AppCheckCore/GACAppCheckDebugProvider.h>
@import AppCheckCore;

#import "GoogleSignIn/Sources/GIDAppCheck/Implementations/GIDAppCheck.h"
#import "GoogleSignIn/Sources/Public/GoogleSignIn/GIDAppCheckError.h"
Expand Down Expand Up @@ -117,13 +113,7 @@ - (void)prepareForAppCheckWithCompletion:(nullable GIDAppCheckPrepareCompletion)
[self.appCheck limitedUseTokenWithCompletion:^(GACAppCheckTokenResult * _Nonnull result) {
NSError * __block maybeError = result.error;
@synchronized (self) {
if (!result.token && !result.error) {
maybeError = [NSError errorWithDomain:kGIDAppCheckErrorDomain
code:kGIDAppCheckUnexpectedError
userInfo:nil];
}

if (result.token) {
if (!result.error) {
[self.userDefaults setBool:YES forKey:kGIDAppCheckPreparedKey];
}

Expand All @@ -143,7 +133,7 @@ - (void)prepareForAppCheckWithCompletion:(nullable GIDAppCheckPrepareCompletion)
- (void)getLimitedUseTokenWithCompletion:(nullable GIDAppCheckTokenCompletion)completion {
dispatch_async(self.workerQueue, ^{
[self.appCheck limitedUseTokenWithCompletion:^(GACAppCheckTokenResult * _Nonnull result) {
if (result.token) {
if (!result.error) {
[self.userDefaults setBool:YES forKey:kGIDAppCheckPreparedKey];
}
if (completion) {
Expand Down
2 changes: 1 addition & 1 deletion GoogleSignIn/Sources/GIDSignIn.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#import "GoogleSignIn/Sources/GIDSignInCallbackSchemes.h"
#import "GoogleSignIn/Sources/GIDClaimsInternalOptions.h"
#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
#import <AppCheckCore/GACAppCheckToken.h>
@import AppCheckCore;
#import "GoogleSignIn/Sources/GIDAppCheck/Implementations/GIDAppCheck.h"
#import "GoogleSignIn/Sources/GIDAppCheck/UI/GIDActivityIndicatorViewController.h"
#import "GoogleSignIn/Sources/GIDEMMErrorHandler.h"
Expand Down
2 changes: 1 addition & 1 deletion GoogleSignIn/Tests/Unit/GIDAppCheckTest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST

#import <XCTest/XCTest.h>
#import <AppCheckCore/GACAppCheckToken.h>
@import AppCheckCore;
#import "GoogleSignIn/Sources/GIDAppCheck/Implementations/GIDAppCheck.h"
#import "GoogleSignIn/Sources/GIDAppCheck/Implementations/Fake/GIDAppCheckProviderFake.h"
#import "GoogleSignIn/Sources/Public/GoogleSignIn/GIDAppCheckError.h"
Expand Down
7 changes: 5 additions & 2 deletions GoogleSignIn/Tests/Unit/GIDSignInTest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#import "GoogleSignIn/Sources/GIDClaimsInternalOptions.h"

#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
#import <AppCheckCore/GACAppCheckToken.h>
@import AppCheckCore;
#import "GoogleSignIn/Sources/GIDAppCheck/Implementations/GIDAppCheck.h"
#import "GoogleSignIn/Sources/GIDAppCheck/Implementations/Fake/GIDAppCheckProviderFake.h"
#import "GoogleSignIn/Sources/GIDEMMErrorHandler.h"
Expand Down Expand Up @@ -426,8 +426,11 @@ - (void)testConfigureFailsNoTokenOrError {
XCTestExpectation *configureFailsExpecation =
[self expectationWithDescription:@"Configure fails expectation"];

NSError *expectedError = [NSError errorWithDomain:kGIDAppCheckErrorDomain
code:kGIDAppCheckUnexpectedError
userInfo:nil];
GIDAppCheckProviderFake *fakeProvider =
[[GIDAppCheckProviderFake alloc] initWithAppCheckToken:nil error:nil];
[[GIDAppCheckProviderFake alloc] initWithAppCheckToken:nil error:expectedError];
GIDAppCheck *appCheck =
[[GIDAppCheck alloc] initWithAppCheckProvider:fakeProvider
userDefaults:_testUserDefaults];
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ let package = Package(
from: "3.0.0"),
.package(
url: "https://github.com/google/app-check.git",
from: "11.0.0"),
"11.0.0" ..< "13.0.0"),
.package(
url: "https://github.com/google/GTMAppAuth.git",
from: "6.0.0"),
Expand Down
3 changes: 3 additions & 0 deletions Samples/ObjC/SignInSample/Podfile
View file
Open in desktop

@ncooke3 ncooke3 Sep 24, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Revert when ready to merge

Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
source 'https://github.com/firebase/SpecsStaging.git'
source 'https://cdn.cocoapods.org/'

platform :ios, '15.0'
use_frameworks!

Expand Down
Loading