naystack 1.2.16 → 1.2.19

package/dist/file/utils.esm.js

@@ -1,12 +1,10 @@
 // src/file/utils.ts
-import { createHash } from "crypto";
 import {
   DeleteObjectCommand,
   PutObjectCommand,
   S3Client
 } from "@aws-sdk/client-s3";
 import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
-import { waitUntil } from "@vercel/functions";
 var getS3Client = (options) => new S3Client({
   region: options.region,
   credentials: {
@@ -15,30 +13,34 @@ var getS3Client = (options) => new S3Client({
   }
 });
 var getURLPrefix = (options) => `https://${options.bucket}.s3.${options.region}.amazonaws.com/`;
-function getHash(keys) {
-  return createHash("sha256").update(keys.join("/")).digest("hex");
+function getKey(keys) {
+  return typeof keys === "string" ? keys : keys.join("/");
 }
-var getUploadFileURL = (client, Bucket) => (keys, isPublic) => {
+var getUploadURL = (client, Bucket) => (keys) => {
   const command = new PutObjectCommand({
     Bucket,
-    Key: getHash(keys),
-    ACL: isPublic ? "public-read" : void 0
+    Key: getKey(keys),
+    ACL: "public-read"
   });
   return getSignedUrl(client, command, { expiresIn: 300 });
 };
-var getFileURL = (options) => (keys) => {
-  if (typeof keys === "string") return `${getURLPrefix(options)}${keys}`;
-  return `${getURLPrefix(options)}${getHash(keys)}`;
+var getDownloadURL = (options) => (keys) => {
+  return `${getURLPrefix(options)}${getKey(keys)}`;
 };
-var uploadImage = (client, options) => async (url, key, blob) => {
-  const photoBlob = blob || await fetch(url).then((file) => file.blob());
-  if (photoBlob) {
-    waitUntil(uploadFile(client, options.bucket)(photoBlob, getHash(key)));
-    return getFileURL(options)(key);
+var uploadFile = (client, options) => async (keys, {
+  url,
+  blob
+}) => {
+  if (!blob && !url) return null;
+  const fileBlob = blob || await fetch(url).then((file) => file.blob());
+  if (fileBlob) {
+    const key = getKey(keys);
+    await uploadBlob(client, options.bucket)(fileBlob, key);
+    return getDownloadURL(options)(key);
   }
   return null;
 };
-var deleteImage = (client, options) => async (url) => {
+var deleteFile = (client, options) => async (url) => {
   const key = url.split(getURLPrefix(options))[1];
   if (key) {
     try {
@@ -55,7 +57,7 @@ var deleteImage = (client, options) => async (url) => {
   }
   return false;
 };
-var uploadFile = (client, Bucket) => async (file, key) => {
+var uploadBlob = (client, Bucket) => async (file, key) => {
   const fileBuffer = await file.arrayBuffer();
   return client.send(
     new PutObjectCommand({
@@ -69,10 +71,10 @@ var uploadFile = (client, Bucket) => async (file, key) => {
   );
 };
 export {
-  deleteImage,
-  getFileURL,
+  deleteFile,
+  getDownloadURL,
   getS3Client,
-  getUploadFileURL,
-  uploadFile,
-  uploadImage
+  getUploadURL,
+  uploadBlob,
+  uploadFile
 };

package/dist/graphql/client.cjs.js

@@ -31,22 +31,16 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/graphql/client.tsx
 var client_exports = {};
 __export(client_exports, {
-  TokenContext: () => TokenContext,
   getApolloWrapper: () => getApolloWrapper,
   tokenContext: () => tokenContext,
   useAuthMutation: () => useAuthMutation,
-  useAuthQuery: () => useAuthQuery,
-  useSetToken: () => useSetToken,
-  useToken: () => useToken
+  useAuthQuery: () => useAuthQuery
 });
 module.exports = __toCommonJS(client_exports);
 var import_client = require("@apollo/client");
 var import_client_integration_nextjs = require("@apollo/client-integration-nextjs");
+var import_client2 = require("naystack/auth/email/client");
 var import_react = __toESM(require("react"));
-var TokenContext = (0, import_react.createContext)({
-  token: null,
-  setToken: () => null
-});
 var getApolloWrapper = ({
   graphqlUri,
   cacheConfig,
@@ -61,23 +55,9 @@ var getApolloWrapper = ({
     });
   }
   return ({ children }) => {
-    const [token, setToken] = (0, import_react.useState)(null);
-    (0, import_react.useEffect)(() => {
-      fetch(authEndpoint, {
-        credentials: "include"
-      }).then((res) => res.json()).then((data) => setToken(data.accessToken));
-    }, []);
-    return /* @__PURE__ */ import_react.default.createElement(import_client_integration_nextjs.ApolloNextAppProvider, { makeClient }, /* @__PURE__ */ import_react.default.createElement(TokenContext.Provider, { value: { token, setToken } }, children));
+    return /* @__PURE__ */ import_react.default.createElement(import_client_integration_nextjs.ApolloNextAppProvider, { makeClient }, children);
   };
 };
-function useToken() {
-  const { token } = (0, import_react.useContext)(TokenContext);
-  return token;
-}
-function useSetToken() {
-  const { setToken } = (0, import_react.useContext)(TokenContext);
-  return setToken;
-}
 var tokenContext = (token) => {
   if (!token) return void 0;
   return {
@@ -88,31 +68,31 @@ var tokenContext = (token) => {
   };
 };
 function useAuthQuery(query, variables) {
-  const token = useToken();
-  const [fetch2, result] = (0, import_client.useLazyQuery)(query);
+  const token = (0, import_client2.useToken)();
+  const [fetch, result] = (0, import_client.useLazyQuery)(query);
   const [calledVars, setCalledVars] = (0, import_react.useState)();
   (0, import_react.useEffect)(() => {
     if (token && variables && calledVars !== JSON.stringify(variables)) {
       setCalledVars(JSON.stringify(variables));
-      void fetch2({
+      void fetch({
         variables,
         context: tokenContext(token),
         fetchPolicy: "no-cache"
       });
     }
-  }, [fetch2, token, variables, calledVars]);
+  }, [fetch, token, variables, calledVars]);
   const reFetch = (0, import_react.useCallback)(
-    (v) => fetch2({
+    (v) => fetch({
       variables: v,
       context: tokenContext(token),
       fetchPolicy: "no-cache"
     }),
-    [fetch2, token]
+    [fetch, token]
   );
   return [reFetch, result];
 }
 function useAuthMutation(mutation, options) {
-  const token = useToken();
+  const token = (0, import_client2.useToken)();
   const [mutate, result] = (0, import_client.useMutation)(mutation, options);
   const method = (0, import_react.useCallback)(
     (variables) => mutate({
@@ -125,11 +105,8 @@ function useAuthMutation(mutation, options) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  TokenContext,
   getApolloWrapper,
   tokenContext,
   useAuthMutation,
-  useAuthQuery,
-  useSetToken,
-  useToken
+  useAuthQuery
 });

package/dist/graphql/client.d.mts

@@ -2,19 +2,13 @@ import * as _apollo_client from '@apollo/client';
 import { OperationVariables, MutationHookOptions } from '@apollo/client';
 import { InMemoryCacheConfig } from '@apollo/client/cache';
 import { TypedDocumentNode } from '@graphql-typed-document-node/core';
-import React__default, { Dispatch, SetStateAction, PropsWithChildren } from 'react';
+import react__default, { PropsWithChildren } from 'react';
 
-declare const TokenContext: React__default.Context<{
-    token: string | null;
-    setToken: Dispatch<SetStateAction<string | null>>;
-}>;
 declare const getApolloWrapper: ({ graphqlUri, cacheConfig, authEndpoint, }: {
     graphqlUri: string;
     authEndpoint: string;
     cacheConfig?: InMemoryCacheConfig;
-}) => ({ children }: PropsWithChildren) => React__default.JSX.Element;
-declare function useToken(): string | null;
-declare function useSetToken(): React__default.Dispatch<React__default.SetStateAction<string | null>>;
+}) => ({ children }: PropsWithChildren) => react__default.JSX.Element;
 declare const tokenContext: (token?: string | null) => {
     headers: {
         authorization: string;
@@ -24,4 +18,4 @@ declare const tokenContext: (token?: string | null) => {
 declare function useAuthQuery<T, V extends OperationVariables>(query: TypedDocumentNode<T, V>, variables?: V): readonly [(v?: V) => Promise<_apollo_client.QueryResult<T, V>>, _apollo_client.QueryResult<T, V>];
 declare function useAuthMutation<T, V extends OperationVariables>(mutation: TypedDocumentNode<T, V>, options?: MutationHookOptions<T, V>): readonly [(variables?: V) => Promise<_apollo_client.FetchResult<T>>, _apollo_client.MutationResult<T>];
 
-export { TokenContext, getApolloWrapper, tokenContext, useAuthMutation, useAuthQuery, useSetToken, useToken };
+export { getApolloWrapper, tokenContext, useAuthMutation, useAuthQuery };

package/dist/graphql/client.d.ts

@@ -2,19 +2,13 @@ import * as _apollo_client from '@apollo/client';
 import { OperationVariables, MutationHookOptions } from '@apollo/client';
 import { InMemoryCacheConfig } from '@apollo/client/cache';
 import { TypedDocumentNode } from '@graphql-typed-document-node/core';
-import React__default, { Dispatch, SetStateAction, PropsWithChildren } from 'react';
+import react__default, { PropsWithChildren } from 'react';
 
-declare const TokenContext: React__default.Context<{
-    token: string | null;
-    setToken: Dispatch<SetStateAction<string | null>>;
-}>;
 declare const getApolloWrapper: ({ graphqlUri, cacheConfig, authEndpoint, }: {
     graphqlUri: string;
     authEndpoint: string;
     cacheConfig?: InMemoryCacheConfig;
-}) => ({ children }: PropsWithChildren) => React__default.JSX.Element;
-declare function useToken(): string | null;
-declare function useSetToken(): React__default.Dispatch<React__default.SetStateAction<string | null>>;
+}) => ({ children }: PropsWithChildren) => react__default.JSX.Element;
 declare const tokenContext: (token?: string | null) => {
     headers: {
         authorization: string;
@@ -24,4 +18,4 @@ declare const tokenContext: (token?: string | null) => {
 declare function useAuthQuery<T, V extends OperationVariables>(query: TypedDocumentNode<T, V>, variables?: V): readonly [(v?: V) => Promise<_apollo_client.QueryResult<T, V>>, _apollo_client.QueryResult<T, V>];
 declare function useAuthMutation<T, V extends OperationVariables>(mutation: TypedDocumentNode<T, V>, options?: MutationHookOptions<T, V>): readonly [(variables?: V) => Promise<_apollo_client.FetchResult<T>>, _apollo_client.MutationResult<T>];
 
-export { TokenContext, getApolloWrapper, tokenContext, useAuthMutation, useAuthQuery, useSetToken, useToken };
+export { getApolloWrapper, tokenContext, useAuthMutation, useAuthQuery };

package/dist/graphql/client.esm.js

@@ -11,17 +11,12 @@ import {
   ApolloNextAppProvider,
   InMemoryCache
 } from "@apollo/client-integration-nextjs";
+import { useToken } from "naystack/auth/email/client";
 import React, {
-  createContext,
   useCallback,
-  useContext,
   useEffect,
   useState
 } from "react";
-var TokenContext = createContext({
-  token: null,
-  setToken: () => null
-});
 var getApolloWrapper = ({
   graphqlUri,
   cacheConfig,
@@ -36,23 +31,9 @@ var getApolloWrapper = ({
     });
   }
   return ({ children }) => {
-    const [token, setToken] = useState(null);
-    useEffect(() => {
-      fetch(authEndpoint, {
-        credentials: "include"
-      }).then((res) => res.json()).then((data) => setToken(data.accessToken));
-    }, []);
-    return /* @__PURE__ */ React.createElement(ApolloNextAppProvider, { makeClient }, /* @__PURE__ */ React.createElement(TokenContext.Provider, { value: { token, setToken } }, children));
+    return /* @__PURE__ */ React.createElement(ApolloNextAppProvider, { makeClient }, children);
   };
 };
-function useToken() {
-  const { token } = useContext(TokenContext);
-  return token;
-}
-function useSetToken() {
-  const { setToken } = useContext(TokenContext);
-  return setToken;
-}
 var tokenContext = (token) => {
   if (!token) return void 0;
   return {
@@ -64,25 +45,25 @@ var tokenContext = (token) => {
 };
 function useAuthQuery(query, variables) {
   const token = useToken();
-  const [fetch2, result] = useLazyQuery(query);
+  const [fetch, result] = useLazyQuery(query);
   const [calledVars, setCalledVars] = useState();
   useEffect(() => {
     if (token && variables && calledVars !== JSON.stringify(variables)) {
       setCalledVars(JSON.stringify(variables));
-      void fetch2({
+      void fetch({
         variables,
         context: tokenContext(token),
         fetchPolicy: "no-cache"
       });
     }
-  }, [fetch2, token, variables, calledVars]);
+  }, [fetch, token, variables, calledVars]);
   const reFetch = useCallback(
-    (v) => fetch2({
+    (v) => fetch({
       variables: v,
       context: tokenContext(token),
       fetchPolicy: "no-cache"
     }),
-    [fetch2, token]
+    [fetch, token]
   );
   return [reFetch, result];
 }
@@ -99,11 +80,8 @@ function useAuthMutation(mutation, options) {
   return [method, result];
 }
 export {
-  TokenContext,
   getApolloWrapper,
   tokenContext,
   useAuthMutation,
-  useAuthQuery,
-  useSetToken,
-  useToken
+  useAuthQuery
 };

package/dist/graphql/server.d.mts

@@ -1,4 +1,4 @@
-import * as React from 'react';
+import * as react from 'react';
 import { FC } from 'react';
 import { OperationVariables } from '@apollo/client';
 import { TypedDocumentNode } from '@graphql-typed-document-node/core';
@@ -15,7 +15,7 @@ declare function Injector<T, Y>({ fetch, Component, props, }: {
         data?: T;
         loading: boolean;
     } & Y>;
-} & ComponentProps<Y>): React.JSX.Element;
+} & ComponentProps<Y>): react.JSX.Element;
 declare const getGraphQLQuery: ({ uri }: {
     uri: string;
 }) => <T, V extends OperationVariables>(_query: TypedDocumentNode<T, V>, options?: {

package/dist/graphql/server.d.ts

@@ -1,4 +1,4 @@
-import * as React from 'react';
+import * as react from 'react';
 import { FC } from 'react';
 import { OperationVariables } from '@apollo/client';
 import { TypedDocumentNode } from '@graphql-typed-document-node/core';
@@ -15,7 +15,7 @@ declare function Injector<T, Y>({ fetch, Component, props, }: {
         data?: T;
         loading: boolean;
     } & Y>;
-} & ComponentProps<Y>): React.JSX.Element;
+} & ComponentProps<Y>): react.JSX.Element;
 declare const getGraphQLQuery: ({ uri }: {
     uri: string;
 }) => <T, V extends OperationVariables>(_query: TypedDocumentNode<T, V>, options?: {

package/dist/graphql/types.d.mts

@@ -1,8 +1,10 @@
 interface Context {
     userId: number | null;
+    isRefreshID?: boolean;
 }
 interface AuthorizedContext {
     userId: number;
+    isRefreshID?: boolean;
 }
 
 export type { AuthorizedContext, Context };

package/dist/graphql/types.d.ts

@@ -1,8 +1,10 @@
 interface Context {
     userId: number | null;
+    isRefreshID?: boolean;
 }
 interface AuthorizedContext {
     userId: number;
+    isRefreshID?: boolean;
 }
 
 export type { AuthorizedContext, Context };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "naystack",
-  "version": "1.2.16",
+  "version": "1.2.19",
   "description": "A stack built with Next + GraphQL + S3 + Auth",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",