Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
Prevent the use of pinTags + minInstances on the same function, as the features are not mutually compatible (#6684)
- Fixed issue where Auth emulator sign in with Google only shows default tenant. (#6683)
- Prevent the use of pinTags + minInstances on the same function, as the features are not mutually compatible (#6684)
2 changes: 1 addition & 1 deletion src/emulator/auth/handlers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ export function registerHandlers(
res.set("Content-Type", "text/html; charset=utf-8");
const apiKey = req.query.apiKey as string | undefined;
const providerId = req.query.providerId as string | undefined;
const tenantId = req.query.tenantId as string | undefined;
const tenantId = (req.query.tenantId || req.query.tid) as string | undefined;
if (!apiKey || !providerId) {
return res.status(400).json({
authEmulator: {
Expand Down