Skip to content
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

Jump to bottom

Fixes issue where Auth emulator sign in with Google only shows default tenant #6683

Merged
merged 3 commits into from
Jan 16, 2024
+3 −2
Merged

Fixes issue where Auth emulator sign in with Google only shows default tenant #6683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f0b8793
Fixes issue where Auth emulator sign in with Google only shows defaul…
aalej Jan 12, 2024
7230525
Fixes issue where Auth emulator sign in with Google only shows defaul…
aalej Jan 12, 2024
97d535a
Merge branch 'master' into aalej-auth-em-tid
aalej Jan 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
return res.status(200).json({
authEmulator: { success: `The email has been successfully reset.`, email },
});
} catch (e: any) {

Check warning on line 62 in src/emulator/auth/handlers.ts

View workflow job for this annotation

GitHub Actions / lint (20) 

Unexpected any. Specify a different type
if (
e instanceof NotImplementedError ||
(e instanceof BadRequestError && e.message === "INVALID_OOB_CODE")
Expand Down Expand Up @@ -127,7 +127,7 @@
authEmulator: { success: `The email has been successfully verified.`, email },
});
}
} catch (e: any) {

Check warning on line 130 in src/emulator/auth/handlers.ts

View workflow job for this annotation

GitHub Actions / lint (20) 

Unexpected any. Specify a different type
if (
e instanceof NotImplementedError ||
(e instanceof BadRequestError && e.message === "INVALID_OOB_CODE")
Expand Down Expand Up @@ -172,7 +172,7 @@
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