Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
214 commits
Select commit Hold shift + click to select a range
a3a88f5
FirebaseInstallations initial podspec (#3122)
maksymmalyhin May 31, 2019
aa7b6c6
Merge remote-tracking branch 'refs/remotes/origin/master'
maksymmalyhin Jun 3, 2019
40537a9
Basic Keychain storage (#3127)
maksymmalyhin Jun 4, 2019
2ee5cb8
Merge branch 'master' into mm/fis-master
maksymmalyhin Jun 5, 2019
422f5c4
FIS Public API (#3135)
maksymmalyhin Jun 5, 2019
a212ef5
Merge branch 'master' into mm/fis-master
maksymmalyhin Jun 5, 2019
ef26aa2
FIRInstallationsStore implementation and tests (#3149)
maksymmalyhin Jun 6, 2019
ee174c1
Merge branch 'master' into mm/fis-master
maksymmalyhin Jun 7, 2019
1634314
Squashed commit of the following:
maksymmalyhin Jun 7, 2019
7727770
FIRInstallationsAPIService file
maksymmalyhin Jun 7, 2019
f568326
Local FID generating (#3157)
maksymmalyhin Jun 7, 2019
020c6ba
APIKey parameter added.
maksymmalyhin Jun 7, 2019
0389291
[WIP] FIRInstallationsAPIService
maksymmalyhin Jun 7, 2019
a390201
Merge branch 'mm/fis-master' into mm/fis-api
maksymmalyhin Jun 7, 2019
65eb0b4
[WIP] FIRInstallationsAPIService
maksymmalyhin Jun 7, 2019
93d789b
Register FID api draft
maksymmalyhin Jun 10, 2019
8787d70
./scripts/style.sh
maksymmalyhin Jun 10, 2019
5a1ad08
FIRInstallationsAPIServiceTests introduced
maksymmalyhin Jun 10, 2019
6378b37
FIRInstallationsIDController TODO
maksymmalyhin Jun 10, 2019
a48187d
FIRInstallationsAPIServiceTests - validate request params
maksymmalyhin Jun 10, 2019
8cd4e6c
FIRInstallationsAPIService API docs
maksymmalyhin Jun 10, 2019
339d5bb
FIRInstallationsAPIService cleanup
maksymmalyhin Jun 10, 2019
ef17add
Add function name prefix to avoid possible name collisions.
maksymmalyhin Jun 10, 2019
7463e44
Trailing whitespace
maksymmalyhin Jun 10, 2019
a5b593f
FIRInstallationsItem (RegisterInstallationAPI) API doc.
maksymmalyhin Jun 10, 2019
33d3c08
FIRInstallationsAPIService integration [WIP]
maksymmalyhin Jun 10, 2019
3b0eba4
Claenup
maksymmalyhin Jun 10, 2019
19c8ede
Merge branch 'mm/fis-api' into mm/fis-fid-reg
maksymmalyhin Jun 10, 2019
1154b8d
FIRInstallations - store FIROptions to get access to required Firebas…
maksymmalyhin Jun 10, 2019
853428c
FIRInstallationsAPIService integration draft.
maksymmalyhin Jun 10, 2019
5cb2fd3
FIRInstallationsIDControllerTests - verify installation registration.
maksymmalyhin Jun 11, 2019
328907e
./scripts/style.sh
maksymmalyhin Jun 11, 2019
a993ea0
Integration tests target added
maksymmalyhin Jun 11, 2019
0eaf694
Add Plist to the integration tests
maksymmalyhin Jun 11, 2019
310a0ba
Get FID integration test
maksymmalyhin Jun 11, 2019
aecce73
Timeouts
maksymmalyhin Jun 11, 2019
74da9ec
Merge remote-tracking branch 'origin/master' into mm/fis-master
maksymmalyhin Jun 11, 2019
16c575a
NSSecureCoding implementation for FIRInstallationsStoredAuthToken and…
maksymmalyhin Jun 11, 2019
9055db9
Run ./scripts/style.sh
maksymmalyhin Jun 11, 2019
cd82495
#readability "url" -> "URL"
maksymmalyhin Jun 12, 2019
0b5874a
"api" -> "API"
maksymmalyhin Jun 12, 2019
25e0bda
Merge branch 'mm/fis-api' into mm/fis-master
maksymmalyhin Jun 13, 2019
ef0708a
Merge branch 'mm/fis-master' into mm/fis-fid-reg
maksymmalyhin Jun 13, 2019
613b96b
idController -> IDController
maksymmalyhin Jun 13, 2019
c61c388
Merge branch 'master' into mm/fis-master
maksymmalyhin Jun 13, 2019
eb5f4e3
Merge branch 'mm/fis-master' into mm/fis-fid-reg
maksymmalyhin Jun 13, 2019
d848625
Merge branch 'mm/fis-master' into mm/fis-coding
maksymmalyhin Jun 13, 2019
c5d7211
Merge branch 'mm/fis-master' into mm/fis-itests
maksymmalyhin Jun 13, 2019
b9ee70d
Temporary disable integration tests.
maksymmalyhin Jun 13, 2019
f08eb40
./scripts/style.sh
maksymmalyhin Jun 13, 2019
ffbeb0a
Generate Token API draft
maksymmalyhin Jun 13, 2019
e7c381b
FIRInstallationsAPIServiceTests refresh auth token rests
maksymmalyhin Jun 14, 2019
74256fb
Move tests to proper directory
maksymmalyhin Jun 14, 2019
7f09bbc
[WIP] FIRInstallationsIDController get auth token
maksymmalyhin Jun 14, 2019
0b16f50
Merge branch 'master' into mm/fis-master
maksymmalyhin Jun 14, 2019
e4a6522
Merge branch 'mm/fis-master' into mm/fis-auth-token
maksymmalyhin Jun 14, 2019
2b1e418
[WIP] Get Auth Token sequence
maksymmalyhin Jun 14, 2019
cada0cf
FIRInstallations - auth token + tests [WIP]
maksymmalyhin Jun 14, 2019
3ff0b0a
FIRInstallations auth token unit tests
maksymmalyhin Jun 14, 2019
f09582d
Auth token tests and fixes.
maksymmalyhin Jun 14, 2019
71a7fb5
Safely handle URL session potential nil-data response
maksymmalyhin Jun 17, 2019
67e5fde
Merge branch 'master' into mm/fis-master
maksymmalyhin Jun 17, 2019
c73b1ed
Auth token multi-request tests added
maksymmalyhin Jun 17, 2019
d5f7a1a
Make sure there is only one request FID or auth token at a time, no m…
maksymmalyhin Jun 17, 2019
bc8474b
Delete Installation API and some test
maksymmalyhin Jun 18, 2019
68b94f6
Delete Installation API implementation and tests
maksymmalyhin Jun 18, 2019
cf09471
Renaming factory->newOperationHandler
maksymmalyhin Jun 18, 2019
34dfea4
Merge branch 'master' into mm/fis-master
maksymmalyhin Jun 18, 2019
b8dd3d2
Merge branch 'mm/fis-master' into mm/fis-rm
maksymmalyhin Jun 18, 2019
bedb95e
FIRInstallationsIDController - delete installation implementation and…
maksymmalyhin Jun 18, 2019
71ed132
FIRInstallations - use FIRInstallationsIDController to delete install…
maksymmalyhin Jun 18, 2019
8e6f3ef
Run ./scripts/style.sh
maksymmalyhin Jun 18, 2019
d0f7051
Typo
maksymmalyhin Jun 19, 2019
e58ca92
Code style
maksymmalyhin Jun 19, 2019
baed873
Integration tests [WIP]
maksymmalyhin Jun 19, 2019
6d8c59a
FID - replace URL unsafe symbols in Base 64 encoded string.
maksymmalyhin Jun 19, 2019
8835e62
API - add refresh token to authorize requests.
maksymmalyhin Jun 19, 2019
fcd2843
Fix "registerInstallationIfNeeded" method return value.
maksymmalyhin Jun 19, 2019
17c3f61
Basic integration tests
maksymmalyhin Jun 19, 2019
a87ad29
Unit tests updated.
maksymmalyhin Jun 19, 2019
83efc90
Fix auth token request
maksymmalyhin Jun 19, 2019
1a2a17c
Cleanup
maksymmalyhin Jun 19, 2019
2ea59ef
Temporary disable integration tests.
maksymmalyhin Jun 19, 2019
d5aae64
./scripts/style.sh
maksymmalyhin Jun 19, 2019
1cec8bc
FIRSecureStorage - in-memory cache implementation.
maksymmalyhin Jun 20, 2019
9db6288
FIRSecureStorage in-memory cache tests
maksymmalyhin Jun 20, 2019
1cd08a4
Tests
maksymmalyhin Jun 20, 2019
ea32f8e
Typo and GCD queues names
maksymmalyhin Jun 21, 2019
e8995ed
FIRInstallationsIIDStore introduced + basic tests
maksymmalyhin Jun 21, 2019
019a3b2
Tests - lock minor version of FirebaseInstanceID
maksymmalyhin Jun 21, 2019
babd3df
Merge branch 'master' into mm/fis-master
maksymmalyhin Jun 21, 2019
b9bd661
Merge branch 'mm/fis-cache' into mm/fis-master
maksymmalyhin Jun 21, 2019
7edfb5f
Merge branch 'mm/fis-master' into mm/fis-iid-migration
maksymmalyhin Jun 21, 2019
f7917d5
Porting required IID logic [WIP]
maksymmalyhin Jun 21, 2019
0ec60c8
Get existing IID implementation
maksymmalyhin Jun 24, 2019
10872c7
Remove IID [WIP]
maksymmalyhin Jun 24, 2019
857bf90
FIRInstallationsIIDStore deleteExistingIID implementation.
maksymmalyhin Jun 25, 2019
8bbfabd
Comment and formatting.
maksymmalyhin Jun 25, 2019
619cbe2
FIRInstallationsIDController: use FIRInstallationsIIDStore to migrate…
maksymmalyhin Jun 25, 2019
359ea9c
Typo fix.
maksymmalyhin Jun 26, 2019
7f662b4
Merge branch 'master' into mm/fis-master
maksymmalyhin Jun 26, 2019
5c8ed78
Merge branch 'mm/fis-iid-migration' into mm/fis-master
maksymmalyhin Jun 26, 2019
0914102
[WIP] send notification on FID update.
maksymmalyhin Jun 28, 2019
df5f9a5
'Merge branch 'master' into mm/fis-master
maksymmalyhin Jul 4, 2019
5429150
Merge branch 'mm/fis-master' into mm/fis-notification
maksymmalyhin Jul 4, 2019
7ecf553
Tests for FIRInstallationIDDidChangeNotification on delete.
maksymmalyhin Jul 4, 2019
6a934d7
FIRInstallationIDDidChangeNotification on delete implementation.
maksymmalyhin Jul 4, 2019
063ae58
TODO
maksymmalyhin Jul 4, 2019
8acb717
[FIRInstallations installations] implementation and tests.
maksymmalyhin Jul 4, 2019
713de39
Declare FIRInstallationIDDidChangeNotification as NSNotificationName
maksymmalyhin Jul 4, 2019
1310c98
FIRInstallations header docs [WIP]
maksymmalyhin Jul 4, 2019
8349bd5
FIRInstallations API docs.
maksymmalyhin Jul 5, 2019
18b5ee9
FIRInstallationsAuthTokenResult API docs.
maksymmalyhin Jul 5, 2019
8671894
Request auth token each on initialization.
maksymmalyhin Jul 5, 2019
68118f3
FIRInstallationsErrorUtil - some errors updated. [WIP]
maksymmalyhin Jul 5, 2019
e96871a
Docs optimized for Swift and Juzzy. Typos.
maksymmalyhin Jul 5, 2019
6e0d324
Comment.
maksymmalyhin Jul 5, 2019
5b73f91
Cleanup.
maksymmalyhin Jul 5, 2019
193b6e4
Merge branch 'mm/fis-api' into mm/fis-errors
maksymmalyhin Jul 5, 2019
61c2cfe
Make sure only Installations errors can be returned by the public API
maksymmalyhin Jul 5, 2019
dda404d
REST API - set proper "sdkVersion" header.
maksymmalyhin Jul 5, 2019
8ad4c54
Cleanup
maksymmalyhin Jul 5, 2019
c264c4b
Fix tests.
maksymmalyhin Jul 5, 2019
eec5539
Message: FIRApp->FirebaseApp
maksymmalyhin Jul 8, 2019
769e407
Merge branch 'master' into mm/fis-master
maksymmalyhin Jul 8, 2019
6570890
Merge branch 'mm/fis-api' into mm/fis-master
maksymmalyhin Jul 8, 2019
d020631
Merge branch 'mm/fis-autocheckin' into mm/fis-master
maksymmalyhin Jul 8, 2019
1f9b124
Singleton tests - wait for triggered background tasks to complete.
maksymmalyhin Jul 8, 2019
378f146
TODOs
maksymmalyhin Jul 8, 2019
be8e54b
Retry Auth Token request on HTTP 500
maksymmalyhin Jul 8, 2019
238154d
Style and comments.
maksymmalyhin Jul 8, 2019
84ca79c
Merge branch 'mm/fis-master' into mm/fis-errors
maksymmalyhin Jul 8, 2019
1bc7c8c
FIRInstallationsHTTPError introduced to provide more information on t…
maksymmalyhin Jul 9, 2019
5a99b32
Merge branch 'master' into mm/fis-master
maksymmalyhin Jul 11, 2019
4ee40bb
FIRInstallationsHTTPError - add API response content.
maksymmalyhin Jul 11, 2019
412bc93
Typos, comments and cleanup.
maksymmalyhin Jul 11, 2019
cdc28c7
Merge branch 'mm/fis-errors' into mm/fis-errors2
maksymmalyhin Jul 11, 2019
150776b
Keychain tests on macOS [WIP]
maksymmalyhin Jul 12, 2019
d9f15a8
Use a private Keychain for tests on macOS
maksymmalyhin Jul 12, 2019
666b85c
macOS tests fixed.
maksymmalyhin Jul 15, 2019
5b2476e
#import <Security/Security.h>
maksymmalyhin Jul 15, 2019
c9b5917
#if TARGET_OS_OSX
maksymmalyhin Jul 15, 2019
1783e4f
Re-enable macOS tests
maksymmalyhin Jul 15, 2019
f9394df
Run ./scripts/style.sh
maksymmalyhin Jul 15, 2019
bcb8e4a
Travis: disable CDN temporary.
maksymmalyhin Jul 15, 2019
c34373e
Disable CDN.
maksymmalyhin Jul 15, 2019
766706d
Allow warnings for some macOS configurations to bypass "...umbrella h…
maksymmalyhin Jul 15, 2019
27fc769
Merge branch 'master' into mm/fis-master
maksymmalyhin Jul 15, 2019
c5208cb
Merge branch 'mm/fis-master' into mm/fis-errors2
maksymmalyhin Jul 15, 2019
0314f4a
Merge branch 'mm/fis-errors' into mm/fis-master
maksymmalyhin Jul 15, 2019
18da111
Merge branch 'mm/fis-master' into mm/keychain-tests
maksymmalyhin Jul 15, 2019
87a92a4
Merge branch 'mm/fis-master' into mm/fis-errors2
maksymmalyhin Jul 15, 2019
0a20f51
Revert temporary changes.
maksymmalyhin Jul 15, 2019
b4eb0bc
FIRInstallationsHTTPError: NSCopying and NSSecureCoding implementation.
maksymmalyhin Jul 15, 2019
793dfd0
Merge branch 'mm/fis-master' into mm/fis-errors2
maksymmalyhin Jul 15, 2019
9fe20b1
IID: add FirebaseInstallations dependency.
maksymmalyhin Jul 15, 2019
8f6fdc1
TODO
maksymmalyhin Jul 15, 2019
71dcb19
[WIP] InstanceID - use FIRInstallations to manage app identity.
maksymmalyhin Jul 16, 2019
2134d6f
[WIP] InstanceID cleanup: remove FIRInstanceIDKeyPair related code an…
maksymmalyhin Jul 16, 2019
b4ef791
[WIP] Tests updates
maksymmalyhin Jul 16, 2019
f327eeb
[WIP] tests
maksymmalyhin Jul 16, 2019
0827d71
FIRInstanceIDTest fixed
maksymmalyhin Jul 16, 2019
ed8c547
FIRInstanceID: Recover validation of presence of self.installations
maksymmalyhin Jul 16, 2019
f2cb5dc
FIRInstanceIDTokenManagerTest
maksymmalyhin Jul 16, 2019
7ffdb88
Travis: run tests on mm/iid-with-fis
maksymmalyhin Jul 16, 2019
a6a82bd
./scripts/style.sh changes
maksymmalyhin Jul 16, 2019
71b892a
Cleanup.
maksymmalyhin Jul 16, 2019
27c5018
Add FirebaseInstallations to Example Podfiles
maksymmalyhin Jul 16, 2019
e089599
[WIP] Fix Messaging and InAppMessaging tests.
maksymmalyhin Jul 16, 2019
0de9eb6
Tests fix NSUserDefaults -> GULUserDefaults.
maksymmalyhin Jul 17, 2019
520d3ba
FIRMessagingClientTest: stub FIRInstallations.
maksymmalyhin Jul 17, 2019
869f7c3
Fix tests UserDefaults cleanup.
maksymmalyhin Jul 17, 2019
95ee749
Fix tests UserDefaults cleanup.
maksymmalyhin Jul 17, 2019
92bbf6c
Messaging FIRInstanceIDTest: mock FIRInstallations.
maksymmalyhin Jul 17, 2019
90e4a81
Some tests code style.
maksymmalyhin Jul 17, 2019
535e53f
Merge branch 'master' into mm/fis-master
maksymmalyhin Jul 17, 2019
16a73ec
rm unused FIRInstallationsAuthTokenRequestInProgress.
maksymmalyhin Jul 17, 2019
7122eff
typo
maksymmalyhin Jul 17, 2019
e51e862
rm unused method
maksymmalyhin Jul 17, 2019
80d55bb
FIRInstallationsItem API docs
maksymmalyhin Jul 17, 2019
1975348
FIRInstallationsStoredAuthToken API docs.
maksymmalyhin Jul 17, 2019
270a326
Typos and outdated comments.
maksymmalyhin Jul 17, 2019
8817636
FIRInstallationsStoredItem API docs.
maksymmalyhin Jul 17, 2019
0f2ab2f
Move tests with side effects to integration. Typos and outdated TODOs.
maksymmalyhin Jul 17, 2019
189e526
[FIRInstallationsTests testInstallationIDError]: validate error wrapp…
maksymmalyhin Jul 17, 2019
e1936a1
rm outdated TODO.
maksymmalyhin Jul 17, 2019
f5d7cd1
./scripts/style.sh
maksymmalyhin Jul 17, 2019
e609125
Bump FirebaseInstanceID to 4.3.0 in order to IID->FIS migration tests…
maksymmalyhin Jul 17, 2019
a9bb706
Comment.
maksymmalyhin Jul 17, 2019
0aa8b4c
Tests: FIROptions initializer.
maksymmalyhin Jul 17, 2019
1056f0b
Merge branch 'mm/fis-master' into mm/iid-with-fis
maksymmalyhin Jul 17, 2019
f9d2d8c
Travis: remove special rules for mm/fis-master.
maksymmalyhin Jul 17, 2019
024dc1c
Travis: use if_changed for FirebaseInstallations.
maksymmalyhin Jul 17, 2019
c40dac5
Merge branch 'mm/fis-master' into mm/iid-with-fis
maksymmalyhin Jul 18, 2019
ff0e8b9
Merge branch 'mm/fis-integration-master' into mm/iid-with-fis
maksymmalyhin Jul 18, 2019
1009544
Travis: Run tests on fis branches.
maksymmalyhin Jul 18, 2019
c215b66
Merge branch 'mm/fis-integration-master' into mm/iid-with-fis
maksymmalyhin Jul 18, 2019
fe27780
Travis: FirebaseInstallations - don't use local IID for tests
maksymmalyhin Jul 19, 2019
7c2b2f2
Fix pod_lib_lint.rb.
maksymmalyhin Jul 19, 2019
e65777f
Merge branch 'mm/fis-integration-master' into mm/iid-with-fis
maksymmalyhin Jul 19, 2019
6a9872d
Travis: remove temp branch from builds.
maksymmalyhin Jul 19, 2019
05fb134
Update `- [FIRInstanceID appInstanceID:]` and deprecate it.
maksymmalyhin Jul 19, 2019
c7ca7c5
pod deintegrate
maksymmalyhin Jul 19, 2019
560660e
FIRInstanceIDTest: fix imports.
maksymmalyhin Jul 22, 2019
edf8ede
Merge branch 'mm/fis-integration-master' into mm/iid-with-fis
maksymmalyhin Jul 22, 2019
98a341f
Merge branch 'master' into mm/iid-with-fis
maksymmalyhin Jul 23, 2019
e48005c
[WIP] mark a bug in code.
maksymmalyhin Jul 23, 2019
62d0a13
Delete IID tests.
maksymmalyhin Jul 23, 2019
c0c369a
Silent some warnings in tests.
maksymmalyhin Jul 23, 2019
9e7a2ab
Merge branch 'master' into mm/iid-with-fis
maksymmalyhin Jul 24, 2019
2b9ea82
Merge branch 'master' into mm/iid-with-fis
maksymmalyhin Jul 24, 2019
827e49b
Code style.
maksymmalyhin Jul 25, 2019
a4d87b0
Run ./scripts/style.sh
maksymmalyhin Jul 25, 2019
442ab08
Fix tests.
maksymmalyhin Jul 25, 2019
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
Prev Previous commit
Next Next commit
Add function name prefix to avoid possible name collisions.
  • Loading branch information
maksymmalyhin committed Jun 10, 2019
commit ef17add4aa9f3ff02377ba7767d0c247d8296aa5
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#import "FIRInstallationsErrorUtil.h"
#import "FIRInstallationsStoredAuthToken.h"

void FIRSetErrorToPointer(NSError *error, NSError **pointer) {
void FIRInstallationsItemSetErrorToPointer(NSError *error, NSError **pointer) {
if (pointer != NULL) {
*pointer = error;
}
Expand All @@ -39,21 +39,22 @@ - (nullable FIRInstallationsItem *)registeredInstallationWithJSONData:(NSData *)
NSDictionary *responseJSON = [NSJSONSerialization JSONObjectWithData:data options:0 error:&error];

if (responseJSON == nil) {
FIRSetErrorToPointer([FIRInstallationsErrorUtil JSONSerializationError:error], outError);
FIRInstallationsItemSetErrorToPointer([FIRInstallationsErrorUtil JSONSerializationError:error],
outError);
return nil;
}

NSString *refreshToken = [self validStringOrNilForKey:@"refreshToken" fromDict:responseJSON];
if (refreshToken == nil) {
FIRSetErrorToPointer(
FIRInstallationsItemSetErrorToPointer(
[FIRInstallationsErrorUtil FIDRegestrationErrorWithResponseMissingField:@"refreshToken"],
outError);
return nil;
}

NSDictionary *authTokenDict = responseJSON[@"authToken"];
if (![authTokenDict isKindOfClass:[NSDictionary class]]) {
FIRSetErrorToPointer(
FIRInstallationsItemSetErrorToPointer(
[FIRInstallationsErrorUtil FIDRegestrationErrorWithResponseMissingField:@"authToken"],
outError);
return nil;
Expand Down Expand Up @@ -89,17 +90,18 @@ - (nullable FIRInstallationsStoredAuthToken *)authTokenWithJSONDict:(NSDictionar
error:(NSError **)outError {
NSString *token = [self validStringOrNilForKey:@"token" fromDict:dict];
if (token == nil) {
FIRSetErrorToPointer(
FIRInstallationsItemSetErrorToPointer(
[FIRInstallationsErrorUtil FIDRegestrationErrorWithResponseMissingField:@"authToken.token"],
outError);
return nil;
}

NSString *expiresInString = [self validStringOrNilForKey:@"expiresIn" fromDict:dict];
if (expiresInString == nil) {
FIRSetErrorToPointer([FIRInstallationsErrorUtil
FIDRegestrationErrorWithResponseMissingField:@"authToken.expiresIn"],
outError);
FIRInstallationsItemSetErrorToPointer(
[FIRInstallationsErrorUtil
FIDRegestrationErrorWithResponseMissingField:@"authToken.expiresIn"],
outError);
return nil;
}

Expand Down