Skip to content

Commit

Permalink
Merge branch 'mrschmidt/documentref-compat' of github.com:firebase/fi…
Browse files Browse the repository at this point in the history
…rebase-js-sdk into mrschmidt/documentref-compat
  • Loading branch information
schmidt-sebastian committed Nov 6, 2020
2 parents 9fc4c37 + c060c28 commit 72bf9b2
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 3 deletions.
5 changes: 5 additions & 0 deletions .changeset/short-mangos-beg.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@firebase/firestore": patch
---

Internal changes to support upcoming modular API.
5 changes: 4 additions & 1 deletion packages-exp/auth-exp/index.webworker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,10 @@ registerAuth(ClientPlatform.WORKER);
export function getAuth(app = getApp()): Auth {
// Unlike the other environments, we need to explicitly check if indexedDb is
// available. That means doing the whole rigamarole
const auth = _getProvider(app, _ComponentName.AUTH).getImmediate() as AuthImpl;
const auth = _getProvider(
app,
_ComponentName.AUTH
).getImmediate() as AuthImpl;

// This promise is intended to float; auth initialization happens in the
// background, meanwhile the auth object may be used by the app.
Expand Down
7 changes: 5 additions & 2 deletions packages/database/src/api/Database.ts
Original file line number Diff line number Diff line change
Expand Up @@ -157,14 +157,17 @@ export class Database implements FirebaseService {
validateUrl(apiName, 1, parsedURL);

const repoInfo = parsedURL.repoInfo;
if (!repoInfo.isCustomHost() && repoInfo.host !== this.repo_.repoInfo_.host) {
if (
!repoInfo.isCustomHost() &&
repoInfo.host !== this.repo_.repoInfo_.host
) {
fatal(
apiName +
': Host name does not match the current database: ' +
'(found ' +
repoInfo.host +
' but expected ' +
this.repo_.repoInfo_.host+
this.repo_.repoInfo_.host +
')'
);
}
Expand Down

0 comments on commit 72bf9b2

Please sign in to comment.