Merge branch 'master' into 13883-arrow-animation-is-not-working-after-loading

[arvados-workbench2.git] / src / store / auth / auth-action.ts

diff --git a/src/store/auth/auth-action.ts b/src/store/auth/auth-action.ts
index dbf9a0f4190db63905525b41f3185787d25e86f8..e9930a02836da5d66c7e062813a5fd292784f973 100644 (file)
--- a/src/store/auth/auth-action.ts
+++ b/src/store/auth/auth-action.ts
@@ -2,41 +2,29 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { serverApi } from "../../common/server-api";
 import { ofType, default as unionize, UnionOf } from "unionize";
 import { Dispatch } from "redux";
+import { authService } from "../../services/services";
+import { User } from "../../models/user";
 
-export interface UserDetailsResponse {
-    email: string;
-    first_name: string;
-    last_name: string;
-    is_admin: boolean;
-}
-
-const actions = unionize({
+export const authActions = unionize({
     SAVE_API_TOKEN: ofType<string>(),
     LOGIN: {},
     LOGOUT: {},
     INIT: {},
     USER_DETAILS_REQUEST: {},
-    USER_DETAILS_SUCCESS: ofType<UserDetailsResponse>()
+    USER_DETAILS_SUCCESS: ofType<User>()
 }, {
     tag: 'type',
     value: 'payload'
 });
 
-export type AuthAction = UnionOf<typeof actions>;
-export default actions;
-
-export const getUserDetails = () => (dispatch: Dispatch) => {
-    dispatch(actions.USER_DETAILS_REQUEST());
-    serverApi
-        .get<UserDetailsResponse>('/users/current')
-        .then(resp => {
-            dispatch(actions.USER_DETAILS_SUCCESS(resp.data));
-        })
-        // .catch(err => {
-        // });
+export const getUserDetails = () => (dispatch: Dispatch): Promise<User> => {
+    dispatch(authActions.USER_DETAILS_REQUEST());
+    return authService.getUserDetails().then(details => {
+        dispatch(authActions.USER_DETAILS_SUCCESS(details));
+        return details;
+    });
 };
 
-
+export type AuthAction = UnionOf<typeof authActions>;