Infrastructure/logto
0
Fork 0
mirror of https://github.com/logto-io/logto.git synced 2025-03-31 22:51:25 -05:00
Code Issues Activity

refactor(connector): refactor to resolve complexity lint in connectors (#1679)

Browse source
This commit is contained in:
Darcy Ye 2022-07-26 15:56:52 +08:00 • committed by GitHub
parent d74f731229
commit 6b128a71cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 53 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
packages/connector-google/src/index.ts
View file

@ -106,7 +106,6 @@ export default class GoogleConnector implements SocialConnectorInstance<GoogleCo
return { accessToken };
};
// eslint-disable-next-line complexity
public getUserInfo: GetUserInfo = async (data) => {
const { code, redirectUri } = await this.authorizationCallbackHandler(data);
const { accessToken } = await this.getAccessToken(code, redirectUri);
@ -134,17 +133,7 @@ export default class GoogleConnector implements SocialConnectorInstance<GoogleCo
name,
};
} catch (error: unknown) {
if (error instanceof HTTPError) {
const { statusCode, body: rawBody } = error.response;
if (statusCode === 401) {
throw new ConnectorError(ConnectorErrorCodes.SocialAccessTokenInvalid);
}
throw new ConnectorError(ConnectorErrorCodes.General, JSON.stringify(rawBody));
}
throw error;
return this.getUserInfoErrorHandler(error);
}
};
@ -157,4 +146,18 @@ export default class GoogleConnector implements SocialConnectorInstance<GoogleCo
return result.data;
};
private readonly getUserInfoErrorHandler = (error: unknown) => {
if (error instanceof HTTPError) {
const { statusCode, body: rawBody } = error.response;
if (statusCode === 401) {
throw new ConnectorError(ConnectorErrorCodes.SocialAccessTokenInvalid);
}
throw new ConnectorError(ConnectorErrorCodes.General, JSON.stringify(rawBody));
}
throw error;
};
}

33
packages/connector-wechat-native/src/index.ts
View file

