crowetic/commerce
1
0
Fork 1
mirror of https://github.com/vercel/commerce.git synced 2025-07-23 04:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "very incomplete progress on sign-in"

Browse Source 
This reverts commit a8dd2af268.
This commit is contained in:
Oliver Heywood
2021-10-13 09:05:21 -05:00
parent a8dd2af268
commit bcaa3844ba
19 changed files with 48 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
framework/bigcommerce/api/endpoints/login/login.ts
View File

@@ -1,3 +1,4 @@
import { FetcherError } from '@commerce/utils/errors'
import type { LoginEndpoint } from '.'
const invalidCredentials = /invalid credentials/i
@@ -22,6 +23,11 @@ const login: LoginEndpoint['handlers']['login'] = async ({
try {
await commerce.login({ variables: { email, password }, config, res })
} catch (error) {
// Check if the email and password didn't match an existing account
if (
error instanceof FetcherError &&
invalidCredentials.test(error.message)
) {
return res.status(401).json({
data: null,
errors: [
@@ -33,6 +39,8 @@ const login: LoginEndpoint['handlers']['login'] = async ({
],
})
}
throw error
}
res.status(200).json({ data: null })

35
framework/ordercloud/api/endpoints/customer/get-logged-in-customer.ts
View File

@@ -1,35 +0,0 @@
import { CustomerEndpoint } from "."
const getLoggedInCustomer: CustomerEndpoint['handlers']['getLoggedInCustomer'] = async ({
req,
res,
config,
}) => {
const token = req.cookies[config.customerCookie]
// if (token) {
// const { data } = await config.fetch<GetLoggedInCustomerQuery>(
// getLoggedInCustomerQuery,
// undefined,
// {
// headers: {
// cookie: `${config.customerCookie}=${token}`,
// },
// }
// )
// const { customer } = data
// if (!customer) {
// return res.status(400).json({
// data: null,
// errors: [{ message: 'Customer not found', code: 'not_found' }],
// })
// }
// return res.status(200).json({ data: { customer } })
// }
res.status(200).json({ data: null })
}
export default getLoggedInCustomer

20
framework/ordercloud/api/endpoints/customer/index.ts
View File

@@ -1,19 +1 @@
import { GetAPISchema, createEndpoint } from '@commerce/api'
import customerEndpoint from '@commerce/api/endpoints/customer'
import { CustomerSchema } from '@commerce/types/customer'
import { OrdercloudAPI } from '@framework/api'
import getLoggedInCustomer from './get-logged-in-customer';
export type CustomerAPI = GetAPISchema<OrdercloudAPI, CustomerSchema>
export type CustomerEndpoint = CustomerAPI['endpoint']
export const handlers: CustomerEndpoint['handlers'] = { getLoggedInCustomer }
const customerApi = createEndpoint<CustomerAPI>({
handler: customerEndpoint,
handlers,
})
export default customerApi
export default function noopApi(...args: any[]): void {}

19
framework/ordercloud/api/endpoints/login/index.ts
View File

@@ -1,18 +1 @@
import { createEndpoint, GetAPISchema } from "@commerce/api"
import loginEndpoint from "@commerce/api/endpoints/login"
import { LoginSchema } from "@commerce/types/login"
import { OrdercloudAPI } from "@framework/api"
import login from "./login"
export type LoginAPI = GetAPISchema<OrdercloudAPI, LoginSchema>
export type LoginEndpoint = LoginAPI['endpoint']
export const handlers: LoginEndpoint['handlers'] = { login }
const loginApi = createEndpoint<LoginAPI>({
handler: loginEndpoint,
handlers,
})
export default loginApi
export default function noopApi(...args: any[]): void {}

57
framework/ordercloud/api/endpoints/login/login.ts
View File

@@ -1,57 +0,0 @@
import { FetcherError } from '@commerce/utils/errors'
import { passwordLogin } from '@framework/api/utils/fetch-rest'
import { provider } from 'framework/local/api'
import type { LoginEndpoint } from '.'
const invalidCredentials = /invalid credentials/i
const login: LoginEndpoint['handlers']['login'] = async ({
req,
res,
body: { email, password },
config: { commerceUrl },
}) => {
console.log(email, password)
// TODO: Add proper validations with something like Ajv
if (!(email && password)) {
return res.status(400).json({
data: null,
errors: [{ message: 'Invalid request' }],
})
}
// Get token from cookies
let response: any;
try {
response = await passwordLogin(email, password, commerceUrl);
} catch (error) {
// Check if the email and password didn't match an existing account
if (
error instanceof FetcherError &&
invalidCredentials.test(error.message)
) {
return res.status(401).json({
data: null,
errors: [
{
message:
'Cannot find an account that matches the provided credentials',
code: 'invalid_credentials',
},
],
})
}
throw error
}
console.log(response)
// set buyer token
global.token = response.access_token;
res.status(200).json({ data: null })
}
export default login

19
framework/ordercloud/api/endpoints/logout/index.ts
View File

@@ -1,18 +1 @@
import { GetAPISchema, createEndpoint } from '@commerce/api'
import logoutEndpoint from '@commerce/api/endpoints/logout'
import { LogoutSchema } from '@commerce/types/logout'
import { OrdercloudAPI } from '@framework/api'
import logout from './logout'
export type LogoutAPI = GetAPISchema<OrdercloudAPI, LogoutSchema>
export type LogoutEndpoint = LogoutAPI['endpoint']
export const handlers: LogoutEndpoint['handlers'] = { logout }
const logoutApi = createEndpoint<LogoutAPI>({
handler: logoutEndpoint,
handlers,
})
export default logoutApi
export default function noopApi(...args: any[]): void {}

20
framework/ordercloud/api/endpoints/logout/logout.ts
View File

@@ -1,20 +0,0 @@
import { LogoutEndpoint } from "."
const logout: LogoutEndpoint['handlers']['logout'] = async ({
res,
body: { redirectTo },
config,
}) => {
// Remove the buyer token
global.token = null;
// Only allow redirects to a relative URL
if (redirectTo?.startsWith('/')) {
res.redirect(redirectTo)
} else {
res.status(200).json({ data: null })
}
}
export default logout

1
framework/ordercloud/api/endpoints/signup/index.ts Normal file
View File

@@ -0,0 +1 @@
export default function noopApi(...args: any[]): void {}

79
framework/ordercloud/api/endpoints/signup/signup.ts
View File

@@ -1,79 +0,0 @@
import { createEndpoint, GetAPISchema } from '@commerce/api';
import signupEndpoint from '@commerce/api/endpoints/signup';
import { SignupSchema } from '@commerce/types/signup';
import { OrdercloudAPI } from '@framework/api';
import { passwordLogin } from '@framework/api/utils/fetch-rest';
const signup: SignupEndpoint['handlers']['signup'] = async ({
req,
res,
body: { firstName, lastName, email, password },
config: { restBuyerFetch, commerceUrl, tokenCookie },
}) => {
// TODO: Add proper validations with something like Ajv
if (!(firstName && lastName && email && password)) {
return res.status(400).json({
data: null,
errors: [{ message: 'Invalid request' }],
})
}
// TODO: validate the password and email
// Passwords must be at least 7 characters and contain both alphabetic
// and numeric characters.
// Get token from cookies
const token = req.cookies[tokenCookie];
const newUser = {
Active: true,
Username: email,
Password: password,
FirstName: firstName,
LastName: lastName,
Email: email
}
// create user record
try {
await restBuyerFetch(
'PUT',
`/me/register?anonUserToken=${token}`,
newUser,
{ token }
);
} catch (error) {
var message = (error as any).errors[0].message
//const ordercloud_error = JSON.parse();
console.log(message)
return res.status(400).json({
data: null,
errors: [
{
message: message,
code: message
},
],
})
}
// Login the customer right after creating it
await passwordLogin(email, password, commerceUrl);
res.status(200).json({ data: null })
}
export type SignupAPI = GetAPISchema<OrdercloudAPI, SignupSchema>
export type SignupEndpoint = SignupAPI['endpoint']
export const handlers: SignupEndpoint['handlers'] = { signup }
const signupApi = createEndpoint<SignupAPI>({
handler: signupEndpoint,
handlers,
})
export default signupApi

14
framework/ordercloud/api/utils/fetch-rest.ts
View File

@@ -6,7 +6,6 @@ import { OrdercloudConfig } from '../index'
// Get an instance to vercel fetch
const fetch = vercelFetch()
// Get token util
async function getToken({
baseUrl,
@@ -93,17 +92,6 @@ export async function fetchData<T>(opts: {
}
}
export async function passwordLogin(email: string, password: string, commerceUrl: string) {
return await fetch(`${commerceUrl}/oauth/token`, {
method: 'POST',
headers: {
'Content-Type': 'application/x-www-form-urlencoded',
Accept: 'application/json',
},
body: `username=${email}&password=${password}&grant_type=password`,
})
}
export const createMiddlewareFetcher: (
getConfig: () => OrdercloudConfig
) => <T>(
@@ -141,7 +129,7 @@ export const createMiddlewareFetcher: (
}
export const createBuyerFetcher: (
getConfig: () => OrdercloudConfig,
getConfig: () => OrdercloudConfig
) => <T>(
method: string,
path: string,

36
framework/ordercloud/auth/use-login.tsx
View File

@@ -1,40 +1,16 @@
import { MutationHook } from '@commerce/utils/types'
import useLogin, { UseLogin } from '@commerce/auth/use-login'
import { LoginHook } from '@commerce/types/login'
import { CommerceError } from '@commerce/utils/errors'
import useCustomer from '@commerce/customer/use-customer'
import { useCallback } from 'react'
export default useLogin as UseLogin<typeof handler>
export const handler: MutationHook<LoginHook> = {
export const handler: MutationHook<any> = {
fetchOptions: {
url: '/api/login',
method: 'POST',
query: '',
},
async fetcher({ input: { email, password }, options, fetch }) {
if (!(email && password)) {
throw new CommerceError({
message:
'An email and password are required to login',
})
}
return fetch({
...options,
body: { email, password },
})
async fetcher() {
return null
},
useHook: ({ fetch }) => () => {
const { revalidate } = useCustomer()
return useCallback(
async function login(input) {
const data = await fetch({ input })
await revalidate()
return data
},
[fetch, revalidate]
)
useHook: () => () => {
return async function () {}
},
}

25
framework/ordercloud/auth/use-logout.tsx
View File

@@ -1,26 +1,17 @@
import { MutationHook } from '@commerce/utils/types'
import useLogout, { UseLogout } from '@commerce/auth/use-logout'
import { LogoutHook } from '@commerce/types/logout'
import useCustomer from '@commerce/customer/use-customer'
import { useCallback } from 'react'
export default useLogout as UseLogout<typeof handler>
export const handler: MutationHook<LogoutHook> = {
export const handler: MutationHook<any> = {
fetchOptions: {
url: '/api/logout',
method: 'GET',
query: '',
},
useHook: ({ fetch }) => () => {
const { mutate } = useCustomer()
return useCallback(
async function logout() {
const data = await fetch()
await mutate(null, false)
return data
},
[fetch, mutate]
)
async fetcher() {
return null
},
useHook:
({ fetch }) =>
() =>
async () => {},
}

41
framework/ordercloud/auth/use-signup.tsx
View File

@@ -2,43 +2,18 @@ import { useCallback } from 'react'
import useCustomer from '../customer/use-customer'
import { MutationHook } from '@commerce/utils/types'
import useSignup, { UseSignup } from '@commerce/auth/use-signup'
import { CommerceError } from '@commerce/utils/errors'
import { SignupHook } from '@commerce/types/signup'
export default useSignup as UseSignup<typeof handler>
export const handler: MutationHook<SignupHook> = {
export const handler: MutationHook<any> = {
fetchOptions: {
url: '/api/signup',
method: 'POST',
query: '',
},
async fetcher({
input: { firstName, lastName, email, password },
options,
fetch,
}) {
if (!(firstName && lastName && email && password)) {
throw new CommerceError({
message:
'A first name, last name, email and password are required to signup',
})
}
return fetch({
...options,
body: { firstName, lastName, email, password },
})
},
useHook: ({ fetch }) => () => {
const { revalidate } = useCustomer()
return useCallback(
async function signup(input) {
const data = await fetch({ input })
await revalidate()
return data
},
[fetch, revalidate]
)
async fetcher() {
return null
},
useHook:
({ fetch }) =>
() =>
() => {},
}

2
framework/ordercloud/commerce.config.json
View File

@@ -4,7 +4,7 @@
"wishlist": false,
"cart": true,
"search": true,
"customerAuth": true,
"customerAuth": false,
"customCheckout": true
}
}

22
framework/ordercloud/customer/use-customer.tsx
View File

@@ -1,23 +1,15 @@
import { SWRHook } from '@commerce/utils/types'
import useCustomer, { UseCustomer } from '@commerce/customer/use-customer'
import { CustomerHook } from '@commerce/types/customer'
export default useCustomer as UseCustomer<typeof handler>
export const handler: SWRHook<CustomerHook> = {
export const handler: SWRHook<any> = {
fetchOptions: {
url: '/api/customer',
method: 'GET',
query: '',
},
async fetcher({ options, fetch }) {
const data = await fetch(options)
return data?.customer ?? null
},
useHook: ({ useData }) => (input) => {
return useData({
swrOptions: {
revalidateOnFocus: false,
...input?.swrOptions,
},
})
async fetcher({ input, options, fetch }) {},
useHook: () => () => {
return async function addItem() {
return {}
}
},
}

2
package.json
View File

@@ -2,7 +2,7 @@
"name": "nextjs-commerce",
"version": "1.0.0",
"scripts": {
"dev": "next dev",
"dev": "NODE_OPTIONS='--inspect' next dev",
"build": "next build",
"start": "next start",
"analyze": "BUNDLE_ANALYZE=both yarn build",

2
pages/api/logout.ts
View File

@@ -1,4 +1,4 @@
import logoutApi from '@framework/api/endpoints/logout/logout'
import logoutApi from '@framework/api/endpoints/logout'
import commerce from '@lib/api/commerce'
export default logoutApi(commerce)

2
pages/api/signup.ts
View File

@@ -1,4 +1,4 @@
import singupApi from '@framework/api/endpoints/signup/signup'
import singupApi from '@framework/api/endpoints/signup'
import commerce from '@lib/api/commerce'
export default singupApi(commerce)

4
tsconfig.json
View File

@@ -23,8 +23,8 @@
"@components/*": ["components/*"],
"@commerce": ["framework/commerce"],
"@commerce/*": ["framework/commerce/*"],
"@framework": ["framework/ordercloud"],
"@framework/*": ["framework/ordercloud/*"]
"@framework": ["framework/local"],
"@framework/*": ["framework/local/*"]
}
},
"include": ["next-env.d.ts", "**/*.d.ts", "**/*.ts", "**/*.tsx", "**/*.js"],