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
6 changes: 3 additions & 3 deletions packages/graphql-schema/src/user/UserPet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import {
IUserPetWeightEntry,
IUserPetDietRecommendationEntry,
IUserPetMedicalCondition,
IUsetPetDataOptions,
IUserPetDataOptions,
} from "omnipartners";
import { Ctx, Field, ObjectType } from "type-graphql";
import { Context } from "..";

export const userPetDataOptions: IUsetPetDataOptions = [
export const userPetDataOptions: IUserPetDataOptions = [
"basic_details",
"special_needs",
"breed_details",
Expand Down Expand Up @@ -160,7 +160,7 @@ export class UserPet
@Field()
public neutered!: boolean;

@Field({ nullable: true})
@Field({ nullable: true })
public type?: string;

@Field({ nullable: true })
Expand Down
45 changes: 36 additions & 9 deletions packages/omnipartners/src/api/identity/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import {
IUserUpdateInput,
IUserUpdatePlacesOfPurchaseInput,
IUserUpdateSubscriptionsInput,
IUsetPetDataOptions,
IUserPetDataOptions,
IUsetPetWithOwner,
IUserPetDietRecommendationAddInput,
IUserPetDietRecommendationEntry,
Expand Down Expand Up @@ -131,10 +131,11 @@ export default class Identity extends Api {
}

@doc("http://doc.clixray.com/index.php/Find_account_GUID_by_email_(strict)")
@filterInput(["email", "include_user_type"])
@filterInput(["email", "include_user_type", "user_context"])
public findAccountByEmail(data: {
email: string;
include_user_type?: string;
user_context?: string;
}): Promise<IUserPartial> {
return this.get("/service/user/resolve-by-email", data, {
hashKeys: ["email"],
Expand Down Expand Up @@ -497,14 +498,28 @@ export default class Identity extends Api {
"identifier",
"password",
"data_options",
"pet_data_options",
"pet_partner_type",
"partner_data_options",
"related_partners_filter_relation",
"related_partners_filter_types",
"related_partners_filter_groups",
"related_partners_filter_roles",
"user_context",
])
public async authenticate(
data: {
identifier: string;
password: string;
data_options?: IUserDataOptions;
partner_data_options?: string;
pet_data_options?: IUserPetDataOptions;
pet_partner_type?: string;
related_partners_filter_relation?: "clientof" | "partof";
related_partners_filter_types?: string;
related_partners_filter_groups?: string;
related_partners_filter_roles?: string;
user_context?: string;
},
options?: { locale?: string },
): Promise<IUser> {
Expand Down Expand Up @@ -556,16 +571,28 @@ export default class Identity extends Api {
"access_token",
"data_options",
"partner_data_options",
"related_partners_filter_xxxx",
"pet_data_options",
"pet_partner_type",
"related_partners_filter_relation",
"related_partners_filter_types",
"related_partners_filter_groups",
"related_partners_filter_roles",
"user_context",
])
public authenticateByAccessToken({
data_options,
...data
}: {
access_token: string;
data_options?: IUserDataOptions;
partner_data_options?: string;
related_partners_filter_xxxx?: string;
partner_data_options?: IPartnerDataOptions;
pet_data_options?: IUserPetDataOptions;
pet_partner_type?: string;
related_partners_filter_relation?: "clientof" | "partof";
related_partners_filter_types?: string;
related_partners_filter_groups?: string;
related_partners_filter_roles?: string;
user_context?: string;
}): Promise<IUser> {
return this.get(
"/service/auth/access-token",
Expand Down Expand Up @@ -613,7 +640,7 @@ export default class Identity extends Api {
}: {
user_ext_id: string;
data_options?: IUserDataOptions;
pet_data_options?: IUsetPetDataOptions;
pet_data_options?: IUserPetDataOptions;
partner_data_options?: IPartnerDataOptions;
pet_partner_type?: string;
related_partners_filter_xxxx?: string;
Expand Down Expand Up @@ -865,7 +892,7 @@ export default class Identity extends Api {
@doc("http://doc.clixray.com/index.php/Retrieve_pet_information")
@filterInput(["user_guid", "data_options"])
public getPets(
data: { user_guid: string; data_options?: IUsetPetDataOptions },
data: { user_guid: string; data_options?: IUserPetDataOptions },
options?: { locale?: string },
): Promise<{ data: IUserPet[] }> {
return this.get(
Expand Down Expand Up @@ -894,7 +921,7 @@ export default class Identity extends Api {
@filterInput(["pet_guid", "data_options"])
public getPet(data: {
pet_guid: string;
data_options?: IUsetPetDataOptions;
data_options?: IUserPetDataOptions;
}): Promise<{ data: IUsetPetWithOwner }> {
return this.get(
"/service/pets/get-pet",
Expand All @@ -919,7 +946,7 @@ export default class Identity extends Api {
@filterInput(["pet_ext_id", "data_options"])
public getPetByExternalId(data: {
pet_ext_id: string;
data_options?: IUsetPetDataOptions;
data_options?: IUserPetDataOptions;
}): Promise<{ data: IUsetPetWithOwner; statusCode: number }> {
return this.get(
"/service/pets/get-pet-by-external-id",
Expand Down
5 changes: 3 additions & 2 deletions packages/omnipartners/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ type IUserDataOption =
| "-access_rights";
export type IUserDataOptions = IUserDataOption[] | IUserDataOption;

type IUsetPetDataOption =
type IUserPetDataOption =
// Basic information of the pet
// The most basic information of the pet which includes name, species, breed, date of birth.
| "basic_details"
Expand All @@ -44,7 +44,7 @@ type IUsetPetDataOption =
| "pet_eco_systems"
// Information of pet tags.
| "user_tags";
export type IUsetPetDataOptions = IUsetPetDataOption[] | IUsetPetDataOption;
export type IUserPetDataOptions = IUserPetDataOption[] | IUserPetDataOption;

type IPartnerDataOption =
// Basic information of the partner
Expand Down Expand Up @@ -695,6 +695,7 @@ export interface IUser {
export interface IUserUpdateInput extends IBaseUserInput {
// The GUID of the user.
user_guid: string;
user_context?: string;
}

interface IBaseUserInput {
Expand Down