projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refs #master Merge branch 'origin/master' into 13901-services-repo
[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 5878dc6ed5f01e9dc5657d122d41239fc005554d..f96edc79a08acd2e1079a4785b6aafd9f31a6edb 100644
(file)
--- a/
src/services/auth-service/auth-service.ts
+++ b/
src/services/auth-service/auth-service.ts
@@
-2,10
+2,8
@@
//
// SPDX-License-Identifier: AGPL-3.0
//
// SPDX-License-Identifier: AGPL-3.0
-import { API_HOST, serverApi } from "../../common/api/server-api";
import { User } from "../../models/user";
import { User } from "../../models/user";
-import { Dispatch } from "redux";
-import actions from "../../store/auth/auth-action";
+import { AxiosInstance } from "../../../node_modules/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';
@@
-23,7
+21,11
@@
export interface UserDetailsResponse {
is_admin: boolean;
}
is_admin: boolean;
}
-export default class AuthService {
+export class AuthService {
+
+ 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);
@@
-37,6
+39,10
@@
export default class AuthService {
return localStorage.getItem(API_TOKEN_KEY) || undefined;
}
return localStorage.getItem(API_TOKEN_KEY) || undefined;
}
+ public getUuid() {
+ return localStorage.getItem(USER_UUID_KEY) || undefined;
+ }
+
public getOwnerUuid() {
return localStorage.getItem(USER_OWNER_UUID_KEY) || undefined;
}
public getOwnerUuid() {
return localStorage.getItem(USER_OWNER_UUID_KEY) || undefined;
}
@@
-71,21
+77,24
@@
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 = () => (dispatch: Dispatch): Promise<void> => {
- dispatch(actions.USER_DETAILS_REQUEST());
- return serverApi
+ public getUserDetails = (): Promise<User> => {
+ return this.apiClient
.get<UserDetailsResponse>('/users/current')
.get<UserDetailsResponse>('/users/current')
- .then(resp => {
- dispatch(actions.USER_DETAILS_SUCCESS(resp.data));
- });
+ .then(resp => ({
+ email: resp.data.email,
+ firstName: resp.data.first_name,
+ lastName: resp.data.last_name,
+ uuid: resp.data.uuid,
+ ownerUuid: resp.data.owner_uuid
+ }));
}
public getRootUuid() {
}
public getRootUuid() {