feat(auth): add Messenger topup handoff entry
Docker Image / Build and Push Docker Image (push) Successful in 2m9s
Docker Image / Build and Push Docker Image (push) Successful in 2m9s
This commit is contained in:
@@ -3,8 +3,6 @@ import { describe, expect, it, vi } from "vitest";
|
||||
import { AuthRepository } from "@/data/repositories/auth_repository";
|
||||
import {
|
||||
FacebookIdentityResponseSchema,
|
||||
FacebookPsidLoginResponseSchema,
|
||||
LoginStatus,
|
||||
} from "@/data/schemas/auth";
|
||||
import type { AuthApi } from "@/data/services/api";
|
||||
import type { IAuthStorage } from "@/data/storage/auth";
|
||||
@@ -54,85 +52,4 @@ describe("AuthRepository facebook identity", () => {
|
||||
expect(storage.setAsid).toHaveBeenCalledWith("asid-1");
|
||||
expect(storage.setPsid).toHaveBeenCalledWith("psid-1");
|
||||
});
|
||||
|
||||
it("saves real login data from complete psid login responses", async () => {
|
||||
const facebookPsidLogin = vi.fn(async () =>
|
||||
FacebookPsidLoginResponseSchema.parse({
|
||||
token: "login-token",
|
||||
refreshToken: "refresh-token",
|
||||
matchedBy: "psid",
|
||||
fbAsid: "asid-1",
|
||||
fbPsid: "psid-1",
|
||||
hasCompleteFacebookIdentity: true,
|
||||
isGuest: false,
|
||||
user: { id: "user-1", username: "Elio" },
|
||||
}),
|
||||
);
|
||||
const { repository, storage, userStorage } = createRepository({
|
||||
facebookPsidLogin,
|
||||
});
|
||||
|
||||
const result = await repository.facebookPsidLogin({
|
||||
psid: "psid-1",
|
||||
deviceId: "device-1",
|
||||
});
|
||||
|
||||
expect(result).toEqual(Result.ok(LoginStatus.Facebook));
|
||||
expect(storage.setLoginToken).toHaveBeenCalledWith("login-token");
|
||||
expect(storage.setRefreshToken).toHaveBeenCalledWith("refresh-token");
|
||||
expect(storage.setLoginProvider).toHaveBeenCalledWith(LoginStatus.Facebook);
|
||||
expect(userStorage.setUserId).toHaveBeenCalledWith("user-1");
|
||||
expect(storage.setAsid).toHaveBeenCalledWith("asid-1");
|
||||
expect(storage.setPsid).toHaveBeenCalledWith("psid-1");
|
||||
});
|
||||
|
||||
it("saves guest data from incomplete psid login responses", async () => {
|
||||
const facebookPsidLogin = vi.fn(async () =>
|
||||
FacebookPsidLoginResponseSchema.parse({
|
||||
token: "guest-token",
|
||||
matchedBy: "psid_incomplete",
|
||||
fbPsid: "psid-1",
|
||||
hasCompleteFacebookIdentity: false,
|
||||
isGuest: true,
|
||||
userId: "guest-1",
|
||||
}),
|
||||
);
|
||||
const { repository, storage, userStorage } = createRepository({
|
||||
facebookPsidLogin,
|
||||
});
|
||||
|
||||
const result = await repository.facebookPsidLogin({
|
||||
psid: "psid-1",
|
||||
deviceId: "device-1",
|
||||
});
|
||||
|
||||
expect(result).toEqual(Result.ok(LoginStatus.Guest));
|
||||
expect(storage.setGuestToken).toHaveBeenCalledWith("guest-token");
|
||||
expect(storage.setLoginProvider).toHaveBeenCalledWith(LoginStatus.Guest);
|
||||
expect(storage.setDeviceId).toHaveBeenCalledWith("device-1");
|
||||
expect(userStorage.setUserId).toHaveBeenCalledWith("guest-1");
|
||||
});
|
||||
|
||||
it("does not report guest psid login success when session persistence fails", async () => {
|
||||
const storageError = new Error("guest token write failed");
|
||||
const facebookPsidLogin = vi.fn(async () =>
|
||||
FacebookPsidLoginResponseSchema.parse({
|
||||
token: "guest-token",
|
||||
matchedBy: "psid_incomplete",
|
||||
fbPsid: "psid-1",
|
||||
hasCompleteFacebookIdentity: false,
|
||||
isGuest: true,
|
||||
userId: "guest-1",
|
||||
}),
|
||||
);
|
||||
const { repository, storage } = createRepository({ facebookPsidLogin });
|
||||
vi.mocked(storage.setGuestToken).mockResolvedValueOnce(
|
||||
Result.err(storageError),
|
||||
);
|
||||
|
||||
const result = await repository.facebookPsidLogin({ psid: "psid-1" });
|
||||
|
||||
expect(Result.isErr(result)).toBe(true);
|
||||
expect(storage.setLoginProvider).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
|
||||
@@ -239,4 +239,27 @@ describe("AuthRepository session Result handling", () => {
|
||||
|
||||
expect(result).toEqual(Result.ok(loginResponse.user));
|
||||
});
|
||||
|
||||
it("persists a top-up handoff as a formal Messenger session", async () => {
|
||||
const handoffResponse = {
|
||||
...loginResponse,
|
||||
loginStatus: LoginStatus.FacebookMessenger,
|
||||
merged: false,
|
||||
} as const;
|
||||
const { repository, storage, userStorage } = createRepository({
|
||||
api: {
|
||||
consumeTopUpHandoff: vi.fn(async () => handoffResponse),
|
||||
},
|
||||
});
|
||||
|
||||
const result = await repository.consumeTopUpHandoff("x".repeat(32));
|
||||
|
||||
expect(result).toEqual(Result.ok(LoginStatus.FacebookMessenger));
|
||||
expect(storage.setLoginToken).toHaveBeenCalledWith("login-token");
|
||||
expect(storage.setRefreshToken).toHaveBeenCalledWith("refresh-token");
|
||||
expect(userStorage.setUserId).toHaveBeenCalledWith("user-1");
|
||||
expect(storage.setLoginProvider).toHaveBeenCalledWith(
|
||||
LoginStatus.FacebookMessenger,
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -3,18 +3,17 @@ import type { IAuthRepository } from "@/data/repositories/interfaces";
|
||||
import {
|
||||
FacebookIdentityRequestSchema,
|
||||
FacebookLoginRequestSchema,
|
||||
FacebookPsidLoginRequestSchema,
|
||||
FbIdLoginRequestSchema,
|
||||
GoogleLoginRequestSchema,
|
||||
GuestLoginRequestSchema,
|
||||
GuestLoginResponse,
|
||||
LoginRequestSchema,
|
||||
LoginResponse,
|
||||
LoginResponseSchema,
|
||||
LoginStatus,
|
||||
RefreshTokenRequestSchema,
|
||||
RefreshTokenResponse,
|
||||
RegisterRequestSchema,
|
||||
TopUpHandoffRequestSchema,
|
||||
type LoginStatus as LoginStatusT,
|
||||
} from "@/data/schemas/auth";
|
||||
import { User } from "@/data/schemas/user";
|
||||
@@ -264,54 +263,16 @@ export class AuthRepository implements IAuthRepository {
|
||||
});
|
||||
}
|
||||
|
||||
/** 通过 Facebook PSID 直接登录或返回游客态。 */
|
||||
async facebookPsidLogin(input: {
|
||||
psid: string;
|
||||
deviceId?: string;
|
||||
bindToGuest?: boolean;
|
||||
}): Promise<Result<LoginStatusT>> {
|
||||
/** 消费一次性充值凭证并按后端返回的 canonical 账号建立正式会话。 */
|
||||
async consumeTopUpHandoff(
|
||||
handoffToken: string,
|
||||
): Promise<Result<LoginStatusT>> {
|
||||
return Result.wrap(async () => {
|
||||
const response = await this.api.facebookPsidLogin(
|
||||
FacebookPsidLoginRequestSchema.parse({
|
||||
psid: input.psid,
|
||||
deviceId: input.deviceId ?? "",
|
||||
bindToGuest: input.bindToGuest ?? true,
|
||||
}),
|
||||
const response = await this.api.consumeTopUpHandoff(
|
||||
TopUpHandoffRequestSchema.parse({ handoffToken }),
|
||||
);
|
||||
const data = response;
|
||||
await this._saveFacebookIdentity({
|
||||
asid: data.fbAsid,
|
||||
psid: data.fbPsid,
|
||||
});
|
||||
|
||||
if (data.isGuest || !data.hasCompleteFacebookIdentity) {
|
||||
const tokenResult = await this.storage.setGuestToken(data.token);
|
||||
if (Result.isErr(tokenResult)) throw tokenResult.error;
|
||||
if (input.deviceId) {
|
||||
const deviceResult = await this.storage.setDeviceId(input.deviceId);
|
||||
if (Result.isErr(deviceResult)) throw deviceResult.error;
|
||||
}
|
||||
const userId = data.userId || data.user?.id || "";
|
||||
if (userId) {
|
||||
const userIdResult = await this.userStorage.setUserId(userId);
|
||||
if (Result.isErr(userIdResult)) throw userIdResult.error;
|
||||
}
|
||||
const providerResult = await this.storage.setLoginProvider(
|
||||
LoginStatus.Guest,
|
||||
);
|
||||
if (Result.isErr(providerResult)) throw providerResult.error;
|
||||
return LoginStatus.Guest;
|
||||
}
|
||||
|
||||
await this._saveLoginData(
|
||||
LoginResponseSchema.parse({
|
||||
token: data.token,
|
||||
refreshToken: data.refreshToken,
|
||||
user: data.user ?? { id: data.userId },
|
||||
}),
|
||||
LoginStatus.Facebook,
|
||||
);
|
||||
return LoginStatus.Facebook;
|
||||
await this._saveLoginData(response, response.loginStatus);
|
||||
return response.loginStatus;
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -71,12 +71,8 @@ export interface IAuthRepository {
|
||||
psid?: string;
|
||||
}): Promise<Result<void>>;
|
||||
|
||||
/** 通过 Facebook PSID 直接登录或返回游客态。 */
|
||||
facebookPsidLogin(input: {
|
||||
psid: string;
|
||||
deviceId?: string;
|
||||
bindToGuest?: boolean;
|
||||
}): Promise<Result<LoginStatus>>;
|
||||
/** 消费一次性充值登录凭证并建立正式会话。 */
|
||||
consumeTopUpHandoff(handoffToken: string): Promise<Result<LoginStatus>>;
|
||||
|
||||
/** 刷新 token:先读本地的 refresh token,空则返回错误。 */
|
||||
refreshToken(): Promise<Result<RefreshTokenResponse>>;
|
||||
|
||||
Reference in New Issue
Block a user