refactor: google sign in with active terra profile status (#178)

src/components/Authentication/components/SessionController/SessionController.tsx

@@ -1,30 +1,19 @@
 import { useSession } from "next-auth/react";
-import React, { Fragment, useEffect, useMemo } from "react";
+import React, { Fragment, useEffect } from "react";
 import { updateAuthentication } from "../../../../providers/authentication/authentication/dispatch";
 import { useAuthentication } from "../../../../providers/authentication/authentication/hook";
-import { updateAuthorization } from "../../../../providers/authentication/authorization/dispatch";
-import { useAuthorization } from "../../../../providers/authentication/authorization/hook";
 import { SessionControllerProps } from "./types";
-import { mapAuthentication, mapAuthorization } from "./utils";
+import { mapAuthentication } from "./utils";
 
 export function SessionController({
   children,
 }: SessionControllerProps): JSX.Element {
   const { authenticationDispatch } = useAuthentication();
-  const { authorizationDispatch } = useAuthorization();
   const session = useSession();
-  const authentication = useMemo(() => mapAuthentication(session), [session]);
-  const authorization = useMemo(() => mapAuthorization(session), [session]);
 
   useEffect(() => {
-    authenticationDispatch?.(updateAuthentication(authentication));
-    authorizationDispatch?.(updateAuthorization(authorization));
-  }, [
-    authentication,
-    authenticationDispatch,
-    authorization,
-    authorizationDispatch,
-  ]);
+    authenticationDispatch?.(updateAuthentication(mapAuthentication(session)));
+  }, [authenticationDispatch, session]);
 
   return <Fragment>{children}</Fragment>;
 }

src/components/Authentication/components/SessionController/utils.ts

@@ -5,10 +5,6 @@ import {
   UpdateAuthenticationPayload,
   UserProfile,
 } from "../../../../providers/authentication/authentication/types";
-import {
-  AUTHORIZATION_STATUS,
-  UpdateAuthorizationStatusPayload,
-} from "../../../../providers/authentication/authorization/types";
 
 /**
  * Returns the authentication profile and status from the session context.
@@ -51,28 +47,10 @@ function mapAuthenticationStatus(
 ): AUTHENTICATION_STATUS {
   switch (status) {
     case "authenticated":
-      return AUTHENTICATION_STATUS.AUTHENTICATED;
+      return AUTHENTICATION_STATUS.DONE;
     case "loading":
       return AUTHENTICATION_STATUS.PENDING;
     default:
-      return AUTHENTICATION_STATUS.UNAUTHENTICATED;
-  }
-}
-
-/**
- * Maps the session context value to an authorization status.
- * @param session - Session context value.
- * @returns authorization status.
- */
-export function mapAuthorization(
-  session: SessionContextValue
-): UpdateAuthorizationStatusPayload {
-  switch (session.status) {
-    case "authenticated":
-      return AUTHORIZATION_STATUS.AUTHORIZED;
-    case "loading":
-      return AUTHORIZATION_STATUS.PENDING;
-    default:
-      return AUTHORIZATION_STATUS.UNAUTHORIZED;
+      return AUTHENTICATION_STATUS.DONE;
   }
 }

src/hooks/authentication/profile/useProfile.ts

@@ -1,6 +1,5 @@
-import { useAuth } from "../../../providers/authentication/auth/hook";
-import { AUTH_STATUS } from "../../../providers/authentication/auth/types";
 import { useAuthentication } from "../../../providers/authentication/authentication/hook";
+import { AUTHENTICATION_STATUS } from "../../../providers/authentication/authentication/types";
 import { UseProfile } from "./types";
 
 /**
@@ -9,13 +8,10 @@ import { UseProfile } from "./types";
  */
 export const useProfile = (): UseProfile => {
   const {
-    authState: { isAuthenticated, status },
-  } = useAuth();
-  const {
-    authenticationState: { profile },
+    authenticationState: { profile, status },
   } = useAuthentication();
   return {
-    isLoading: status === AUTH_STATUS.PENDING,
-    profile: isAuthenticated ? profile : undefined, // Release the profile only when the user is authenticated.
+    isLoading: status === AUTHENTICATION_STATUS.PENDING,
+    profile,
   };
 };

src/hooks/authentication/session/useSessionAuth.ts

@@ -3,72 +3,59 @@ import { updateAuthState } from "../../../providers/authentication/auth/dispatch
 import {
   AUTH_STATUS,
   AuthContextProps,
+  UpdateAuthStatePayload,
 } from "../../../providers/authentication/auth/types";
 import {
   AUTHENTICATION_STATUS,
   AuthenticationContextProps,
 } from "../../../providers/authentication/authentication/types";
