Skip to content

sdk fixes and team member verification #952

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

Merged
joeboppell merged 7 commits into from
Oct 12, 2026
Merged

sdk fixes and team member verification #952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
14795ce
chore(deps): update dependency globals to v17 (#497)
renovate[bot] Sep 28, 2026
91e4b83
fix(deps): update dependency uuid to v14 (#928)
renovate[bot] Sep 28, 2026
b75f837
chore(deps): update dependency axios to v1.20.0 [security] (#950)
renovate[bot] Oct 5, 2026
327f0de
fix travel additional migration
joeboppell Oct 7, 2026
0edb9a3
team member add verification
joeboppell Oct 9, 2026
d3657db
regenerate openapi.json for team member verification
joeboppell Oct 9, 2026
f3acbd3
auth package fix
joeboppell Oct 9, 2026
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
2 changes: 1 addition & 1 deletion db/migrations/20251204204114_add_registration_questions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export async function up(knex: Knex): Promise<void> {
table.string("zip_code").nullable();
table.integer("travel_cost").nullable();
table.string("travel_method").nullable();
table.string("travel_additional").nullable();
table.text("travel_additional").nullable();
});
}

Expand Down
7 changes: 6 additions & 1 deletion openapi.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"sanitize-html": "^2.14.0",
"sharp": "^0.34.4",
"url": "^0.11.4",
"uuid": "^13.0.0",
"uuid": "^14.0.0",
"webpack": "^5.97.1"
},
"devDependencies": {
Expand All @@ -95,7 +95,7 @@
"eslint": "^9.17.0",
"eslint-config-prettier": "^10.0.0",
"eslint-plugin-prettier": "^5.2.1",
"globals": "^16.0.0",
"globals": "^17.0.0",
"jest": "30.4.2",
"prettier": "^3.4.2",
"rimraf": "^6.0.1",
Expand Down
2 changes: 2 additions & 0 deletions packages/api-client/src/generated/model/addUserByEmailEntity.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 11 additions & 4 deletions packages/react-sdk/src/context/FirebaseProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ export const FirebaseProvider: FC<Props> = ({ children, config: rawConfig }) =>
getToken: () => (auth.currentUser ? auth.currentUser.getIdToken() : null),
onUnauthorized: () => {
if (typeof window === "undefined" || isLoggingOut.current) return;
// Only a signed-in user's 401 means the session expired. A signed-out
// visitor on a public page should just see the request fail.
if (!auth.currentUser) return;
const returnTo = encodeURIComponent(window.location.href);
window.location.href = `${config.authServiceUrl}/login?returnTo=${returnTo}`;
},
Expand All @@ -84,7 +87,7 @@ export const FirebaseProvider: FC<Props> = ({ children, config: rawConfig }) =>
[config.posthog],
);

