Skip to content

Commit

Permalink
fix: rename auto_code to code
Browse files Browse the repository at this point in the history
  • Loading branch information
aidenlu committed May 24, 2024
1 parent c67acaa commit a151f48
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 12 deletions.
5 changes: 0 additions & 5 deletions packages/connectors/connector-dingtalk-web/src/constant.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@ export const accessTokenEndpoint = 'https://api.dingtalk.com/v1.0/oauth2/userAcc
export const userInfoEndpoint = 'https://api.dingtalk.com/v1.0/contact/users/me';
export const scope = 'openid corpid';

// See https://open.dingtalk.com/document/orgapp/obtain-identity-credentials to know more about WeChat response error code
export const invalidAuthCodeErrcode = [40_029, 40_163, 42_003];

export const invalidAccessTokenErrcode = [40_001, 40_014];

export const defaultMetadata: ConnectorMetadata = {
id: 'dingtalk-web',
target: 'dingtalk',
Expand Down
8 changes: 4 additions & 4 deletions packages/connectors/connector-dingtalk-web/src/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ describe('Dingtalk connector', () => {
const connector = await createConnector({ getConfig });
const socialUserInfo = await connector.getUserInfo(
{
auth_code: 'code',
code: 'code',
},
vi.fn()
);
Expand All @@ -117,23 +117,23 @@ describe('Dingtalk connector', () => {
it('throws SocialAccessTokenInvalid error if remote response code is 401', async () => {
nock(userInfoEndpoint).get('').reply(401);
const connector = await createConnector({ getConfig });
await expect(connector.getUserInfo({ auth_code: 'code' }, vi.fn())).rejects.toStrictEqual(
await expect(connector.getUserInfo({ code: 'code' }, vi.fn())).rejects.toStrictEqual(
new ConnectorError(ConnectorErrorCodes.SocialAccessTokenInvalid)
);
});

it('throws right accessToken but empty userInfo if remote response code is 404', async () => {
nock(userInfoEndpoint).get('').reply(404);
const connector = await createConnector({ getConfig });
await expect(connector.getUserInfo({ auth_code: 'code' }, vi.fn())).rejects.toStrictEqual(
await expect(connector.getUserInfo({ code: 'code' }, vi.fn())).rejects.toStrictEqual(
new ConnectorError(ConnectorErrorCodes.InvalidResponse, 'user_not_found')
);
});

it('throws unrecognized error', async () => {
nock(userInfoEndpoint).get('').reply(500);
const connector = await createConnector({ getConfig });
await expect(connector.getUserInfo({ auth_code: 'code' }, vi.fn())).rejects.toThrow();
await expect(connector.getUserInfo({ code: 'code' }, vi.fn())).rejects.toThrow();
});
});
});
4 changes: 2 additions & 2 deletions packages/connectors/connector-dingtalk-web/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,10 @@ export const getAccessToken = async (
const getUserInfo =
(getConfig: GetConnectorConfig): GetUserInfo =>
async (data) => {
const { auth_code } = await authorizationCallbackHandler(data);
const { code } = await authorizationCallbackHandler(data);
const config = await getConfig(defaultMetadata.id);
validateConfig(config, dingtalkConfigGuard);
const { accessToken } = await getAccessToken(auth_code, config);
const { accessToken } = await getAccessToken(code, config);

try {
const httpResponse = await got.get(userInfoEndpoint, {
Expand Down
2 changes: 1 addition & 1 deletion packages/connectors/connector-dingtalk-web/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ export type UserInfoResponse = z.infer<typeof userInfoResponseGuard>;

export type UserInfoResponseMessageParser = (userInfo: Partial<UserInfoResponse>) => void;

export const authResponseGuard = z.object({ auth_code: z.string() });
export const authResponseGuard = z.object({ code: z.string() });

0 comments on commit a151f48

Please sign in to comment.