Type Fixes

keystonejs · Oct 8, 2020 · 0765496 · 0765496
1 parent 45a1028
commit 0765496
Show file tree

Hide file tree

Showing 7 changed files with 124 additions and 97 deletions.
diff --git a/examples-next/basic/keystone.ts b/examples-next/basic/keystone.ts
@@ -23,12 +23,12 @@ const auth = createAuth({
     },
   },
   passwordResetLink: {
-    sendToken: function (args): void {
+    sendToken(args) {
       console.log(`Password reset info:`, args);
     },
   },
   magicAuthLink: {
-    sendToken: function (args): void {
+    sendToken(args) {
       console.log(`Magic auth info:`, args);
     },
   },

diff --git a/packages-next/auth/TODO.md b/packages-next/auth/TODO.md
@@ -51,6 +51,7 @@
 
 # Backlog
 
+- [ ] Handle session token authorisation header use case
 - [ ] Review the API that session functions get, try not to provide the keystone instance
 - [ ] 2FA
 - [ ] Social Auth
diff --git a/packages-next/auth/src/gql/getBaseAuthSchema.ts b/packages-next/auth/src/gql/getBaseAuthSchema.ts
@@ -39,8 +39,6 @@ export function getBaseAuthSchema({
         AUTH_TOKEN_REDEMPTION_TOKEN_MISMATCH
         AUTH_TOKEN_REDEMPTION_TOKEN_EXPIRED
         AUTH_TOKEN_REDEMPTION_TOKEN_REDEEMED
-        INTERNAL_ERROR
-        CUSTOM_ERROR
       }
 
       # Password auth
@@ -50,7 +48,7 @@ export function getBaseAuthSchema({
       }
       union ${gqlNames.ItemAuthenticationWithPasswordResult} = ${gqlNames.ItemAuthenticationWithPasswordSuccess} | ${gqlNames.ItemAuthenticationWithPasswordFailure}
       type ${gqlNames.ItemAuthenticationWithPasswordSuccess} {
-        token: String!
+        sessionToken: String!
         item: ${listKey}!
       }
       type ${gqlNames.ItemAuthenticationWithPasswordFailure} {

diff --git a/packages-next/auth/src/gql/getMagicAuthLinkSchema.ts b/packages-next/auth/src/gql/getMagicAuthLinkSchema.ts
@@ -18,7 +18,7 @@ export function getMagicAuthLinkSchema({
   secretField: string;
   protectIdentities: boolean;
   gqlNames: AuthGqlNames;
-  magicAuthLink?: AuthTokenTypeConfig;
+  magicAuthLink: AuthTokenTypeConfig;
 }) {
   return graphQLSchemaExtension({
     typeDefs: `
@@ -27,11 +27,11 @@ export function getMagicAuthLinkSchema({
         ${gqlNames.sendItemMagicAuthLink}(${identityField}: String!): ${gqlNames.SendItemMagicAuthLinkResult}!
       }
       type ${gqlNames.SendItemMagicAuthLinkResult} {
-        code: AuthErrorCode
-        message: String
+        code: AuthErrorCode!
+        message: String!
       }
       type Mutation {
-        ${gqlNames.redeemItemMagicAuthToken}(${identityField}: String!, token: String!): ${gqlNames.RedeemItemMagicAuthTokenResult}!
+        ${gqlNames.redeemItemMagicAuthToken}(${identityField}: String!, token: String!): ${gqlNames.RedeemItemMagicAuthTokenResult}
       }
       union ${gqlNames.RedeemItemMagicAuthTokenResult} = ${gqlNames.RedeemItemMagicAuthTokenSuccess} | ${gqlNames.RedeemItemMagicAuthTokenFailure}
       type ${gqlNames.RedeemItemMagicAuthTokenSuccess} {
@@ -69,7 +69,7 @@ export function getMagicAuthLinkSchema({
             return { code: result.code, message };
           }
           if (result.success) {
-            await magicAuthLink?.sendToken({
+            await magicAuthLink.sendToken({
               itemId: result.itemId,
               identity,
               token: result.token,
@@ -84,7 +84,7 @@ export function getMagicAuthLinkSchema({
             list,
             identityField,
             protectIdentities,
-            magicAuthLink?.tokensValidForMins,
+            magicAuthLink.tokensValidForMins,
             args,
             ctx
           );

diff --git a/packages-next/auth/src/gql/getPasswordResetSchema.ts b/packages-next/auth/src/gql/getPasswordResetSchema.ts
@@ -20,7 +20,7 @@ export function getPasswordResetSchema({
   secretField: string;
   protectIdentities: boolean;
   gqlNames: AuthGqlNames;
-  passwordResetLink?: AuthTokenTypeConfig;
+  passwordResetLink: AuthTokenTypeConfig;
 }) {
   return graphQLSchemaExtension({
     typeDefs: `
@@ -73,7 +73,7 @@ export function getPasswordResetSchema({
             return { code: result.code, message };
           }
           if (result.success) {
-            await passwordResetLink?.sendToken({
+            await passwordResetLink.sendToken({
               itemId: result.itemId,
               identity,
               token: result.token,
@@ -88,7 +88,7 @@ export function getPasswordResetSchema({
             list,
             identityField,
             protectIdentities,
-            passwordResetLink?.tokensValidForMins,
+            passwordResetLink.tokensValidForMins,
             args,
             ctx
           );
@@ -133,7 +133,7 @@ export function getPasswordResetSchema({
             list,
             identityField,
             protectIdentities,
-            passwordResetLink?.tokensValidForMins,
+            passwordResetLink.tokensValidForMins,
             args
           );