Compare commits
2
Commits
58f64e1db9
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a89e66f373 | ||
|
|
9417aa95bb |
+1
-1
Submodule graphql-contracts updated: 95486d75fc...7b6c8ce509
+8
-4
@@ -32,6 +32,10 @@ function scopesFromPayload(payload: JWTPayload): string[] {
|
||||
return [];
|
||||
}
|
||||
|
||||
function clientScopes(payload: JWTPayload): string[] {
|
||||
return [...new Set([...scopesFromPayload(payload), "teams:user"])];
|
||||
}
|
||||
|
||||
function claimList(payload: JWTPayload, key: string): string[] {
|
||||
const value = (payload as Record<string, unknown>)[key];
|
||||
if (typeof value === "string") return value.split(" ");
|
||||
@@ -57,12 +61,12 @@ export async function publicContext(req: FastifyRequest): Promise<AuthContext> {
|
||||
issuer: LOGTO_ISSUER,
|
||||
audience: LOGTO_KYC_AUDIENCE,
|
||||
});
|
||||
const scopes = scopesFromPayload(payload);
|
||||
if (!scopes.includes("teams:user")) {
|
||||
if (!payload.sub) {
|
||||
throw new GraphQLError("Unauthorized", {
|
||||
extensions: { code: "UNAUTHENTICATED" },
|
||||
});
|
||||
}
|
||||
const scopes = clientScopes(payload);
|
||||
return { userId: payload.sub, scopes };
|
||||
}
|
||||
|
||||
@@ -77,12 +81,12 @@ export async function userContext(req: FastifyRequest): Promise<AuthContext> {
|
||||
issuer: LOGTO_ISSUER,
|
||||
audience: LOGTO_KYC_AUDIENCE,
|
||||
});
|
||||
const scopes = scopesFromPayload(payload);
|
||||
if (!scopes.includes("teams:user")) {
|
||||
if (!payload.sub) {
|
||||
throw new GraphQLError("Unauthorized", {
|
||||
extensions: { code: "UNAUTHENTICATED" },
|
||||
});
|
||||
}
|
||||
const scopes = clientScopes(payload);
|
||||
return { userId: payload.sub, scopes };
|
||||
}
|
||||
|
||||
|
||||
@@ -14,6 +14,7 @@ export const userTypeDefs = `#graphql
|
||||
contactPerson: String
|
||||
contactEmail: String
|
||||
contactPhone: String
|
||||
approvedAt: String
|
||||
countryData: String
|
||||
createdAt: String!
|
||||
updatedAt: String!
|
||||
@@ -140,6 +141,7 @@ export const userResolvers = {
|
||||
createKycRequestRussia: createApplicationRussia,
|
||||
},
|
||||
KYCApplication: {
|
||||
approvedAt: (parent: { approvedAt: Date | null }) => parent.approvedAt?.toISOString() ?? null,
|
||||
countryData: async (parent: { objectId: number | null }) => getCountryData(parent),
|
||||
createdAt: (parent: { createdAt: Date }) => parent.createdAt.toISOString(),
|
||||
updatedAt: (parent: { updatedAt: Date }) => parent.updatedAt.toISOString(),
|
||||
|
||||
Reference in New Issue
Block a user