Skip to content

Commit ac7e7b1

Browse files
committed
Fix: Add admin role for admin users
1 parent 316e9c8 commit ac7e7b1

File tree

1 file changed

+38
-20
lines changed

1 file changed

+38
-20
lines changed

src/user/user.service.ts

Lines changed: 38 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -285,35 +285,53 @@ export class UserService {
285285
.getUserById(fusionAuthUser.user.id)
286286
.then((userDBResponse) => userDBResponse.results[0])
287287
.then((userDBResponse): SignupResponse => {
288-
console.log(userDBResponse);
289-
const response: SignupResponse = new SignupResponse().init(
290-
uuidv4(),
291-
);
292-
if (userDBResponse.account_status !== 'ACTIVE') {
293-
delete fusionAuthUser.refreshToken;
294-
delete fusionAuthUser.token;
288+
if (!userDBResponse) {
289+
//Admin User
290+
const response: SignupResponse = new SignupResponse().init(
291+
uuidv4(),
292+
);
293+
console.log({ fusionAuthUser });
295294
response.responseCode = ResponseCode.OK;
296295
response.result = {
297296
responseMsg: 'Successful Logged In',
298-
accountStatus: AccountStatus[userDBResponse?.account_status],
297+
accountStatus: AccountStatus.ACTIVE,
299298
data: {
300299
user: fusionAuthUser,
301-
schoolResponse: userDBResponse,
302300
},
303301
};
302+
return response;
304303
} else {
305-
response.responseCode = ResponseCode.OK;
306-
response.result = {
307-
responseMsg: 'Successful Logged In',
308-
accountStatus: AccountStatus[userDBResponse?.account_status],
309-
data: {
310-
user: fusionAuthUser,
311-
schoolResponse: userDBResponse,
312-
},
313-
};
304+
console.log(userDBResponse);
305+
const response: SignupResponse = new SignupResponse().init(
306+
uuidv4(),
307+
);
308+
if (userDBResponse.account_status !== 'ACTIVE') {
309+
delete fusionAuthUser.refreshToken;
310+
delete fusionAuthUser.token;
311+
response.responseCode = ResponseCode.OK;
312+
response.result = {
313+
responseMsg: 'Successful Logged In',
314+
accountStatus:
315+
AccountStatus[userDBResponse?.account_status],
316+
data: {
317+
user: fusionAuthUser,
318+
schoolResponse: userDBResponse,
319+
},
320+
};
321+
} else {
322+
response.responseCode = ResponseCode.OK;
323+
response.result = {
324+
responseMsg: 'Successful Logged In',
325+
accountStatus:
326+
AccountStatus[userDBResponse?.account_status],
327+
data: {
328+
user: fusionAuthUser,
329+
schoolResponse: userDBResponse,
330+
},
331+
};
332+
}
333+
return response;
314334
}
315-
316-
return response;
317335
})
318336
.catch((e: ClientResponse<LoginResponse>): SignupResponse => {
319337
console.log(e);

0 commit comments

Comments
 (0)