projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge lates changes
[arvados.git]
/
src
/
services
/
auth-service
/
auth-service.ts
diff --git
a/src/services/auth-service/auth-service.ts
b/src/services/auth-service/auth-service.ts
index 5b21a61634be451a75841435e156e265ab0136a7..57915f70578f04be4afd19ef8d6de2543b1cdf3b 100644
(file)
--- a/
src/services/auth-service/auth-service.ts
+++ b/
src/services/auth-service/auth-service.ts
@@
-2,9
+2,8
@@
//
// SPDX-License-Identifier: AGPL-3.0
//
// SPDX-License-Identifier: AGPL-3.0
-import { API_HOST } from "../../common/api/server-api";
-import { User } from "../../models/user";
-import { AxiosInstance } from "../../../node_modules/axios";
+import { User } from "~/models/user";
+import { AxiosInstance } from "axios";
export const API_TOKEN_KEY = 'apiToken';
export const USER_EMAIL_KEY = 'userEmail';
export const API_TOKEN_KEY = 'apiToken';
export const USER_EMAIL_KEY = 'userEmail';
@@
-22,9
+21,11
@@
export interface UserDetailsResponse {
is_admin: boolean;
}
is_admin: boolean;
}
-export
default
class AuthService {
+export class AuthService {
- constructor(protected serverApi: AxiosInstance) { }
+ constructor(
+ protected apiClient: AxiosInstance,
+ protected baseUrl: string) { }
public saveApiToken(token: string) {
localStorage.setItem(API_TOKEN_KEY, token);
public saveApiToken(token: string) {
localStorage.setItem(API_TOKEN_KEY, token);
@@
-76,16
+77,16
@@
export default class AuthService {
public login() {
const currentUrl = `${window.location.protocol}//${window.location.host}/token`;
public login() {
const currentUrl = `${window.location.protocol}//${window.location.host}/token`;
- window.location.assign(`${
API_HOST
}/login?return_to=${currentUrl}`);
+ window.location.assign(`${
this.baseUrl || ""
}/login?return_to=${currentUrl}`);
}
public logout() {
const currentUrl = `${window.location.protocol}//${window.location.host}`;
}
public logout() {
const currentUrl = `${window.location.protocol}//${window.location.host}`;
- window.location.assign(`${
API_HOST
}/logout?return_to=${currentUrl}`);
+ window.location.assign(`${
this.baseUrl || ""
}/logout?return_to=${currentUrl}`);
}
public getUserDetails = (): Promise<User> => {
}
public getUserDetails = (): Promise<User> => {
- return this.
serverApi
+ return this.
apiClient
.get<UserDetailsResponse>('/users/current')
.then(resp => ({
email: resp.data.email,
.get<UserDetailsResponse>('/users/current')
.then(resp => ({
email: resp.data.email,