Skip to content

chore: Merged master branch into v7 - #456

Merged
hiranya911 merged 1 commit into
v7from
hkj-master-to-v7
Jul 24, 2020
Merged

chore: Merged master branch into v7#456
hiranya911 merged 1 commit into
v7from
hkj-master-to-v7

Conversation

@hiranya911

@hiranya911 hiranya911 commented Jul 23, 2020

Copy link
Copy Markdown
Contributor

I've done the bare minimal changes necessary so this branch would compile and all tests would pass. There's some room for clean up and additional tests, which I will get to in future PRs.

Notable changes/additions:

  • AuthErrorHandler was moved to the internal package so the multitenancy code can use it too (via AuthHttpClient)
  • Added AuthErrorCode.TENANT_ID_MISMATCH enum value.
  • AuthHttpClient is now a wrapper for the ErrorHandlingHttpClient.

Conflicts were detected only in the following files:

	both modified:   src/main/java/com/google/firebase/auth/FirebaseAuth.java
	both modified:   src/main/java/com/google/firebase/auth/FirebaseTokenUtils.java
	both modified:   src/main/java/com/google/firebase/auth/FirebaseTokenVerifierImpl.java
	both modified:   src/main/java/com/google/firebase/auth/FirebaseUserManager.java
	both modified:   src/main/java/com/google/firebase/auth/internal/FirebaseTokenFactory.java
	both modified:   src/main/java/com/google/firebase/messaging/FirebaseMessagingClientImpl.java
	both modified:   src/test/java/com/google/firebase/auth/FirebaseAuthIT.java
	both modified:   src/test/java/com/google/firebase/auth/FirebaseAuthTest.java
	both modified:   src/test/java/com/google/firebase/auth/FirebaseTokenVerifierImplTest.java
	both modified:   src/test/java/com/google/firebase/auth/FirebaseUserManagerTest.java
	both modified:   src/test/java/com/google/firebase/messaging/MulticastMessageTest.java

Review effort should mostly focus on the above classes.

@hiranya911 hiranya911 added the release:stage Stage a release candidate label Jul 23, 2020
@hiranya911

hiranya911 commented Jul 23, 2020

Copy link
Copy Markdown
Contributor Author

@micahstairs most of the files that required merging were stuff you last worked on. PTAL and call out any obvious merge errors or oversights.

@hiranya911 hiranya911 changed the title chore: Merged with v7 branch with master chore: Merged master branch into v7 Jul 23, 2020
micahstairs
micahstairs approved these changes Jul 23, 2020
View reviewed changes

@micahstairs micahstairs left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Alright, I skimmed the files you listed above and didn't see any obvious merge errors!

