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.

Sign up for GitHub

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

Jump to bottom

Fix: saving logbook token in memory #725

Merged
merged 11 commits into from
Sep 20, 2023
Merged

Fix: saving logbook token in memory #725

Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6efe728
fix: saving logbook token in memory
Junjiequan Sep 11, 2023
9fbbc80
Merge branch 'master' into SWAP-3487-scicat-fix-test-fail-for-the-loo…
Junjiequan Sep 11, 2023
7f24a71
fix: minor naming change
Junjiequan Sep 11, 2023
c79e428
feat: included unit testing for logbooks
Junjiequan Sep 11, 2023
61060ae
fix: minor refactor of if check for re-login
Junjiequan Sep 12, 2023
81c074d
fix: removed headers from request
Junjiequan Sep 12, 2023
8a19493
fix: remove synapse auth from scicat BE
Junjiequan Sep 20, 2023
e871b48
fix: adjust test for new change
Junjiequan Sep 20, 2023
8187d27
fix: minor fix for test
Junjiequan Sep 20, 2023
01d03a5
Merge branch 'master' into SWAP-3487-scicat-fix-test-fail-for-the-loo…
Junjiequan Sep 20, 2023
df73d73
fix: minor ENV change for loopback e2e environment
Junjiequan Sep 20, 2023
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
50 changes: 42 additions & 8 deletions src/logbooks/logbooks.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export class LogbooksService {
private baseUrl;
private username;
private password;
private accessToken: string | null;

constructor(
private readonly configService: ConfigService,
Expand All @@ -27,13 +28,17 @@ export class LogbooksService {
this.password = this.configService.get<string>("logbook.password");
}

async login(username: string, password: string): Promise<{ token: string }> {
async login(
username: string,
password: string,
): Promise<{ token: string | null }> {
const credentials = { username, password };
try {
const res = await firstValueFrom(
this.httpService.post(this.baseUrl + "/Users/login", credentials),
);
return res.data;
this.accessToken = res.data.token;
return { token: this.accessToken };
} catch (error) {
handleAxiosRequestError(error, "LogbooksService.login");
throw new InternalServerErrorException("Logbook login failed");
Expand All @@ -44,11 +49,15 @@ export class LogbooksService {
if (this.logbookEnabled) {
if (this.username && this.password) {
try {
const accessToken = await this.login(this.username, this.password);
await this.checkTokenStatus();
if (!this.accessToken) {
await this.login(this.username, this.password);
}

Logger.log("Fetching Logbooks", "LogbooksService.findAll");
const res = await firstValueFrom(
this.httpService.get<Logbook[]>(this.baseUrl + "/Logbooks", {
headers: { Authorization: `Bearer ${accessToken.token}` },
headers: { Authorization: `Bearer ${this.accessToken}` },
}),
);
const nonEmptyLogbooks = res.data.filter(
Expand Down Expand Up @@ -84,13 +93,16 @@ export class LogbooksService {
if (this.logbookEnabled) {
if (this.username && this.password) {
try {
const accessToken = await this.login(this.username, this.password);
await this.checkTokenStatus();
if (!this.accessToken) {
await this.login(this.username, this.password);
}
Logger.log("Fetching logbook " + name, "LogbooksService.findByName");
Logger.log(filters, "LogbooksService.findByName");
const res = await firstValueFrom(
this.httpService.get<Logbook>(
this.baseUrl + `/Logbooks/${name}?filter=${filters}`,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as my previous comment

{ headers: { Authorization: `Bearer ${accessToken.token}` } },
{ headers: { Authorization: `Bearer ${this.accessToken}` } },
),
);
Logger.log("Found logbook " + name, "LogbooksService.findByName");
Expand Down Expand Up @@ -132,7 +144,10 @@ export class LogbooksService {
if (this.logbookEnabled) {
if (this.username && this.password) {
try {
const accessToken = await this.login(this.username, this.password);
await this.checkTokenStatus();
if (!this.accessToken) {
await this.login(this.username, this.password);
}
Logger.log(
"Sending message to room " + name,
"LogbooksService.sendMessage",
Expand All @@ -141,7 +156,7 @@ export class LogbooksService {
this.httpService.post<{ event_id: string }>(
this.baseUrl + `/Logbooks/${name}/message`,
data,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above

{ headers: { Authorization: `Bearer ${accessToken.token}` } },
{ headers: { Authorization: `Bearer ${this.accessToken}` } },
),
);
Logger.log(
Expand All @@ -163,6 +178,25 @@ export class LogbooksService {
}
return null;
}

async checkTokenStatus() {
try {
const res = await firstValueFrom(
this.httpService.get(this.baseUrl + "/Users/getTokenStatus"),
);
const shouldRenewToken = res.data;

if (shouldRenewToken) {
this.accessToken = null;
}
return;
} catch (error) {
handleAxiosRequestError(error, "LogbooksService.getLoopbackServerStatus");
throw new InternalServerErrorException(
"Logbook get loopback server status failed",
);
}
}
}

const sortMessages = (messages: Message[], sortField: string): Message[] => {
Expand Down
Loading