Add channel to user auth

dgopsq · Sep 8, 2023 · a7d37e3 · a7d37e3
1 parent 26a2d16
commit a7d37e3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/src/components/user/ChangeEmail.tsx b/src/components/user/ChangeEmail.tsx
@@ -27,6 +27,7 @@ export const ChangeEmail: React.FC = () => {
           password: data.oldPassword,
           newEmail: data.newEmail,
           redirectUrl: generateFullUrl(publicConfig.emailChangeRedirectPath),
+          channel: publicConfig.defaultChannel,
         },
         errorPolicy: "ignore",
       });

diff --git a/src/components/user/EmailConfirmation.tsx b/src/components/user/EmailConfirmation.tsx
@@ -2,6 +2,7 @@
 
 import { UserConfirmEmailChangeDocument } from "@/__generated__/graphql";
 import { errorToast, successToast } from "@/components/core/Notifications";
+import { publicConfig } from "@/misc/config";
 import { logger } from "@/misc/logger";
 import { getStoredAuthToken } from "@/queries/user/token";
 import { useMutation } from "@apollo/client";
@@ -24,7 +25,10 @@ export const EmailConfirmation: React.FC = () => {
 
     if (!token || !authToken) return;
 
-    confirmEmail({ variables: { token }, errorPolicy: "ignore" });
+    confirmEmail({
+      variables: { token, channel: publicConfig.defaultChannel },
+      errorPolicy: "ignore",
+    });
   }, [confirmEmail, authToken]);
 
   useEffect(() => {

diff --git a/src/components/user/Signup.tsx b/src/components/user/Signup.tsx
@@ -33,6 +33,7 @@ export const Signup: React.FC<Props> = ({ hideLoginLink, initialValues }) => {
           account: {
             ...values,
             redirectUrl: generateFullUrl(publicConfig.signupRedirectPath),
+            channel: publicConfig.defaultChannel,
           },
         },
         onCompleted: (data) => {

diff --git a/src/queries/user/user.graphql b/src/queries/user/user.graphql
@@ -111,11 +111,13 @@ mutation UserEmailChange(
   $newEmail: String!
   $password: String!
   $redirectUrl: String!
+  $channel: String!
 ) {
   requestEmailChange(
     newEmail: $newEmail
     password: $password
     redirectUrl: $redirectUrl
+    channel: $channel
   ) {
     errors {
       code
@@ -128,8 +130,8 @@ mutation UserEmailChange(
   }
 }
 
-mutation UserConfirmEmailChange($token: String!) {
-  confirmEmailChange(token: $token) {
+mutation UserConfirmEmailChange($token: String!, $channel: String!) {
+  confirmEmailChange(token: $token, channel: $channel) {
     errors {
       code
       message