Comment thread src/main/java/com/google/firebase/auth/GetUsersResult.java
@@ -0,0 +1,52 @@
/*
* Copyright 2020 Google Inc.

@micahstairs micahstairs Jul 23, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LLC

@hiranya911 hiranya911 Jul 23, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I'll leave these instances unchanged for now since they reflect the current state of the master branch. It's best to do a separate PR in the future, and correct all these license headers in one go.

Comment thread src/main/java/com/google/firebase/auth/internal/GetAccountInfoRequest.java
Comment thread src/test/java/com/google/firebase/auth/GetUsersIT.java
@hiranya911 hiranya911 removed their assignment Jul 23, 2020
lahirumaramba
lahirumaramba approved these changes Jul 24, 2020
View reviewed changes

@lahirumaramba lahirumaramba left a comment

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.

LGTM.
I didn't check for code that might have possibly misplaced/overwritten during the merge. Is this something we should worry about?

@hiranya911

hiranya911 commented Jul 24, 2020

Copy link
Copy Markdown
Contributor Author

We have fairly good unit and integration test coverage in the affected areas. And a manual inspection didn't reveal anything unusual.

@hiranya911
hiranya911 merged commit 4ff27a7 into v7 Jul 24, 2020
@hiranya911
hiranya911 deleted the hkj-master-to-v7 branch July 24, 2020 18:12
@hiranya911 hiranya911 mentioned this pull request Jul 24, 2020
Merged
hiranya911 added a commit that referenced this pull request Aug 18, 2020
@hiranya911 @MathBunny
@egilmorez @kevinthecheung
change: New error handling APIs (merging v7 branch into master) (#465)
cc520a7 
* Added core types for the error handling revamp (#350)

* Added core types for the error handling revamp

* Fixed copyright year

* Added ErrorHandlingHttpClient API (#353)

* Added core error handling abstractions

* Added unit tests for the new functionality

* Exposed getErrorCode as getErrorCodeNew

* Enabled error code assertions

* Error handling revamp for the FirebaseMessaging API (#357)

* Added core error handling abstractions

* Added unit tests for the new functionality

* Exposed getErrorCode as getErrorCodeNew

* Enabled error code assertions

* Error handling revamp for FCM APIs

* Cleaned up the FirebaseMessagingException

* Cleaned up the AbstractHttpErrorHandler class

* Updated tests

* Error handling revamp for FirebaseInstanceId API (#359)

* Delete instance ID API error handling revamp

* Added tests for IO and parse errors

* fix(auth): Migrated user management APIs to the new error handling scheme (#360)

* Error handling revamp in FirebaseUserManager

* Updated integration tests; Added documentation

* Assigning the correct ErrorCode for auth errors

* Moved AuthErrorHandler to a separate top-level class

* Error handling revamp for token verification APIs (#362)

* Error handling revamp for token verification APIs

* Updated javadocs

* Error handling revamp for the custom token creation API (#366)

* Error handlign revamp for the custom token creation API

* Using the correct authorized HTTP client for IAM requests

* Error handling revamp for the project management API (#367)

* Error handling revamp for the project management API

* Minor code and test cleanup

* Fixed some lint errors; Removed requestFactory reference from project mgt service impl

* Renamed getErrorCodeNew() to getErrorCode() (#379)

* Minor code and test cleanup

* Renamed getErrorCodeNew() to getErrorCode() in FirebaseException

* Fixing checkstyle error

* Fixing some deprecation warnings (#380)

* Handling IID error codes correctly (#381)

* Removed old deprecated APIs (#383)

* fix: Removed unused FirebaseAppStore abstraction (#427)

* fix: Removed unused FirebaseAppStore abstraction

* Using the keySet of App instances to populate the app names list

* chore: Removing redundant test dependency (#441)

* chore: Make user import hashing classes final (#425)

* chore: Merged with v7 branch with master (#456)

* fix(fcm): Replacing deprecated Batch API constructor (#460)

* fix: Handling http method override in ErrorHandlingHttpClient (#459)

* fix: Handling JSON serialization/response interception at ErrorHandlingHttpClient (#462)

* fix: Handling JSON serialization and response interception at ErrorHandlingHttpClient

* fix: Removing redundant method override header

* feat: Added new error codes for IdP management and multitenancy (#458)

* feat: Added new error codes for IdP management and multitenancy

* fix: Updated integration tests

* fix: Renamed helper method

* fix: Removing some calls to deprecated APIs (#464)

* chore: Support for specifying query parameters in HttpRequestInfo (#463)

* chore: Support for specifying query parameters in HttpRequestInfo

* fix: Removing redundant JsonObjectParser from HttpClient

* fix: Fixing a series of javadoc warnings (#466)

* fix: Made some APIs on AbstractFirebaseAuth.Builder package-protected for consistency

* Apply suggestions from code review

Co-authored-by: egilmorez <egilmore@google.com>
Co-authored-by: Kevin Cheung <kevinthecheung@users.noreply.github.com>

* fix: Minor updates to API ref docs based on code review comments

* fix: Fixing API doc wording

Co-authored-by: Horatiu Lazu <horatiulazu@gmail.com>
Co-authored-by: egilmorez <egilmore@google.com>
Co-authored-by: Kevin Cheung <kevinthecheung@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lahirumaramba lahirumaramba lahirumaramba approved these changes
+1 more reviewer
@micahstairs micahstairs micahstairs approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@hiranya911 hiranya911

Labels

release:stage Stage a release candidate

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@hiranya911 @lahirumaramba @micahstairs