Skip to content

Commit 75df23b

Browse files
committed
resolve merge conflicts
2 parents 129db9f + 232bb80 commit 75df23b

File tree

24 files changed

+44607
-9119
lines changed

24 files changed

+44607
-9119
lines changed

.idea/inspectionProfiles/Project_Default.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/prettier.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/workspace.xml

Lines changed: 90 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

backend/graphql/index.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,16 @@ import resolverTypes from "./types/resolvers";
1313

1414
import participantResolvers from "./resolvers/participantResolver";
1515
import miscResolvers from "./resolvers/miscResolver";
16+
import authResolver from "./resolvers/auth";
1617

1718
const schema = makeExecutableSchema({
1819
typeDefs: [...scalarTypeDefs, dataModels, customTypes, resolverTypes],
19-
resolvers: merge(scalarResolvers, participantResolvers, miscResolvers),
20+
resolvers: merge(
21+
scalarResolvers,
22+
participantResolvers,
23+
miscResolvers,
24+
authResolver,
25+
),
2026
});
2127

2228
export default schema;

backend/graphql/resolvers/auth.ts

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
import { AuthenticationError } from "apollo-server-express";
2+
import { IAuthService } from "../../services/interface/auth";
3+
import AuthService from "../../services/implementation/auth";
4+
5+
const authService: IAuthService = new AuthService();
6+
7+
const authResolver = {
8+
Mutation: {
9+
login: async (
10+
_parent: undefined,
11+
{
12+
role,
13+
encryptedPassword,
14+
}: {
15+
role: string;
16+
encryptedPassword: string;
17+
},
18+
) => {
19+
try {
20+
return await authService.login(role, encryptedPassword);
21+
} catch (error) {
22+
if (error instanceof Error) {
23+
throw new AuthenticationError(error.message);
24+
} else {
25+
throw new AuthenticationError("An unknown error occurred");
26+
}
27+
}
28+
},
29+
},
30+
};
31+
32+
export default authResolver;

backend/graphql/types/models.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ const dataModels = gql`
3030
credit: Int!
3131
comment: String
3232
}
33+
34+
type AuthResponse {
35+
type: String!
36+
accessToken: String!
37+
}
3338
`;
3439

3540
export default dataModels;

backend/graphql/types/resolvers.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ const resolverTypes = gql`
99
}
1010
1111
type Mutation {
12+
login(role: String!, encryptedPassword: String!): AuthResponse
1213
createParticipant(
1314
participantId: String!
1415
roomNumber: Int!

0 commit comments

Comments
 (0)