const verifySession = useCallback(async () => {
const checkSession = useCallback(async (redirectOnUnauthorized: boolean) => {
if (isLoggingOut.current) return;

// On localhost and Vercel previews the auth cookie is unreadable, so the
Expand All @@ -100,7 +103,9 @@ export const FirebaseProvider: FC<Props> = ({ children, config: rawConfig }) =>
});

if (response.status === 401) {
if (typeof window !== "undefined") {
setUser(null);
setToken(undefined);
if (redirectOnUnauthorized && typeof window !== "undefined") {
const returnTo = encodeURIComponent(window.location.href);
window.location.href = `${config.authServiceUrl}/login?returnTo=${returnTo}`;
}
Expand Down Expand Up @@ -131,6 +136,8 @@ export const FirebaseProvider: FC<Props> = ({ children, config: rawConfig }) =>
}
}, [auth, config.authServiceUrl, identify]);

const verifySession = useCallback(() => checkSession(true), [checkSession]);

useEffect(() => {
if (hasInitialized || isLoggingOut.current) return;

Expand All @@ -140,7 +147,7 @@ export const FirebaseProvider: FC<Props> = ({ children, config: rawConfig }) =>
setIsLoading(true);
try {
await Promise.race([
verifySession(),
checkSession(false),
new Promise((_, reject) =>
setTimeout(() => reject(new Error("Session check timeout")), 5000),
),
Expand All @@ -159,7 +166,7 @@ export const FirebaseProvider: FC<Props> = ({ children, config: rawConfig }) =>
return () => {
cancelled = true;
};
}, [verifySession, hasInitialized]);
}, [checkSession, hasInitialized]);

const logout = useCallback(async () => {
isLoggingOut.current = true;
Expand Down
20 changes: 17 additions & 3 deletions src/modules/team/team.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { ApiProperty, ApiTags, OmitType, PartialType } from "@nestjs/swagger";
import { Role, Roles } from "common/gcp";
import { ApiDoc } from "common/docs";
import { DBExceptionFilter } from "common/filters";
import { IsEmail, IsOptional, IsString } from "class-validator";
import { IsEmail, IsOptional, IsString, Length } from "class-validator";
import { Transform } from "class-transformer";
import { nanoid } from "nanoid";

Expand Down Expand Up @@ -64,6 +64,13 @@ class AddUserByEmailEntity {
@ApiProperty()
@IsEmail()
email: string;

@ApiProperty({
description: "Last 4 characters of the user's ID, used to confirm identity",
})
@IsString()
@Length(4, 4)
userIdSuffix: string;
}

class ActiveTeamsParams {
Expand Down Expand Up @@ -444,8 +451,15 @@ export class TeamController {
.where("email", data.email)
.first();

if (!user) {
throw new NotFoundException(`User with email ${data.email} not found`);
// Use the same error for a wrong ID suffix so the endpoint can't be used
// to confirm which emails belong to registered users.
if (
!user ||
user.id.slice(-4).toLowerCase() !== data.userIdSuffix.toLowerCase()
) {
throw new BadRequestException(
"No user found with that email and user ID combination",
);
}

// Check if user is already in this team
Expand Down
28 changes: 14 additions & 14 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3043,9 +3043,9 @@ aws-ssl-profiles@^1.1.2:
integrity sha512-NZKeq9AfyQvEeNlN0zSYAaWrmBffJh3IELMZfRpJVWgrpEbtEpnjvzqBPf+mxoI287JohRDoa+/nsfqqiZmF6g==

axios@^1.12.0, axios@^1.7.9:
version "1.19.0"
resolved "https://registry.yarnpkg.com/axios/-/axios-1.19.0.tgz#ddf864d4c8233c0e6873746ab59361537d05ad39"
integrity sha512-ht/iuYZXEjFxLH/Hkezgd7m6JKlHHXEUSneaDz8uZe1Gj5QZtCnpyDsckvAiEnT89OEbCLmnte4R4sn7P0EKFw==
version "1.20.0"
resolved "https://registry.yarnpkg.com/axios/-/axios-1.20.0.tgz#515513445aa60e71d04b6521ca6210829ccb4786"
integrity sha512-r8aOh8j9cGKpgQAqpzrUHnSIc6a59Y3Xf/cv8sy1DrHCkZHzQGEuoq1tARk6qSyDdtQGSDgpb9kFlruzPvrgwg==
dependencies:
follow-redirects "^1.16.0"
form-data "^4.0.6"
Expand Down Expand Up @@ -4622,9 +4622,9 @@ flatted@^3.2.9:
integrity sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==

follow-redirects@^1.16.0:
version "1.16.0"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.16.0.tgz#28474a159d3b9d11ef62050a14ed60e4df6d61bc"
integrity sha512-y5rN/uOsadFT/JfYwhxRS5R7Qce+g3zG97+JrtFZlC9klX/W5hD7iiLzScI4nZqUS7DNUdhPgw4xI8W2LuXlUw==
version "1.16.1"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.16.1.tgz#6e0efa40a727fb369b98dab15883ec34787d675e"
integrity sha512-FNvFGzoMLWmE6Yj9spb/zjd7yiNCHiAW9/Tg9CXrQ8wuu32HtlJOwWO11OJafl5FfY3DxTdQ0vj42zU1kvv5jg==

fontkit@^2.0.4:
version "2.0.4"
Expand Down Expand Up @@ -4951,10 +4951,10 @@ globals@^14.0.0:
resolved "https://registry.yarnpkg.com/globals/-/globals-14.0.0.tgz#898d7413c29babcf6bafe56fcadded858ada724e"
integrity sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==

globals@^16.0.0:
version "16.5.0"
resolved "https://registry.yarnpkg.com/globals/-/globals-16.5.0.tgz#ccf1594a437b97653b2be13ed4d8f5c9f850cac1"
integrity sha512-c/c15i26VrJ4IRt5Z89DnIzCGDn9EcebibhAOjw5ibqEHsE1wLUgkPn9RDmNcUKyU87GeaL633nyJ+pplFR2ZQ==
globals@^17.0.0:
version "17.12.0"
resolved "https://registry.yarnpkg.com/globals/-/globals-17.12.0.tgz#910a368b8f093d3feb3f77a56dcefa05647d698e"
integrity sha512-cezEd/DTyyht9cvSSURyygXPfy04GtWO/5e6ZPvH7fCtjKz9PYOmuawphw1Ctd1f6C+5JypXfGD7ahNMXvevBA==

google-auth-library@^10.1.0, google-auth-library@^10.2.0:
version "10.2.1"
Expand Down Expand Up @@ -8570,10 +8570,10 @@ utils-merge@^1.0.1:
resolved "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"
integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==

uuid@^13.0.0:
version "13.0.2"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-13.0.2.tgz#41bc9c07b12f665089c205f6507976adbdf84ff8"
integrity sha512-vzi9uRZ926x4XV73S/4qQaTwPXM2JBj6/6lI/byHH1jOpCzb0zDbfytgA9LcN/hzb2l7WQSQnxITOVx5un/wGw==
uuid@^14.0.0:
version "14.0.2"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-14.0.2.tgz#d5ae03e4db0881c87271f8b0b9bd7312d02c799a"
integrity sha512-xZe/16rV4aa+HGSOCiY2YeLT1OybRLrrkL/Rqaq7p7GMVXjFh+6wN4oMYgjFmnSnhY8t6Xpdl2l9qmnHYuMHwQ==

uuid@^8.0.0:
version "8.3.2"
Expand Down
Loading