-import {
-  AUTHORIZATION_STATUS,
-  AuthorizationContextProps,
-} from "../../../providers/authentication/authorization/types";
 
 export const useSessionAuth = ({
   authenticationReducer,
-  authorizationReducer,
   authReducer,
 }: {
   authenticationReducer: AuthenticationContextProps;
-  authorizationReducer: AuthorizationContextProps;
   authReducer: Omit<AuthContextProps, "service">;
 }): void => {
   const { authDispatch } = authReducer;
-  const { authenticationState } = authenticationReducer;
-  const { authorizationState } = authorizationReducer;
-  const isAuthenticated = isSessionAuthenticated(authenticationState.status);
-  const isAuthorized = isSessionAuthorized(authorizationState.status);
-  const status = getSessionStatus(
-    authenticationState.status,
-    authorizationState.status
-  );
+  const {
+    authenticationState: { profile, status },
+  } = authenticationReducer;
+  const isAuthenticated = !!profile;
 
   useEffect(() => {
-    authDispatch?.(updateAuthState({ isAuthenticated, isAuthorized, status }));
-  }, [authDispatch, isAuthenticated, isAuthorized, status]);
+    authDispatch?.(
+      updateAuthState(getSession(isAuthenticated, getSessionStatus(status)))
+    );
+  }, [authDispatch, isAuthenticated, status]);
 };
 
 /**
- * Returns the session status based on the authentication and authorization status.
- * @param authenticationStatus - Authentication status.
- * @param authorizationStatus - Authorization status.
- * @returns session status.
+ * Returns the auth session based on the authentication state.
+ * @param isAuthenticated - Authentication status.
+ * @param status - Auth status.
+ * @returns auth state payload.
  */
-function getSessionStatus(
-  authenticationStatus: AUTHENTICATION_STATUS,
-  authorizationStatus: AUTHORIZATION_STATUS
-): AUTH_STATUS {
-  if (
-    authenticationStatus === AUTHENTICATION_STATUS.PENDING ||
-    authorizationStatus === AUTHORIZATION_STATUS.PENDING
-  )
-    return AUTH_STATUS.PENDING;
-  return AUTH_STATUS.DONE;
+function getSession(
+  isAuthenticated: boolean,
+  status: AUTH_STATUS
+): UpdateAuthStatePayload {
+  switch (status) {
+    case AUTH_STATUS.PENDING:
+      return { isAuthenticated: false, status };
+    case AUTH_STATUS.DONE:
+      return { isAuthenticated, status };
+    default:
+      return { isAuthenticated: false, status };
+  }
 }
 
 /**
- * Returns true if the session is authenticated.
+ * Returns the session status based on the authentication status.
  * @param status - Authentication status.
- * @returns true if the session is authenticated.
- */
-function isSessionAuthenticated(status: AUTHENTICATION_STATUS): boolean {
-  return status === AUTHENTICATION_STATUS.AUTHENTICATED;
-}
-
-/**
- * Returns true if the session is authorized.
- * @param status - Authorization status.
- * @returns true if the session is authorized.
+ * @returns session status.
  */
-function isSessionAuthorized(status: AUTHORIZATION_STATUS): boolean {
-  return status === AUTHORIZATION_STATUS.AUTHORIZED;
+function getSessionStatus(status: AUTHENTICATION_STATUS): AUTH_STATUS {
+  if (status === AUTHENTICATION_STATUS.PENDING) return AUTH_STATUS.PENDING;
+  return AUTH_STATUS.DONE;
 }

src/providers/authentication/auth/constants.ts

@@ -2,6 +2,5 @@ import { AUTH_STATUS, AuthState } from "./types";
 
 export const DEFAULT_AUTH_STATE: AuthState = {
   isAuthenticated: false,
-  isAuthorized: false,
   status: AUTH_STATUS.PENDING,
 };

src/providers/authentication/auth/types.ts

@@ -17,7 +17,6 @@ export interface AuthContextProps {
 export interface AuthState {
   initialState?: AuthState;
   isAuthenticated: boolean;
-  isAuthorized: boolean;
   status: AUTH_STATUS;
 }
 
@@ -49,6 +48,5 @@ export interface UpdateAuthStateAction {
 
 export interface UpdateAuthStatePayload {
   isAuthenticated?: boolean;
-  isAuthorized?: boolean;
   status?: AUTH_STATUS;
 }

src/providers/authentication/authentication/dispatch.ts

@@ -1,11 +1,23 @@
 import {
+  AUTHENTICATION_STATUS,
   AuthenticationActionKind,
   RequestAuthenticationAction,
   ResetStateAction,
   UpdateAuthenticationAction,
   UpdateAuthenticationPayload,
 } from "./types";
 
+/**
+ * Authentication is complete.
+ * @returns Action.
+ */
+export function authenticationComplete(): UpdateAuthenticationAction {
+  return {
+    payload: { status: AUTHENTICATION_STATUS.DONE },
+    type: AuthenticationActionKind.UpdateAuthentication,
+  };
+}
+
 /**
  * Request authentication action.
  * @returns Action.

src/providers/authentication/authentication/types.ts

@@ -1,9 +1,8 @@
 import { Dispatch } from "react";
 
 export enum AUTHENTICATION_STATUS {
-  AUTHENTICATED = "AUTHENTICATED",
+  DONE = "DONE",
   PENDING = "PENDING",
-  UNAUTHENTICATED = "UNAUTHENTICATED",
 }
 
 export type AuthenticationAction =