@ -31,7 +31,7 @@ import {
accessTokenResponseGuard,
GetAccessTokenErrorHandler,
userInfoResponseGuard,
GetUserInfoErrorHandler,
UserInfoResponseMessageParser,
WechatNativeConfig,
} from './types';
@ -107,7 +107,6 @@ export default class WechatNativeConnector implements SocialConnectorInstance<We
return { accessToken, openid };
};
// eslint-disable-next-line complexity
public getUserInfo: GetUserInfo = async (data) => {
const { code } = await this.authorizationCallbackHandler(data);
const { accessToken, openid } = await this.getAccessToken(code);
@ -129,21 +128,11 @@ export default class WechatNativeConnector implements SocialConnectorInstance<We
// Response properties of user info can be separated into two groups: (1) {unionid, headimgurl, nickname}, (2) {errcode, errmsg}.
// These two groups are mutually exclusive: if group (1) is not empty, group (2) should be empty and vice versa.
// 'errmsg' and 'errcode' turn to non-empty values or empty values at the same time. Hence, if 'errmsg' is non-empty then 'errcode' should be non-empty.
this.getUserInfoErrorHandler(result.data);
this.userInfoResponseMessageParser(result.data);
return { id: unionid ?? openid, avatar: headimgurl, name: nickname };
} catch (error: unknown) {
if (error instanceof HTTPError) {
const { statusCode, body: rawBody } = error.response;
if (statusCode === 401) {
throw new ConnectorError(ConnectorErrorCodes.SocialAccessTokenInvalid);
}
throw new ConnectorError(ConnectorErrorCodes.General, JSON.stringify(rawBody));
}
throw error;
return this.getUserInfoErrorHandler(error);
}
};
@ -161,7 +150,7 @@ export default class WechatNativeConnector implements SocialConnectorInstance<We
}
};
private readonly getUserInfoErrorHandler: GetUserInfoErrorHandler = (userInfo) => {
private readonly userInfoResponseMessageParser: UserInfoResponseMessageParser = (userInfo) => {
const { errcode, errmsg } = userInfo;
if (errcode) {
@ -174,6 +163,20 @@ export default class WechatNativeConnector implements SocialConnectorInstance<We
}
};
private readonly getUserInfoErrorHandler = (error: unknown) => {
if (error instanceof HTTPError) {
const { statusCode, body: rawBody } = error.response;
if (statusCode === 401) {
throw new ConnectorError(ConnectorErrorCodes.SocialAccessTokenInvalid);
}
throw new ConnectorError(ConnectorErrorCodes.General, JSON.stringify(rawBody));
}
throw error;
};
private readonly authorizationCallbackHandler = async (parameterObject: unknown) => {
const result = codeDataGuard.safeParse(parameterObject);

2
packages/connector-wechat-native/src/types.ts
View file

@ -32,4 +32,4 @@ export const userInfoResponseGuard = z.object({
export type UserInfoResponse = z.infer<typeof userInfoResponseGuard>;
export type GetUserInfoErrorHandler = (UserInfo: Partial<UserInfoResponse>) => void;
export type UserInfoResponseMessageParser = (userInfo: Partial<UserInfoResponse>) => void;

33
packages/connector-wechat-web/src/index.ts
View file

@ -32,7 +32,7 @@ import {
accessTokenResponseGuard,
GetAccessTokenErrorHandler,
userInfoResponseGuard,
GetUserInfoErrorHandler,
UserInfoResponseMessageParser,
WechatConfig,
} from './types';
@ -109,7 +109,6 @@ export default class WechatConnector implements SocialConnectorInstance<WechatCo
return { accessToken, openid };
};
// eslint-disable-next-line complexity
public getUserInfo: GetUserInfo = async (data) => {
const { code } = await this.authorizationCallbackHandler(data);
const { accessToken, openid } = await this.getAccessToken(code);
@ -131,21 +130,11 @@ export default class WechatConnector implements SocialConnectorInstance<WechatCo
// Response properties of user info can be separated into two groups: (1) {unionid, headimgurl, nickname}, (2) {errcode, errmsg}.
// These two groups are mutually exclusive: if group (1) is not empty, group (2) should be empty and vice versa.
// 'errmsg' and 'errcode' turn to non-empty values or empty values at the same time. Hence, if 'errmsg' is non-empty then 'errcode' should be non-empty.
this.getUserInfoErrorHandler(result.data);
this.userInfoResponseMessageParser(result.data);
return { id: unionid ?? openid, avatar: headimgurl, name: nickname };
} catch (error: unknown) {
if (error instanceof HTTPError) {
const { statusCode, body: rawBody } = error.response;
if (statusCode === 401) {
throw new ConnectorError(ConnectorErrorCodes.SocialAccessTokenInvalid);
}
throw new ConnectorError(ConnectorErrorCodes.General, JSON.stringify(rawBody));
}
throw error;
return this.getUserInfoErrorHandler(error);
}
};
@ -163,7 +152,7 @@ export default class WechatConnector implements SocialConnectorInstance<WechatCo
}
};
private readonly getUserInfoErrorHandler: GetUserInfoErrorHandler = (userInfo) => {
private readonly userInfoResponseMessageParser: UserInfoResponseMessageParser = (userInfo) => {
const { errcode, errmsg } = userInfo;
if (errcode) {
@ -176,6 +165,20 @@ export default class WechatConnector implements SocialConnectorInstance<WechatCo
}
};
private readonly getUserInfoErrorHandler = (error: unknown) => {
if (error instanceof HTTPError) {
const { statusCode, body: rawBody } = error.response;
if (statusCode === 401) {
throw new ConnectorError(ConnectorErrorCodes.SocialAccessTokenInvalid);
}
throw new ConnectorError(ConnectorErrorCodes.General, JSON.stringify(rawBody));
}
throw error;
};
private readonly authorizationCallbackHandler = async (parameterObject: unknown) => {
const result = codeDataGuard.safeParse(parameterObject);

2
packages/connector-wechat-web/src/types.ts
View file

@ -28,4 +28,4 @@ export const userInfoResponseGuard = z.object({
export type UserInfoResponse = z.infer<typeof userInfoResponseGuard>;
export type GetUserInfoErrorHandler = (UserInfo: Partial<UserInfoResponse>) => void;
export type UserInfoResponseMessageParser = (userInfo: Partial<UserInfoResponse>) => void;