Skip to content

Commit de46f78

Browse files
authored
Reinsert token in cypress scripts. Re-add some lost error handling (#591)
1 parent a663aef commit de46f78

File tree

3 files changed

+32
-6
lines changed

3 files changed

+32
-6
lines changed

cypress/support/commands.js

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,22 @@ Cypress.Commands.add(
4646
}).then(resp => {
4747
expect(resp.status).to.eq(200);
4848
const jwt = resp.body;
49+
const currentTime = new Date();
50+
const accessTokenExpiry = new Date(
51+
currentTime.getTime() + jwt.expires_in * 100000
52+
).toISOString();
53+
const refreshTokenExpiry = new Date(
54+
currentTime.getTime() + jwt.refresh_expires_in * 100000
55+
).toISOString();
56+
57+
var elToken = {
58+
accessToken: jwt.access_token,
59+
accessTokenExpiry: accessTokenExpiry,
60+
refreshToken: jwt.refresh_token,
61+
refreshTokenExpiry: refreshTokenExpiry,
62+
};
63+
64+
window.localStorage.setItem('token', JSON.stringify(elToken));
4965

5066
window.localStorage.setItem('e2e_access_token', jwt.access_token);
5167
window.localStorage.setItem('e2e_refresh_token', jwt.refresh_token);

src/packages/api_v1_sdk/apiv1_category_service.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ import {
33
CategoryFilter,
44
CategorySortOrder,
55
} from '../../services/category_service/category_service';
6-
import { handleAxiosResponseErrors } from './http_error_handlers';
76
import { EngagementJsonSerializer } from '../../serializers/engagement/engagement_json_serializer';
87
import { getApiV1HttpClient } from './client';
98
import { CategoryWithCount } from '../../schemas/engagement_category';
9+
import { ConsoleLogger } from '../../utilities/logger/loggers';
10+
import { LogVerbosity } from '../../utilities/logger/logger';
1011

1112
export class Apiv1CategoryService implements CategoryService {
1213
private get axios() {
@@ -73,11 +74,7 @@ export class Apiv1CategoryService implements CategoryService {
7374
);
7475
return serializedCategories;
7576
} catch (e) {
76-
if (e.isAxiosError) {
77-
handleAxiosResponseErrors(e);
78-
} else {
79-
throw e;
80-
}
77+
ConsoleLogger(LogVerbosity.error).error("fetch category failure", e);
8178
}
8279
}
8380
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import { LogVerbosity } from "../../utilities/logger/logger";
2+
import { ConsoleLogger } from "../../utilities/logger/loggers";
3+
4+
interface AxiosError {
5+
response: {
6+
status: number;
7+
};
8+
}
9+
10+
export function handleAxiosResponseErrors(error: AxiosError) {
11+
ConsoleLogger(LogVerbosity.error).error("Axios Error", error);
12+
throw error;
13+
}

0 commit comments

Comments
 (0)