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.

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

test: add integration test for no password user setting password #6579

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
33 changes: 19 additions & 14 deletions packages/integration-tests/src/api/connector.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import type {
ConnectorResponse,
CreateConnector,
} from '@logto/schemas';
import { type KyInstance } from 'ky';

import { authedAdminApi } from './api.js';

Expand All @@ -15,29 +16,32 @@ import { authedAdminApi } from './api.js';
* that contain metadata (considered connectors' FIXED properties) and code implementation (which determines how connectors work).
*/

export const listConnectors = async () =>
authedAdminApi.get('connectors').json<ConnectorResponse[]>();
export const listConnectors = async (api: KyInstance = authedAdminApi) =>
api.get('connectors').json<ConnectorResponse[]>();

export const getConnector = async (id: string) =>
authedAdminApi.get(`connectors/${id}`).json<ConnectorResponse>();
export const getConnector = async (id: string, api: KyInstance = authedAdminApi) =>
api.get(`connectors/${id}`).json<ConnectorResponse>();

export const listConnectorFactories = async () =>
authedAdminApi.get('connector-factories').json<ConnectorFactoryResponse[]>();
export const listConnectorFactories = async (api: KyInstance = authedAdminApi) =>
api.get('connector-factories').json<ConnectorFactoryResponse[]>();

export const getConnectorFactory = async (connectorFactoryId: string) =>
authedAdminApi.get(`connector-factories/${connectorFactoryId}`).json<ConnectorFactoryResponse>();
export const getConnectorFactory = async (
connectorFactoryId: string,
api: KyInstance = authedAdminApi
) => api.get(`connector-factories/${connectorFactoryId}`).json<ConnectorFactoryResponse>();

export const postConnector = async (
payload: Pick<CreateConnector, 'connectorId' | 'config' | 'metadata' | 'syncProfile'>
payload: Pick<CreateConnector, 'connectorId' | 'config' | 'metadata' | 'syncProfile'>,
api: KyInstance = authedAdminApi
) =>
authedAdminApi
api
.post('connectors', {
json: payload,
})
.json<Connector>();

export const deleteConnectorById = async (id: string) =>
authedAdminApi.delete(`connectors/${id}`).json();
export const deleteConnectorById = async (id: string, api: KyInstance = authedAdminApi) =>
api.delete(`connectors/${id}`).json();

export const updateConnectorConfig = async (
id: string,
Expand Down Expand Up @@ -75,9 +79,10 @@ const sendTestMessage = async (
export const getConnectorAuthorizationUri = async (
connectorId: string,
state: string,
redirectUri: string
redirectUri: string,
api: KyInstance = authedAdminApi
) =>
authedAdminApi
api
.post(`connectors/${connectorId}/authorization-uri`, {
json: { state, redirectUri },
})
Expand Down
12 changes: 8 additions & 4 deletions packages/integration-tests/src/api/sign-in-experience.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
import type { SignInExperience } from '@logto/schemas';
import { type KyInstance } from 'ky';

import { authedAdminApi } from './api.js';

export const getSignInExperience = async () =>
authedAdminApi.get('sign-in-exp').json<SignInExperience>();
export const getSignInExperience = async (api: KyInstance = authedAdminApi) =>
api.get('sign-in-exp').json<SignInExperience>();

export const updateSignInExperience = async (signInExperience: Partial<SignInExperience>) =>
authedAdminApi
export const updateSignInExperience = async (
signInExperience: Partial<SignInExperience>,
api: KyInstance = authedAdminApi
) =>
api
.patch('sign-in-exp', {
json: signInExperience,
})
Expand Down
52 changes: 21 additions & 31 deletions packages/integration-tests/src/client/experience/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,32 +10,22 @@ import {

import MockClient from '#src/client/index.js';

import api from '../../api/api.js';

import { experienceRoutes } from './const.js';

type RedirectResponse = {
redirectTo: string;
};

export const identifyUser = async (cookie: string, payload: IdentificationApiPayload) =>
api
.post(experienceRoutes.identification, {
headers: { cookie },
json: payload,
})
.json();

export class ExperienceClient extends MockClient {
public async identifyUser(payload: IdentificationApiPayload = {}) {
return api.post(experienceRoutes.identification, {
return this.api.post(experienceRoutes.identification, {
headers: { cookie: this.interactionCookie },
json: payload,
});
}

public async updateInteractionEvent(payload: { interactionEvent: InteractionEvent }) {
return api
return this.api
.put(`${experienceRoutes.prefix}/interaction-event`, {
headers: { cookie: this.interactionCookie },
json: payload,
Expand All @@ -44,7 +34,7 @@ export class ExperienceClient extends MockClient {
}

public async initInteraction(payload: CreateExperienceApiPayload) {
return api
return this.api
.put(experienceRoutes.prefix, {
headers: { cookie: this.interactionCookie },
json: payload,
Expand All @@ -53,13 +43,13 @@ export class ExperienceClient extends MockClient {
}

public override async submitInteraction(): Promise<RedirectResponse> {
return api
return this.api
.post(`${experienceRoutes.prefix}/submit`, { headers: { cookie: this.interactionCookie } })
.json<RedirectResponse>();
}

public async verifyPassword(payload: PasswordVerificationPayload) {
return api
return this.api
.post(`${experienceRoutes.verification}/password`, {
headers: { cookie: this.interactionCookie },
json: payload,
Expand All @@ -71,7 +61,7 @@ export class ExperienceClient extends MockClient {
identifier: VerificationCodeIdentifier;
interactionEvent: InteractionEvent;
}) {
return api
return this.api
.post(`${experienceRoutes.verification}/verification-code`, {
headers: { cookie: this.interactionCookie },
json: payload,
Expand All @@ -84,7 +74,7 @@ export class ExperienceClient extends MockClient {
verificationId: string;
code: string;
}) {
return api
return this.api
.post(`${experienceRoutes.verification}/verification-code/verify`, {
headers: { cookie: this.interactionCookie },
json: payload,
Expand All @@ -99,7 +89,7 @@ export class ExperienceClient extends MockClient {
state: string;
}
) {
return api
return this.api
.post(`${experienceRoutes.verification}/social/${connectorId}/authorization-uri`, {
headers: { cookie: this.interactionCookie },
json: payload,
Expand All @@ -114,7 +104,7 @@ export class ExperienceClient extends MockClient {
connectorData: Record<string, unknown>;
}
) {
return api
return this.api
.post(`${experienceRoutes.verification}/social/${connectorId}/verify`, {
headers: { cookie: this.interactionCookie },
json: payload,
Expand All @@ -129,7 +119,7 @@ export class ExperienceClient extends MockClient {
state: string;
}
) {
return api
return this.api
.post(`${experienceRoutes.verification}/sso/${connectorId}/authorization-uri`, {
headers: { cookie: this.interactionCookie },
json: payload,
Expand All @@ -144,7 +134,7 @@ export class ExperienceClient extends MockClient {
connectorData: Record<string, unknown>;
}
) {
return api
return this.api
.post(`${experienceRoutes.verification}/sso/${connectorId}/verify`, {
headers: { cookie: this.interactionCookie },
json: payload,
Expand All @@ -153,7 +143,7 @@ export class ExperienceClient extends MockClient {
}

public async getAvailableSsoConnectors(email: string) {
return api
return this.api
.get(`${experienceRoutes.prefix}/sso-connectors`, {
headers: { cookie: this.interactionCookie },
searchParams: { email },
Expand All @@ -162,15 +152,15 @@ export class ExperienceClient extends MockClient {
}

public async createTotpSecret() {
return api
return this.api
.post(`${experienceRoutes.verification}/totp/secret`, {
headers: { cookie: this.interactionCookie },
})
.json<{ verificationId: string; secret: string; secretQrCode: string }>();
}

public async verifyTotp(payload: { verificationId?: string; code: string }) {
return api
return this.api
.post(`${experienceRoutes.verification}/totp/verify`, {
headers: { cookie: this.interactionCookie },
json: payload,
Expand All @@ -179,15 +169,15 @@ export class ExperienceClient extends MockClient {
}

public async generateMfaBackupCodes() {
return api
return this.api
.post(`${experienceRoutes.verification}/backup-code/generate`, {
headers: { cookie: this.interactionCookie },
})
.json<{ verificationId: string; codes: string[] }>();
}

public async verifyBackupCode(payload: { code: string }) {
return api
return this.api
.post(`${experienceRoutes.verification}/backup-code/verify`, {
headers: { cookie: this.interactionCookie },
json: payload,
Expand All @@ -198,7 +188,7 @@ export class ExperienceClient extends MockClient {
public async createNewPasswordIdentityVerification(
payload: Pick<PasswordVerificationPayload, 'identifier'> & { password?: string }
) {
return api
return this.api
.post(`${experienceRoutes.verification}/new-password-identity`, {
headers: { cookie: this.interactionCookie },
json: payload,
Expand All @@ -207,27 +197,27 @@ export class ExperienceClient extends MockClient {
}

public async resetPassword(payload: { password: string }) {
return api.put(`${experienceRoutes.profile}/password`, {
return this.api.put(`${experienceRoutes.profile}/password`, {
headers: { cookie: this.interactionCookie },
json: payload,
});
}

public async updateProfile(payload: UpdateProfileApiPayload) {
return api.post(`${experienceRoutes.profile}`, {
return this.api.post(`${experienceRoutes.profile}`, {
headers: { cookie: this.interactionCookie },
json: payload,
});
}

public async skipMfaBinding() {
return api.post(`${experienceRoutes.mfa}/mfa-skipped`, {
return this.api.post(`${experienceRoutes.mfa}/mfa-skipped`, {
headers: { cookie: this.interactionCookie },
});
}

public async bindMfa(type: MfaFactor, verificationId: string) {
return api.post(`${experienceRoutes.mfa}`, {
return this.api.post(`${experienceRoutes.mfa}`, {
headers: { cookie: this.interactionCookie },
json: { type, verificationId },
});
Expand Down
6 changes: 3 additions & 3 deletions packages/integration-tests/src/client/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
protected readonly config: LogtoConfig;
protected readonly storage: MemoryStorage;
protected readonly logto: LogtoClient;
protected readonly api: KyInstance;

private navigateUrl?: string;
private readonly api: KyInstance;

constructor(config?: Partial<LogtoConfig>) {
constructor(config?: Partial<LogtoConfig>, api?: KyInstance) {
this.storage = new MemoryStorage();
this.config = { ...defaultConfig, ...config };
this.api = ky.extend({ prefixUrl: this.config.endpoint + '/api' });
this.api = api ?? ky.extend({ prefixUrl: this.config.endpoint + '/api' });

this.logto = new LogtoClient(this.config, {
navigate: (url: string) => {
Expand All @@ -37,7 +37,7 @@
});
}

// TODO: Rename to sessionCookies or something accurate

Check warning on line 40 in packages/integration-tests/src/client/index.ts

View workflow job for this annotation

GitHub Actions / ESLint Report Analysis

packages/integration-tests/src/client/index.ts#L40

[no-warning-comments] Unexpected 'todo' comment: 'TODO: Rename to sessionCookies or...'.
public get interactionCookie(): string {
return this.rawCookies.join('; ');
}
Expand Down
Loading
Loading