chore: moving some of the change to the rest layer instead of graphql

GaloyMoney · Sep 11, 2023 · 7ccd2e0 · 7ccd2e0
1 parent 196c706
commit 7ccd2e0
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 23 deletions.
diff --git a/dev/apollo-federation/supergraph.graphql b/dev/apollo-federation/supergraph.graphql
@@ -129,7 +129,6 @@ type AuthTokenPayload
 {
   authToken: AuthToken
   errors: [Error!]!
-  id: ID!
   totpRequired: Boolean
 }
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -20,10 +20,7 @@ services:
       - lnd-outside-1
       - svix
       - lnd-outside-2
-      - otel-agent
-      - mailslurper
       - hydra
-      #! - consent
     restart: on-failure:10
   integration-deps:
     image: busybox
@@ -452,13 +449,6 @@ services:
     restart: on-failure
     depends_on:
       - postgresdhydra
-  #! consent:
-  #!   environment:
-  #!     - HYDRA_ADMIN_URL=http://hydra:4445
-  #!   image: oryd/hydra-login-consent-node:v2.1.2
-  #!   ports:
-  #!     - "3000:3000"
-  #!   restart: unless-stopped
   postgresdhydra:
     image: postgres:14.1
     environment:

diff --git a/docs/hydra.md b/docs/hydra.md
@@ -23,7 +23,7 @@ hydra-login-consent-node % yarn start
 
 On console 2:
 ```sh
-galoy % make start-deps
+galoy % make start
 ```
 
 On console 3:
@@ -46,7 +46,7 @@ code_client=$(hydra create client \
     --grant-type authorization_code,refresh_token \
     --response-type code,id_token \
     --format json \
-    --scope openid --scope offline \
+    --scope openid --scope offline --scope read \
     --redirect-uri http://127.0.0.1:5555/callback
 )
 

diff --git a/src/app/authentication/index.types.d.ts b/src/app/authentication/index.types.d.ts
@@ -21,6 +21,7 @@ type AddEmailToIdentityResult = {
 type LoginWithEmailResult = {
   authToken: AuthToken
   totpRequired: boolean
+  id?: UserId
 }
 
 type LoginWithPhoneTokenResult = {

diff --git a/src/app/authentication/login.ts b/src/app/authentication/login.ts
@@ -212,7 +212,7 @@ export const loginWithEmailToken = async ({
 
   const res = await authServiceEmail.loginToken({ email })
   if (res instanceof Error) throw res
-  return { authToken: res.authToken, totpRequired }
+  return { authToken: res.authToken, totpRequired, id: res.kratosUserId }
 }
 
 export const loginWithEmailCookie = async ({

diff --git a/src/graphql/admin/schema.graphql b/src/graphql/admin/schema.graphql
@@ -75,7 +75,6 @@ scalar AuthToken
 type AuthTokenPayload {
   authToken: AuthToken
   errors: [Error!]!
-  id: ID!
   totpRequired: Boolean
 }
 

diff --git a/src/graphql/public/schema.graphql b/src/graphql/public/schema.graphql
@@ -85,7 +85,6 @@ scalar AuthToken
 type AuthTokenPayload {
   authToken: AuthToken
   errors: [Error!]!
-  id: ID!
   totpRequired: Boolean
 }
 

diff --git a/src/graphql/shared/root/mutation/user-login.ts b/src/graphql/shared/root/mutation/user-login.ts
@@ -60,9 +60,9 @@ const UserLoginMutation = GT.Field<
       return { errors: [mapAndParseErrorForGqlResponse(res)] }
     }
 
-    const { authToken, totpRequired, id } = res
+    const { authToken, totpRequired } = res
 
-    return { errors: [], authToken, id, totpRequired }
+    return { errors: [], authToken, totpRequired }
   },
 })
 

diff --git a/src/graphql/shared/types/payload/auth-token.ts b/src/graphql/shared/types/payload/auth-token.ts
@@ -15,9 +15,6 @@ const AuthTokenPayload = GT.Object({
     totpRequired: {
       type: GT.Boolean,
     },
-    id: {
-      type: GT.NonNull(GT.ID),
-    },
   }),
 })
 

diff --git a/src/servers/authentication/index.ts b/src/servers/authentication/index.ts
@@ -283,9 +283,9 @@ authRouter.post("/email/login", async (req: Request, res: Response) => {
       recordExceptionInCurrentSpan({ error: result })
       return res.status(500).send({ error: result.message })
     }
-    const { authToken, totpRequired } = result
+    const { authToken, totpRequired, id } = result
     return res.status(200).send({
-      result: { authToken, totpRequired },
+      result: { authToken, totpRequired, id },
     })
   } catch (err) {
     recordExceptionInCurrentSpan({ error: err })
-Original file line number
+Diff line change
@@ Expand Up / @@ -129,7 +129,6 @@ type AuthTokenPayload @@
     {
       authToken: AuthToken
       errors: [Error!]!
-      id: ID!
       totpRequired: Boolean
     }
@@ Expand Down @@