Skip to content

refactor(auth): remove organization login mutation and simplify login… #36

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

Merged
igorihimbazwe merged 1 commit into from
Dec 4, 2025
+60 −86
Merged

refactor(auth): remove organization login mutation and simplify login… #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 6 additions & 20 deletions app/auth/login/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { mainUrl } from '@/helpers/baseUrl';
import Button from '../../../components/ui/Button-ant';
import InputPassword from '@/components/ui/InputPassword';
import Input from 'antd/es/input';
import { useLoginMutation, useLoginOrganizationMutation } from '@/states/authentication';
import { useLoginMutation } from '@/states/authentication';
import { ClipLoader } from 'react-spinners';
import { useAuthToken } from '@/hooks/use-auth-token';

Expand Down Expand Up @@ -75,7 +75,6 @@ const LoginForm: React.FC = () => {
const returnUrl = searchParams.get('returnUrl') || '/home';

const [login, { isLoading }] = useLoginMutation();
const [loginOrganization, { isLoading: isOrgLoading }] = useLoginOrganizationMutation();
const { setToken, getToken } = useAuthToken();
const { getTokenInfo, decodeToken } = useTokenInfo();

Expand Down Expand Up @@ -131,19 +130,7 @@ const LoginForm: React.FC = () => {

const onSubmit = async (data: LoginFormInputs) => {
try {

// Try organization login first, then fall back to regular login
let response;
let isOrganization = false;

try {
response = await loginOrganization(data).unwrap();
isOrganization = true;
} catch (orgError) {
response = await login(data).unwrap();
isOrganization = false;
}

const response = await login(data).unwrap();
const { token, account } = response;

setToken(token);
Expand All @@ -155,8 +142,7 @@ const LoginForm: React.FC = () => {
}

// Determine account type for appropriate messaging
const accountType = isOrganization ? 'organization' : (tokenInfo.accountType || 'user');
const entityType = accountType === 'organization' ? 'Organization' : 'User';
const accountType = tokenInfo.accountType || 'user';

notification.success({
message: 'Login Successful',
Expand Down Expand Up @@ -343,9 +329,9 @@ const LoginForm: React.FC = () => {
htmlType="submit"
type="primary"
className="w-full !mt-4"
disabled={isLoading || isOrgLoading}
disabled={isLoading}
>
{(isLoading || isOrgLoading) ? (
{isLoading ? (
<div className="flex items-center justify-center">
<ClipLoader color='#ffffff' size={20} />
<span className="ml-2">Signing in...</span>
Expand All @@ -366,7 +352,7 @@ const LoginForm: React.FC = () => {
icon={<GoogleOutlined />}
className="w-full flex justify-center items-center bg-gray-100 border-gray-300 text-gray-700 hover:text-white"
onClick={handleGoogleLogin}
disabled={isLoading || isOrgLoading}
disabled={isLoading}
>
Sign in with Google
</Button>
Expand Down
112 changes: 54 additions & 58 deletions app/home/transfer/amount/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,11 +274,6 @@ const AmountPage = () => {
return;
}

if (!selectedCategory) {
setError("Please select a transaction category");
return;
}

// Validate constraints requirements for individual user transfers
if (recipient.type !== 'organization' && applyConstraints && !selectedCategory) {
setError("Please select a category when applying spending constraints");
Expand Down Expand Up @@ -477,59 +472,7 @@ const AmountPage = () => {
</div>
</div>

{/* Category Selection - Only show for individual users, not organizations */}
{recipient.type !== 'organization' && (
<div className="bg-white rounded-3xl p-6 mb-6 shadow-sm border border-gray-100">
<label className="block text-sm font-medium text-gray-700 mb-4">
Select Category
</label>

{categoriesLoading ? (
<div className="text-center py-4 text-gray-500">
<div className="animate-pulse">Loading categories...</div>
</div>
) : categories.length === 0 ? (
<div className="text-center py-4 text-gray-500">
<p>No categories available</p>
<button
onClick={() => {
setCategoriesLoading(true);
getTransactionCategories()
.then((response: any) => {
if (response.data?.success && response.data?.data) {
setCategories(response.data.data);
}
})
.catch((err) => console.error('Retry failed:', err))
.finally(() => setCategoriesLoading(false));
}}
className="mt-2 text-green-600 hover:text-green-700 text-sm font-medium"
>
Try Again
</button>
</div>
) : (
<div className="grid grid-cols-2 gap-3">
{categories.map((category) => (
<button
key={category.id}
onClick={() => {
setSelectedCategory(category);
}}
className={`py-3 px-4 rounded-xl font-medium transition text-left ${selectedCategory?.id === category.id
? 'bg-green-600 text-white'
: 'bg-gray-100 text-gray-700 hover:bg-gray-200'
}`}
>
{category.name}
</button>
))}
</div>
)}
</div>
)}

{/* Apply Constraints Toggle - Only show for individual users, not organizations */}
{/* Apply Constraints Toggle & Category - Only show for individual users, not organizations */}
{recipient.type !== 'organization' && (
<div className="bg-white rounded-3xl p-6 mb-6 shadow-sm border border-gray-100">
<div className="flex items-center justify-between">
Expand All @@ -553,6 +496,59 @@ const AmountPage = () => {
</button>
</div>

{/* Category Selection - only when constraints are enabled */}
{applyConstraints && (
<div className="mt-4">
<label className="block text-sm font-medium text-gray-700 mb-3">
Select Category
</label>

{categoriesLoading ? (
<div className="text-center py-4 text-gray-500">
<div className="animate-pulse">Loading categories...</div>
</div>
) : categories.length === 0 ? (
<div className="text-center py-4 text-gray-500">
<p>No categories available</p>
<button
onClick={() => {
setCategoriesLoading(true);
getTransactionCategories()
.then((response: any) => {
if (response.data?.success && response.data?.data) {
setCategories(response.data.data);
}
})
.catch((err) => console.error('Retry failed:', err))
.finally(() => setCategoriesLoading(false));
}}
className="mt-2 text-green-600 hover:text-green-700 text-sm font-medium"
>
Try Again
</button>
</div>
) : (
<div className="grid grid-cols-2 gap-3">
{categories.map((category) => (
<button
key={category.id}
onClick={() => {
setSelectedCategory(category);
}}
className={`py-3 px-4 rounded-xl font-medium transition text-left ${
selectedCategory?.id === category.id
? 'bg-green-600 text-white'
: 'bg-gray-100 text-gray-700 hover:bg-gray-200'
}`}
>
{category.name}
</button>
))}
</div>
)}
</div>
)}

{/* Constraints Warning */}
{applyConstraints && (
<div className="mt-4 p-4 bg-amber-50 border border-amber-200 rounded-xl">
Expand Down
8 changes: 0 additions & 8 deletions states/authentication.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,6 @@ export const authenticationSlice = apiSlice.injectEndpoints({
body: credentials,
}),
}),
loginOrganization: builder.mutation({
query: (credentials) => ({
url: '/organizations/login',
method: 'POST',
body: credentials,
}),
}),
registerUser: builder.mutation({
query: (userData) => ({
url: '/users/register',
Expand Down Expand Up @@ -72,7 +65,6 @@ export const authenticationSlice = apiSlice.injectEndpoints({

export const {
useLoginMutation,
useLoginOrganizationMutation,
useRegisterUserMutation,
useRegisterOrganizationMutation,
useVerifyOtpMutation,
Expand Down