Compare commits
3 Commits
cfc5c25b10
...
5ac529ce26
Author | SHA1 | Date | |
---|---|---|---|
5ac529ce26
|
|||
fa5d1e2689
|
|||
04c83cccb9
|
10
api/api.go
10
api/api.go
@@ -9,6 +9,7 @@ import (
|
|||||||
"git.dubyatp.xyz/chat-api-server/db"
|
"git.dubyatp.xyz/chat-api-server/db"
|
||||||
"github.com/go-chi/chi/v5"
|
"github.com/go-chi/chi/v5"
|
||||||
"github.com/go-chi/chi/v5/middleware"
|
"github.com/go-chi/chi/v5/middleware"
|
||||||
|
"github.com/go-chi/cors"
|
||||||
"github.com/go-chi/docgen"
|
"github.com/go-chi/docgen"
|
||||||
"github.com/go-chi/render"
|
"github.com/go-chi/render"
|
||||||
)
|
)
|
||||||
@@ -34,6 +35,15 @@ func Start() {
|
|||||||
|
|
||||||
r := chi.NewRouter()
|
r := chi.NewRouter()
|
||||||
|
|
||||||
|
r.Use(cors.Handler(cors.Options{
|
||||||
|
AllowedOrigins: []string{"http://localhost:5000"},
|
||||||
|
AllowedMethods: []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
|
||||||
|
AllowedHeaders: []string{"Accept", "Authorization", "Content-Type", "X-CSRF-Token"},
|
||||||
|
ExposedHeaders: []string{"Link"},
|
||||||
|
AllowCredentials: true,
|
||||||
|
MaxAge: 300, // Maximum value for preflight request cache
|
||||||
|
}))
|
||||||
|
|
||||||
r.Use(middleware.RequestID)
|
r.Use(middleware.RequestID)
|
||||||
r.Use(RequestLog)
|
r.Use(RequestLog)
|
||||||
r.Use(middleware.Recoverer)
|
r.Use(middleware.Recoverer)
|
||||||
|
4
example_client/svelte-client/.gitignore
vendored
Normal file
4
example_client/svelte-client/.gitignore
vendored
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
/node_modules/
|
||||||
|
/public/build/
|
||||||
|
|
||||||
|
.DS_Store
|
107
example_client/svelte-client/README.md
Normal file
107
example_client/svelte-client/README.md
Normal file
@@ -0,0 +1,107 @@
|
|||||||
|
# This repo is no longer maintained. Consider using `npm init vite` and selecting the `svelte` option or — if you want a full-fledged app framework — use [SvelteKit](https://kit.svelte.dev), the official application framework for Svelte.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
# svelte app
|
||||||
|
|
||||||
|
This is a project template for [Svelte](https://svelte.dev) apps. It lives at https://github.com/sveltejs/template.
|
||||||
|
|
||||||
|
To create a new project based on this template using [degit](https://github.com/Rich-Harris/degit):
|
||||||
|
|
||||||
|
```bash
|
||||||
|
npx degit sveltejs/template svelte-app
|
||||||
|
cd svelte-app
|
||||||
|
```
|
||||||
|
|
||||||
|
*Note that you will need to have [Node.js](https://nodejs.org) installed.*
|
||||||
|
|
||||||
|
|
||||||
|
## Get started
|
||||||
|
|
||||||
|
Install the dependencies...
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd svelte-app
|
||||||
|
npm install
|
||||||
|
```
|
||||||
|
|
||||||
|
...then start [Rollup](https://rollupjs.org):
|
||||||
|
|
||||||
|
```bash
|
||||||
|
npm run dev
|
||||||
|
```
|
||||||
|
|
||||||
|
Navigate to [localhost:8080](http://localhost:8080). You should see your app running. Edit a component file in `src`, save it, and reload the page to see your changes.
|
||||||
|
|
||||||
|
By default, the server will only respond to requests from localhost. To allow connections from other computers, edit the `sirv` commands in package.json to include the option `--host 0.0.0.0`.
|
||||||
|
|
||||||
|
If you're using [Visual Studio Code](https://code.visualstudio.com/) we recommend installing the official extension [Svelte for VS Code](https://marketplace.visualstudio.com/items?itemName=svelte.svelte-vscode). If you are using other editors you may need to install a plugin in order to get syntax highlighting and intellisense.
|
||||||
|
|
||||||
|
## Building and running in production mode
|
||||||
|
|
||||||
|
To create an optimised version of the app:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
npm run build
|
||||||
|
```
|
||||||
|
|
||||||
|
You can run the newly built app with `npm run start`. This uses [sirv](https://github.com/lukeed/sirv), which is included in your package.json's `dependencies` so that the app will work when you deploy to platforms like [Heroku](https://heroku.com).
|
||||||
|
|
||||||
|
|
||||||
|
## Single-page app mode
|
||||||
|
|
||||||
|
By default, sirv will only respond to requests that match files in `public`. This is to maximise compatibility with static fileservers, allowing you to deploy your app anywhere.
|
||||||
|
|
||||||
|
If you're building a single-page app (SPA) with multiple routes, sirv needs to be able to respond to requests for *any* path. You can make it so by editing the `"start"` command in package.json:
|
||||||
|
|
||||||
|
```js
|
||||||
|
"start": "sirv public --single"
|
||||||
|
```
|
||||||
|
|
||||||
|
## Using TypeScript
|
||||||
|
|
||||||
|
This template comes with a script to set up a TypeScript development environment, you can run it immediately after cloning the template with:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
node scripts/setupTypeScript.js
|
||||||
|
```
|
||||||
|
|
||||||
|
Or remove the script via:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
rm scripts/setupTypeScript.js
|
||||||
|
```
|
||||||
|
|
||||||
|
If you want to use `baseUrl` or `path` aliases within your `tsconfig`, you need to set up `@rollup/plugin-alias` to tell Rollup to resolve the aliases. For more info, see [this StackOverflow question](https://stackoverflow.com/questions/63427935/setup-tsconfig-path-in-svelte).
|
||||||
|
|
||||||
|
## Deploying to the web
|
||||||
|
|
||||||
|
### With [Vercel](https://vercel.com)
|
||||||
|
|
||||||
|
Install `vercel` if you haven't already:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
npm install -g vercel
|
||||||
|
```
|
||||||
|
|
||||||
|
Then, from within your project folder:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd public
|
||||||
|
vercel deploy --name my-project
|
||||||
|
```
|
||||||
|
|
||||||
|
### With [surge](https://surge.sh/)
|
||||||
|
|
||||||
|
Install `surge` if you haven't already:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
npm install -g surge
|
||||||
|
```
|
||||||
|
|
||||||
|
Then, from within your project folder:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
npm run build
|
||||||
|
surge public my-project.surge.sh
|
||||||
|
```
|
1349
example_client/svelte-client/package-lock.json
generated
Normal file
1349
example_client/svelte-client/package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
26
example_client/svelte-client/package.json
Normal file
26
example_client/svelte-client/package.json
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
{
|
||||||
|
"name": "svelte-app",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"private": true,
|
||||||
|
"type": "module",
|
||||||
|
"scripts": {
|
||||||
|
"build": "rollup -c",
|
||||||
|
"dev": "rollup -c -w",
|
||||||
|
"start": "sirv public --single"
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"@rollup/plugin-commonjs": "^24.0.0",
|
||||||
|
"@rollup/plugin-node-resolve": "^15.0.0",
|
||||||
|
"@rollup/plugin-terser": "^0.4.0",
|
||||||
|
"rollup": "^3.15.0",
|
||||||
|
"rollup-plugin-css-only": "^4.3.0",
|
||||||
|
"rollup-plugin-livereload": "^2.0.0",
|
||||||
|
"rollup-plugin-svelte": "^7.1.2",
|
||||||
|
"svelte": "^3.55.0"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"axios": "^1.9.0",
|
||||||
|
"sirv-cli": "^2.0.0",
|
||||||
|
"svelte-spa-router": "^4.0.1"
|
||||||
|
}
|
||||||
|
}
|
BIN
example_client/svelte-client/public/favicon.png
Normal file
BIN
example_client/svelte-client/public/favicon.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 3.1 KiB |
63
example_client/svelte-client/public/global.css
Normal file
63
example_client/svelte-client/public/global.css
Normal file
@@ -0,0 +1,63 @@
|
|||||||
|
html, body {
|
||||||
|
position: relative;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
body {
|
||||||
|
color: #333;
|
||||||
|
margin: 0;
|
||||||
|
padding: 8px;
|
||||||
|
box-sizing: border-box;
|
||||||
|
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
|
||||||
|
}
|
||||||
|
|
||||||
|
a {
|
||||||
|
color: rgb(0,100,200);
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
a:hover {
|
||||||
|
text-decoration: underline;
|
||||||
|
}
|
||||||
|
|
||||||
|
a:visited {
|
||||||
|
color: rgb(0,80,160);
|
||||||
|
}
|
||||||
|
|
||||||
|
label {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
input, button, select, textarea {
|
||||||
|
font-family: inherit;
|
||||||
|
font-size: inherit;
|
||||||
|
-webkit-padding: 0.4em 0;
|
||||||
|
padding: 0.4em;
|
||||||
|
margin: 0 0 0.5em 0;
|
||||||
|
box-sizing: border-box;
|
||||||
|
border: 1px solid #ccc;
|
||||||
|
border-radius: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
input:disabled {
|
||||||
|
color: #ccc;
|
||||||
|
}
|
||||||
|
|
||||||
|
button {
|
||||||
|
color: #333;
|
||||||
|
background-color: #f4f4f4;
|
||||||
|
outline: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
button:disabled {
|
||||||
|
color: #999;
|
||||||
|
}
|
||||||
|
|
||||||
|
button:not(:disabled):active {
|
||||||
|
background-color: #ddd;
|
||||||
|
}
|
||||||
|
|
||||||
|
button:focus {
|
||||||
|
border-color: #666;
|
||||||
|
}
|
18
example_client/svelte-client/public/index.html
Normal file
18
example_client/svelte-client/public/index.html
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset='utf-8'>
|
||||||
|
<meta name='viewport' content='width=device-width,initial-scale=1'>
|
||||||
|
|
||||||
|
<title>Svelte app</title>
|
||||||
|
|
||||||
|
<link rel='icon' type='image/png' href='/favicon.png'>
|
||||||
|
<link rel='stylesheet' href='/global.css'>
|
||||||
|
<link rel='stylesheet' href='/build/bundle.css'>
|
||||||
|
|
||||||
|
<script defer src='/build/bundle.js'></script>
|
||||||
|
</head>
|
||||||
|
|
||||||
|
<body>
|
||||||
|
</body>
|
||||||
|
</html>
|
78
example_client/svelte-client/rollup.config.js
Normal file
78
example_client/svelte-client/rollup.config.js
Normal file
@@ -0,0 +1,78 @@
|
|||||||
|
import { spawn } from 'child_process';
|
||||||
|
import svelte from 'rollup-plugin-svelte';
|
||||||
|
import commonjs from '@rollup/plugin-commonjs';
|
||||||
|
import terser from '@rollup/plugin-terser';
|
||||||
|
import resolve from '@rollup/plugin-node-resolve';
|
||||||
|
import livereload from 'rollup-plugin-livereload';
|
||||||
|
import css from 'rollup-plugin-css-only';
|
||||||
|
|
||||||
|
const production = !process.env.ROLLUP_WATCH;
|
||||||
|
|
||||||
|
function serve() {
|
||||||
|
let server;
|
||||||
|
|
||||||
|
function toExit() {
|
||||||
|
if (server) server.kill(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
writeBundle() {
|
||||||
|
if (server) return;
|
||||||
|
server = spawn('npm', ['run', 'start', '--', '--dev'], {
|
||||||
|
stdio: ['ignore', 'inherit', 'inherit'],
|
||||||
|
shell: true
|
||||||
|
});
|
||||||
|
|
||||||
|
process.on('SIGTERM', toExit);
|
||||||
|
process.on('exit', toExit);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export default {
|
||||||
|
input: 'src/main.js',
|
||||||
|
output: {
|
||||||
|
sourcemap: true,
|
||||||
|
format: 'iife',
|
||||||
|
name: 'app',
|
||||||
|
file: 'public/build/bundle.js'
|
||||||
|
},
|
||||||
|
plugins: [
|
||||||
|
svelte({
|
||||||
|
compilerOptions: {
|
||||||
|
// enable run-time checks when not in production
|
||||||
|
dev: !production
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
// we'll extract any component CSS out into
|
||||||
|
// a separate file - better for performance
|
||||||
|
css({ output: 'bundle.css' }),
|
||||||
|
|
||||||
|
// If you have external dependencies installed from
|
||||||
|
// npm, you'll most likely need these plugins. In
|
||||||
|
// some cases you'll need additional configuration -
|
||||||
|
// consult the documentation for details:
|
||||||
|
// https://github.com/rollup/plugins/tree/master/packages/commonjs
|
||||||
|
resolve({
|
||||||
|
browser: true,
|
||||||
|
dedupe: ['svelte'],
|
||||||
|
exportConditions: ['svelte']
|
||||||
|
}),
|
||||||
|
commonjs(),
|
||||||
|
|
||||||
|
// In dev mode, call `npm run start` once
|
||||||
|
// the bundle has been generated
|
||||||
|
!production && serve(),
|
||||||
|
|
||||||
|
// Watch the `public` directory and refresh the
|
||||||
|
// browser on changes when not in production
|
||||||
|
!production && livereload('public'),
|
||||||
|
|
||||||
|
// If we're building for production (npm run build
|
||||||
|
// instead of npm run dev), minify
|
||||||
|
production && terser()
|
||||||
|
],
|
||||||
|
watch: {
|
||||||
|
clearScreen: false
|
||||||
|
}
|
||||||
|
};
|
134
example_client/svelte-client/scripts/setupTypeScript.js
Normal file
134
example_client/svelte-client/scripts/setupTypeScript.js
Normal file
@@ -0,0 +1,134 @@
|
|||||||
|
// @ts-check
|
||||||
|
|
||||||
|
/** This script modifies the project to support TS code in .svelte files like:
|
||||||
|
|
||||||
|
<script lang="ts">
|
||||||
|
export let name: string;
|
||||||
|
</script>
|
||||||
|
|
||||||
|
As well as validating the code for CI.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/** To work on this script:
|
||||||
|
rm -rf test-template template && git clone sveltejs/template test-template && node scripts/setupTypeScript.js test-template
|
||||||
|
*/
|
||||||
|
|
||||||
|
import fs from "fs"
|
||||||
|
import path from "path"
|
||||||
|
import { argv } from "process"
|
||||||
|
import url from 'url';
|
||||||
|
|
||||||
|
const __filename = url.fileURLToPath(import.meta.url);
|
||||||
|
const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
|
||||||
|
const projectRoot = argv[2] || path.join(__dirname, "..")
|
||||||
|
|
||||||
|
// Add deps to pkg.json
|
||||||
|
const packageJSON = JSON.parse(fs.readFileSync(path.join(projectRoot, "package.json"), "utf8"))
|
||||||
|
packageJSON.devDependencies = Object.assign(packageJSON.devDependencies, {
|
||||||
|
"svelte-check": "^3.0.0",
|
||||||
|
"svelte-preprocess": "^5.0.0",
|
||||||
|
"@rollup/plugin-typescript": "^11.0.0",
|
||||||
|
"typescript": "^4.9.0",
|
||||||
|
"tslib": "^2.5.0",
|
||||||
|
"@tsconfig/svelte": "^3.0.0"
|
||||||
|
})
|
||||||
|
|
||||||
|
// Add script for checking
|
||||||
|
packageJSON.scripts = Object.assign(packageJSON.scripts, {
|
||||||
|
"check": "svelte-check"
|
||||||
|
})
|
||||||
|
|
||||||
|
// Write the package JSON
|
||||||
|
fs.writeFileSync(path.join(projectRoot, "package.json"), JSON.stringify(packageJSON, null, " "))
|
||||||
|
|
||||||
|
// mv src/main.js to main.ts - note, we need to edit rollup.config.js for this too
|
||||||
|
const beforeMainJSPath = path.join(projectRoot, "src", "main.js")
|
||||||
|
const afterMainTSPath = path.join(projectRoot, "src", "main.ts")
|
||||||
|
fs.renameSync(beforeMainJSPath, afterMainTSPath)
|
||||||
|
|
||||||
|
// Switch the app.svelte file to use TS
|
||||||
|
const appSveltePath = path.join(projectRoot, "src", "App.svelte")
|
||||||
|
let appFile = fs.readFileSync(appSveltePath, "utf8")
|
||||||
|
appFile = appFile.replace("<script>", '<script lang="ts">')
|
||||||
|
appFile = appFile.replace("export let name;", 'export let name: string;')
|
||||||
|
fs.writeFileSync(appSveltePath, appFile)
|
||||||
|
|
||||||
|
// Edit rollup config
|
||||||
|
const rollupConfigPath = path.join(projectRoot, "rollup.config.js")
|
||||||
|
let rollupConfig = fs.readFileSync(rollupConfigPath, "utf8")
|
||||||
|
|
||||||
|
// Edit imports
|
||||||
|
rollupConfig = rollupConfig.replace(`'rollup-plugin-css-only';`, `'rollup-plugin-css-only';
|
||||||
|
import sveltePreprocess from 'svelte-preprocess';
|
||||||
|
import typescript from '@rollup/plugin-typescript';`)
|
||||||
|
|
||||||
|
// Replace name of entry point
|
||||||
|
rollupConfig = rollupConfig.replace(`'src/main.js'`, `'src/main.ts'`)
|
||||||
|
|
||||||
|
// Add preprocessor
|
||||||
|
rollupConfig = rollupConfig.replace(
|
||||||
|
'compilerOptions:',
|
||||||
|
'preprocess: sveltePreprocess({ sourceMap: !production }),\n\t\t\tcompilerOptions:'
|
||||||
|
);
|
||||||
|
|
||||||
|
// Add TypeScript
|
||||||
|
rollupConfig = rollupConfig.replace(
|
||||||
|
'commonjs(),',
|
||||||
|
'commonjs(),\n\t\ttypescript({\n\t\t\tsourceMap: !production,\n\t\t\tinlineSources: !production\n\t\t}),'
|
||||||
|
);
|
||||||
|
fs.writeFileSync(rollupConfigPath, rollupConfig)
|
||||||
|
|
||||||
|
// Add svelte.config.js
|
||||||
|
const tsconfig = `{
|
||||||
|
"extends": "@tsconfig/svelte/tsconfig.json",
|
||||||
|
|
||||||
|
"include": ["src/**/*"],
|
||||||
|
"exclude": ["node_modules/*", "__sapper__/*", "public/*"]
|
||||||
|
}`
|
||||||
|
const tsconfigPath = path.join(projectRoot, "tsconfig.json")
|
||||||
|
fs.writeFileSync(tsconfigPath, tsconfig)
|
||||||
|
|
||||||
|
// Add TSConfig
|
||||||
|
const svelteConfig = `import sveltePreprocess from 'svelte-preprocess';
|
||||||
|
|
||||||
|
export default {
|
||||||
|
preprocess: sveltePreprocess()
|
||||||
|
};
|
||||||
|
`
|
||||||
|
const svelteConfigPath = path.join(projectRoot, "svelte.config.js")
|
||||||
|
fs.writeFileSync(svelteConfigPath, svelteConfig)
|
||||||
|
|
||||||
|
// Add global.d.ts
|
||||||
|
const dtsPath = path.join(projectRoot, "src", "global.d.ts")
|
||||||
|
fs.writeFileSync(dtsPath, `/// <reference types="svelte" />`)
|
||||||
|
|
||||||
|
// Delete this script, but not during testing
|
||||||
|
if (!argv[2]) {
|
||||||
|
// Remove the script
|
||||||
|
fs.unlinkSync(path.join(__filename))
|
||||||
|
|
||||||
|
// Check for Mac's DS_store file, and if it's the only one left remove it
|
||||||
|
const remainingFiles = fs.readdirSync(path.join(__dirname))
|
||||||
|
if (remainingFiles.length === 1 && remainingFiles[0] === '.DS_store') {
|
||||||
|
fs.unlinkSync(path.join(__dirname, '.DS_store'))
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if the scripts folder is empty
|
||||||
|
if (fs.readdirSync(path.join(__dirname)).length === 0) {
|
||||||
|
// Remove the scripts folder
|
||||||
|
fs.rmdirSync(path.join(__dirname))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Adds the extension recommendation
|
||||||
|
fs.mkdirSync(path.join(projectRoot, ".vscode"), { recursive: true })
|
||||||
|
fs.writeFileSync(path.join(projectRoot, ".vscode", "extensions.json"), `{
|
||||||
|
"recommendations": ["svelte.svelte-vscode"]
|
||||||
|
}
|
||||||
|
`)
|
||||||
|
|
||||||
|
console.log("Converted to TypeScript.")
|
||||||
|
|
||||||
|
if (fs.existsSync(path.join(projectRoot, "node_modules"))) {
|
||||||
|
console.log("\nYou will need to re-run your dependency manager to get started.")
|
||||||
|
}
|
6
example_client/svelte-client/src/App.svelte
Normal file
6
example_client/svelte-client/src/App.svelte
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
<script>
|
||||||
|
import Router from 'svelte-spa-router';
|
||||||
|
import routes from './routes.js';
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<Router {routes} />
|
36
example_client/svelte-client/src/api.js
Normal file
36
example_client/svelte-client/src/api.js
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
import axios from 'axios';
|
||||||
|
|
||||||
|
const API_BASE_URL = 'http://localhost:3000';
|
||||||
|
|
||||||
|
export const login = async (username, password) => {
|
||||||
|
const formData = new FormData();
|
||||||
|
formData.append('username', username);
|
||||||
|
formData.append('password', password);
|
||||||
|
|
||||||
|
const response = await axios.post(`${API_BASE_URL}/login`, formData, {
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'multipart/form-data',
|
||||||
|
},
|
||||||
|
withCredentials: true,
|
||||||
|
});
|
||||||
|
|
||||||
|
return response.data;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const fetchMessages = async () => {
|
||||||
|
const response = await axios.get(`${API_BASE_URL}/messages`, { withCredentials: true });
|
||||||
|
return response.data;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const createMessage = async (body) => {
|
||||||
|
const formData = new FormData();
|
||||||
|
formData.append('body', body);
|
||||||
|
|
||||||
|
const response = await axios.post(`${API_BASE_URL}/messages/new`, formData, {
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'multipart/form-data',
|
||||||
|
},
|
||||||
|
withCredentials: true,
|
||||||
|
});
|
||||||
|
return response.data;
|
||||||
|
};
|
10
example_client/svelte-client/src/main.js
Normal file
10
example_client/svelte-client/src/main.js
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
import App from './App.svelte';
|
||||||
|
|
||||||
|
const app = new App({
|
||||||
|
target: document.body,
|
||||||
|
props: {
|
||||||
|
name: 'world'
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
export default app;
|
7
example_client/svelte-client/src/routes.js
Normal file
7
example_client/svelte-client/src/routes.js
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
import Login from './routes/Login.svelte';
|
||||||
|
import Messages from './routes/Messages.svelte';
|
||||||
|
|
||||||
|
export default {
|
||||||
|
'/': Login,
|
||||||
|
'/messages': Messages,
|
||||||
|
};
|
22
example_client/svelte-client/src/routes/Login.svelte
Normal file
22
example_client/svelte-client/src/routes/Login.svelte
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
<script>
|
||||||
|
import { login } from '../api.js';
|
||||||
|
import { push } from 'svelte-spa-router';
|
||||||
|
let username = '';
|
||||||
|
let password = '';
|
||||||
|
let error = '';
|
||||||
|
|
||||||
|
const handleLogin = async () => {
|
||||||
|
try {
|
||||||
|
await login(username, password);
|
||||||
|
push('/messages');
|
||||||
|
} catch (err) {
|
||||||
|
error = err;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<h1>Login</h1>
|
||||||
|
<input type="text" bind:value={username} placeholder="Username" />
|
||||||
|
<input type="password" bind:value={password} placeholder="Password" />
|
||||||
|
<button on:click={handleLogin}>Login</button>
|
||||||
|
<p style="color: red">{error}</p>
|
26
example_client/svelte-client/src/routes/Messages.svelte
Normal file
26
example_client/svelte-client/src/routes/Messages.svelte
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
<script>
|
||||||
|
import { fetchMessages, createMessage } from '../api.js';
|
||||||
|
let messages = [];
|
||||||
|
let newMessage = '';
|
||||||
|
|
||||||
|
const loadMessages = async () => {
|
||||||
|
messages = await fetchMessages();
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleCreateMessage = async () => {
|
||||||
|
await createMessage(newMessage);
|
||||||
|
newMessage = '';
|
||||||
|
await loadMessages();
|
||||||
|
};
|
||||||
|
|
||||||
|
loadMessages();
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<h1>Messages</h1>
|
||||||
|
<ul>
|
||||||
|
{#each messages as message}
|
||||||
|
<li>{message.user.name} - {message.body} - {message.timestamp}</li>
|
||||||
|
{/each}
|
||||||
|
</ul>
|
||||||
|
<input type="text" bind:value={newMessage} placeholder="New message" />
|
||||||
|
<button on:click={handleCreateMessage}>Send</button>
|
2
go.mod
2
go.mod
@@ -13,6 +13,8 @@ require (
|
|||||||
github.com/joho/godotenv v1.5.1
|
github.com/joho/godotenv v1.5.1
|
||||||
)
|
)
|
||||||
|
|
||||||
|
require github.com/go-chi/cors v1.2.1
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/golang-jwt/jwt/v5 v5.2.2
|
github.com/golang-jwt/jwt/v5 v5.2.2
|
||||||
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
|
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
|
||||||
|
2
go.sum
2
go.sum
@@ -10,6 +10,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
|
|||||||
github.com/go-chi/chi/v5 v5.0.1/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
|
github.com/go-chi/chi/v5 v5.0.1/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
|
||||||
github.com/go-chi/chi/v5 v5.2.0 h1:Aj1EtB0qR2Rdo2dG4O94RIU35w2lvQSj6BRA4+qwFL0=
|
github.com/go-chi/chi/v5 v5.2.0 h1:Aj1EtB0qR2Rdo2dG4O94RIU35w2lvQSj6BRA4+qwFL0=
|
||||||
github.com/go-chi/chi/v5 v5.2.0/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
|
github.com/go-chi/chi/v5 v5.2.0/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
|
||||||
|
github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4=
|
||||||
|
github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
|
||||||
github.com/go-chi/docgen v1.3.0 h1:dmDJ2I+EJfCTrxfgxQDwfR/OpZLTRFKe7EKB8v7yuxI=
|
github.com/go-chi/docgen v1.3.0 h1:dmDJ2I+EJfCTrxfgxQDwfR/OpZLTRFKe7EKB8v7yuxI=
|
||||||
github.com/go-chi/docgen v1.3.0/go.mod h1:G9W0G551cs2BFMSn/cnGwX+JBHEloAgo17MBhyrnhPI=
|
github.com/go-chi/docgen v1.3.0/go.mod h1:G9W0G551cs2BFMSn/cnGwX+JBHEloAgo17MBhyrnhPI=
|
||||||
github.com/go-chi/render v1.0.1/go.mod h1:pq4Rr7HbnsdaeHagklXub+p6Wd16Af5l9koip1OvJns=
|
github.com/go-chi/render v1.0.1/go.mod h1:pq4Rr7HbnsdaeHagklXub+p6Wd16Af5l9koip1OvJns=
|
||||||
|
21
vendor/github.com/go-chi/cors/LICENSE
generated
vendored
Normal file
21
vendor/github.com/go-chi/cors/LICENSE
generated
vendored
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
Copyright (c) 2014 Olivier Poitrey <rs@dailymotion.com>
|
||||||
|
Copyright (c) 2016-Present https://github.com/go-chi authors
|
||||||
|
|
||||||
|
MIT License
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||||
|
this software and associated documentation files (the "Software"), to deal in
|
||||||
|
the Software without restriction, including without limitation the rights to
|
||||||
|
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
|
||||||
|
the Software, and to permit persons to whom the Software is furnished to do so,
|
||||||
|
subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
||||||
|
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
||||||
|
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
||||||
|
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||||
|
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
39
vendor/github.com/go-chi/cors/README.md
generated
vendored
Normal file
39
vendor/github.com/go-chi/cors/README.md
generated
vendored
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
# CORS net/http middleware
|
||||||
|
|
||||||
|
[go-chi/cors](https://github.com/go-chi/cors) is a fork of [github.com/rs/cors](https://github.com/rs/cors) that
|
||||||
|
provides a `net/http` compatible middleware for performing preflight CORS checks on the server side. These headers
|
||||||
|
are required for using the browser native [Fetch API](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API).
|
||||||
|
|
||||||
|
This middleware is designed to be used as a top-level middleware on the [chi](https://github.com/go-chi/chi) router.
|
||||||
|
Applying with within a `r.Group()` or using `With()` will not work without routes matching `OPTIONS` added.
|
||||||
|
|
||||||
|
## Usage
|
||||||
|
|
||||||
|
```go
|
||||||
|
func main() {
|
||||||
|
r := chi.NewRouter()
|
||||||
|
|
||||||
|
// Basic CORS
|
||||||
|
// for more ideas, see: https://developer.github.com/v3/#cross-origin-resource-sharing
|
||||||
|
r.Use(cors.Handler(cors.Options{
|
||||||
|
// AllowedOrigins: []string{"https://foo.com"}, // Use this to allow specific origin hosts
|
||||||
|
AllowedOrigins: []string{"https://*", "http://*"},
|
||||||
|
// AllowOriginFunc: func(r *http.Request, origin string) bool { return true },
|
||||||
|
AllowedMethods: []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
|
||||||
|
AllowedHeaders: []string{"Accept", "Authorization", "Content-Type", "X-CSRF-Token"},
|
||||||
|
ExposedHeaders: []string{"Link"},
|
||||||
|
AllowCredentials: false,
|
||||||
|
MaxAge: 300, // Maximum value not ignored by any of major browsers
|
||||||
|
}))
|
||||||
|
|
||||||
|
r.Get("/", func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.Write([]byte("welcome"))
|
||||||
|
})
|
||||||
|
|
||||||
|
http.ListenAndServe(":3000", r)
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## Credits
|
||||||
|
|
||||||
|
All credit for the original work of this middleware goes out to [github.com/rs](github.com/rs).
|
400
vendor/github.com/go-chi/cors/cors.go
generated
vendored
Normal file
400
vendor/github.com/go-chi/cors/cors.go
generated
vendored
Normal file
@@ -0,0 +1,400 @@
|
|||||||
|
// cors package is net/http handler to handle CORS related requests
|
||||||
|
// as defined by http://www.w3.org/TR/cors/
|
||||||
|
//
|
||||||
|
// You can configure it by passing an option struct to cors.New:
|
||||||
|
//
|
||||||
|
// c := cors.New(cors.Options{
|
||||||
|
// AllowedOrigins: []string{"foo.com"},
|
||||||
|
// AllowedMethods: []string{"GET", "POST", "DELETE"},
|
||||||
|
// AllowCredentials: true,
|
||||||
|
// })
|
||||||
|
//
|
||||||
|
// Then insert the handler in the chain:
|
||||||
|
//
|
||||||
|
// handler = c.Handler(handler)
|
||||||
|
//
|
||||||
|
// See Options documentation for more options.
|
||||||
|
//
|
||||||
|
// The resulting handler is a standard net/http handler.
|
||||||
|
package cors
|
||||||
|
|
||||||
|
import (
|
||||||
|
"log"
|
||||||
|
"net/http"
|
||||||
|
"os"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Options is a configuration container to setup the CORS middleware.
|
||||||
|
type Options struct {
|
||||||
|
// AllowedOrigins is a list of origins a cross-domain request can be executed from.
|
||||||
|
// If the special "*" value is present in the list, all origins will be allowed.
|
||||||
|
// An origin may contain a wildcard (*) to replace 0 or more characters
|
||||||
|
// (i.e.: http://*.domain.com). Usage of wildcards implies a small performance penalty.
|
||||||
|
// Only one wildcard can be used per origin.
|
||||||
|
// Default value is ["*"]
|
||||||
|
AllowedOrigins []string
|
||||||
|
|
||||||
|
// AllowOriginFunc is a custom function to validate the origin. It takes the origin
|
||||||
|
// as argument and returns true if allowed or false otherwise. If this option is
|
||||||
|
// set, the content of AllowedOrigins is ignored.
|
||||||
|
AllowOriginFunc func(r *http.Request, origin string) bool
|
||||||
|
|
||||||
|
// AllowedMethods is a list of methods the client is allowed to use with
|
||||||
|
// cross-domain requests. Default value is simple methods (HEAD, GET and POST).
|
||||||
|
AllowedMethods []string
|
||||||
|
|
||||||
|
// AllowedHeaders is list of non simple headers the client is allowed to use with
|
||||||
|
// cross-domain requests.
|
||||||
|
// If the special "*" value is present in the list, all headers will be allowed.
|
||||||
|
// Default value is [] but "Origin" is always appended to the list.
|
||||||
|
AllowedHeaders []string
|
||||||
|
|
||||||
|
// ExposedHeaders indicates which headers are safe to expose to the API of a CORS
|
||||||
|
// API specification
|
||||||
|
ExposedHeaders []string
|
||||||
|
|
||||||
|
// AllowCredentials indicates whether the request can include user credentials like
|
||||||
|
// cookies, HTTP authentication or client side SSL certificates.
|
||||||
|
AllowCredentials bool
|
||||||
|
|
||||||
|
// MaxAge indicates how long (in seconds) the results of a preflight request
|
||||||
|
// can be cached
|
||||||
|
MaxAge int
|
||||||
|
|
||||||
|
// OptionsPassthrough instructs preflight to let other potential next handlers to
|
||||||
|
// process the OPTIONS method. Turn this on if your application handles OPTIONS.
|
||||||
|
OptionsPassthrough bool
|
||||||
|
|
||||||
|
// Debugging flag adds additional output to debug server side CORS issues
|
||||||
|
Debug bool
|
||||||
|
}
|
||||||
|
|
||||||
|
// Logger generic interface for logger
|
||||||
|
type Logger interface {
|
||||||
|
Printf(string, ...interface{})
|
||||||
|
}
|
||||||
|
|
||||||
|
// Cors http handler
|
||||||
|
type Cors struct {
|
||||||
|
// Debug logger
|
||||||
|
Log Logger
|
||||||
|
|
||||||
|
// Normalized list of plain allowed origins
|
||||||
|
allowedOrigins []string
|
||||||
|
|
||||||
|
// List of allowed origins containing wildcards
|
||||||
|
allowedWOrigins []wildcard
|
||||||
|
|
||||||
|
// Optional origin validator function
|
||||||
|
allowOriginFunc func(r *http.Request, origin string) bool
|
||||||
|
|
||||||
|
// Normalized list of allowed headers
|
||||||
|
allowedHeaders []string
|
||||||
|
|
||||||
|
// Normalized list of allowed methods
|
||||||
|
allowedMethods []string
|
||||||
|
|
||||||
|
// Normalized list of exposed headers
|
||||||
|
exposedHeaders []string
|
||||||
|
maxAge int
|
||||||
|
|
||||||
|
// Set to true when allowed origins contains a "*"
|
||||||
|
allowedOriginsAll bool
|
||||||
|
|
||||||
|
// Set to true when allowed headers contains a "*"
|
||||||
|
allowedHeadersAll bool
|
||||||
|
|
||||||
|
allowCredentials bool
|
||||||
|
optionPassthrough bool
|
||||||
|
}
|
||||||
|
|
||||||
|
// New creates a new Cors handler with the provided options.
|
||||||
|
func New(options Options) *Cors {
|
||||||
|
c := &Cors{
|
||||||
|
exposedHeaders: convert(options.ExposedHeaders, http.CanonicalHeaderKey),
|
||||||
|
allowOriginFunc: options.AllowOriginFunc,
|
||||||
|
allowCredentials: options.AllowCredentials,
|
||||||
|
maxAge: options.MaxAge,
|
||||||
|
optionPassthrough: options.OptionsPassthrough,
|
||||||
|
}
|
||||||
|
if options.Debug && c.Log == nil {
|
||||||
|
c.Log = log.New(os.Stdout, "[cors] ", log.LstdFlags)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Normalize options
|
||||||
|
// Note: for origins and methods matching, the spec requires a case-sensitive matching.
|
||||||
|
// As it may error prone, we chose to ignore the spec here.
|
||||||
|
|
||||||
|
// Allowed Origins
|
||||||
|
if len(options.AllowedOrigins) == 0 {
|
||||||
|
if options.AllowOriginFunc == nil {
|
||||||
|
// Default is all origins
|
||||||
|
c.allowedOriginsAll = true
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
c.allowedOrigins = []string{}
|
||||||
|
c.allowedWOrigins = []wildcard{}
|
||||||
|
for _, origin := range options.AllowedOrigins {
|
||||||
|
// Normalize
|
||||||
|
origin = strings.ToLower(origin)
|
||||||
|
if origin == "*" {
|
||||||
|
// If "*" is present in the list, turn the whole list into a match all
|
||||||
|
c.allowedOriginsAll = true
|
||||||
|
c.allowedOrigins = nil
|
||||||
|
c.allowedWOrigins = nil
|
||||||
|
break
|
||||||
|
} else if i := strings.IndexByte(origin, '*'); i >= 0 {
|
||||||
|
// Split the origin in two: start and end string without the *
|
||||||
|
w := wildcard{origin[0:i], origin[i+1:]}
|
||||||
|
c.allowedWOrigins = append(c.allowedWOrigins, w)
|
||||||
|
} else {
|
||||||
|
c.allowedOrigins = append(c.allowedOrigins, origin)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Allowed Headers
|
||||||
|
if len(options.AllowedHeaders) == 0 {
|
||||||
|
// Use sensible defaults
|
||||||
|
c.allowedHeaders = []string{"Origin", "Accept", "Content-Type"}
|
||||||
|
} else {
|
||||||
|
// Origin is always appended as some browsers will always request for this header at preflight
|
||||||
|
c.allowedHeaders = convert(append(options.AllowedHeaders, "Origin"), http.CanonicalHeaderKey)
|
||||||
|
for _, h := range options.AllowedHeaders {
|
||||||
|
if h == "*" {
|
||||||
|
c.allowedHeadersAll = true
|
||||||
|
c.allowedHeaders = nil
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Allowed Methods
|
||||||
|
if len(options.AllowedMethods) == 0 {
|
||||||
|
// Default is spec's "simple" methods
|
||||||
|
c.allowedMethods = []string{http.MethodGet, http.MethodPost, http.MethodHead}
|
||||||
|
} else {
|
||||||
|
c.allowedMethods = convert(options.AllowedMethods, strings.ToUpper)
|
||||||
|
}
|
||||||
|
|
||||||
|
return c
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handler creates a new Cors handler with passed options.
|
||||||
|
func Handler(options Options) func(next http.Handler) http.Handler {
|
||||||
|
c := New(options)
|
||||||
|
return c.Handler
|
||||||
|
}
|
||||||
|
|
||||||
|
// AllowAll create a new Cors handler with permissive configuration allowing all
|
||||||
|
// origins with all standard methods with any header and credentials.
|
||||||
|
func AllowAll() *Cors {
|
||||||
|
return New(Options{
|
||||||
|
AllowedOrigins: []string{"*"},
|
||||||
|
AllowedMethods: []string{
|
||||||
|
http.MethodHead,
|
||||||
|
http.MethodGet,
|
||||||
|
http.MethodPost,
|
||||||
|
http.MethodPut,
|
||||||
|
http.MethodPatch,
|
||||||
|
http.MethodDelete,
|
||||||
|
},
|
||||||
|
AllowedHeaders: []string{"*"},
|
||||||
|
AllowCredentials: false,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handler apply the CORS specification on the request, and add relevant CORS headers
|
||||||
|
// as necessary.
|
||||||
|
func (c *Cors) Handler(next http.Handler) http.Handler {
|
||||||
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
if r.Method == http.MethodOptions && r.Header.Get("Access-Control-Request-Method") != "" {
|
||||||
|
c.logf("Handler: Preflight request")
|
||||||
|
c.handlePreflight(w, r)
|
||||||
|
// Preflight requests are standalone and should stop the chain as some other
|
||||||
|
// middleware may not handle OPTIONS requests correctly. One typical example
|
||||||
|
// is authentication middleware ; OPTIONS requests won't carry authentication
|
||||||
|
// headers (see #1)
|
||||||
|
if c.optionPassthrough {
|
||||||
|
next.ServeHTTP(w, r)
|
||||||
|
} else {
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
c.logf("Handler: Actual request")
|
||||||
|
c.handleActualRequest(w, r)
|
||||||
|
next.ServeHTTP(w, r)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// handlePreflight handles pre-flight CORS requests
|
||||||
|
func (c *Cors) handlePreflight(w http.ResponseWriter, r *http.Request) {
|
||||||
|
headers := w.Header()
|
||||||
|
origin := r.Header.Get("Origin")
|
||||||
|
|
||||||
|
if r.Method != http.MethodOptions {
|
||||||
|
c.logf("Preflight aborted: %s!=OPTIONS", r.Method)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// Always set Vary headers
|
||||||
|
// see https://github.com/rs/cors/issues/10,
|
||||||
|
// https://github.com/rs/cors/commit/dbdca4d95feaa7511a46e6f1efb3b3aa505bc43f#commitcomment-12352001
|
||||||
|
headers.Add("Vary", "Origin")
|
||||||
|
headers.Add("Vary", "Access-Control-Request-Method")
|
||||||
|
headers.Add("Vary", "Access-Control-Request-Headers")
|
||||||
|
|
||||||
|
if origin == "" {
|
||||||
|
c.logf("Preflight aborted: empty origin")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if !c.isOriginAllowed(r, origin) {
|
||||||
|
c.logf("Preflight aborted: origin '%s' not allowed", origin)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
reqMethod := r.Header.Get("Access-Control-Request-Method")
|
||||||
|
if !c.isMethodAllowed(reqMethod) {
|
||||||
|
c.logf("Preflight aborted: method '%s' not allowed", reqMethod)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
reqHeaders := parseHeaderList(r.Header.Get("Access-Control-Request-Headers"))
|
||||||
|
if !c.areHeadersAllowed(reqHeaders) {
|
||||||
|
c.logf("Preflight aborted: headers '%v' not allowed", reqHeaders)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if c.allowedOriginsAll {
|
||||||
|
headers.Set("Access-Control-Allow-Origin", "*")
|
||||||
|
} else {
|
||||||
|
headers.Set("Access-Control-Allow-Origin", origin)
|
||||||
|
}
|
||||||
|
// Spec says: Since the list of methods can be unbounded, simply returning the method indicated
|
||||||
|
// by Access-Control-Request-Method (if supported) can be enough
|
||||||
|
headers.Set("Access-Control-Allow-Methods", strings.ToUpper(reqMethod))
|
||||||
|
if len(reqHeaders) > 0 {
|
||||||
|
|
||||||
|
// Spec says: Since the list of headers can be unbounded, simply returning supported headers
|
||||||
|
// from Access-Control-Request-Headers can be enough
|
||||||
|
headers.Set("Access-Control-Allow-Headers", strings.Join(reqHeaders, ", "))
|
||||||
|
}
|
||||||
|
if c.allowCredentials {
|
||||||
|
headers.Set("Access-Control-Allow-Credentials", "true")
|
||||||
|
}
|
||||||
|
if c.maxAge > 0 {
|
||||||
|
headers.Set("Access-Control-Max-Age", strconv.Itoa(c.maxAge))
|
||||||
|
}
|
||||||
|
c.logf("Preflight response headers: %v", headers)
|
||||||
|
}
|
||||||
|
|
||||||
|
// handleActualRequest handles simple cross-origin requests, actual request or redirects
|
||||||
|
func (c *Cors) handleActualRequest(w http.ResponseWriter, r *http.Request) {
|
||||||
|
headers := w.Header()
|
||||||
|
origin := r.Header.Get("Origin")
|
||||||
|
|
||||||
|
// Always set Vary, see https://github.com/rs/cors/issues/10
|
||||||
|
headers.Add("Vary", "Origin")
|
||||||
|
if origin == "" {
|
||||||
|
c.logf("Actual request no headers added: missing origin")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if !c.isOriginAllowed(r, origin) {
|
||||||
|
c.logf("Actual request no headers added: origin '%s' not allowed", origin)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Note that spec does define a way to specifically disallow a simple method like GET or
|
||||||
|
// POST. Access-Control-Allow-Methods is only used for pre-flight requests and the
|
||||||
|
// spec doesn't instruct to check the allowed methods for simple cross-origin requests.
|
||||||
|
// We think it's a nice feature to be able to have control on those methods though.
|
||||||
|
if !c.isMethodAllowed(r.Method) {
|
||||||
|
c.logf("Actual request no headers added: method '%s' not allowed", r.Method)
|
||||||
|
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if c.allowedOriginsAll {
|
||||||
|
headers.Set("Access-Control-Allow-Origin", "*")
|
||||||
|
} else {
|
||||||
|
headers.Set("Access-Control-Allow-Origin", origin)
|
||||||
|
}
|
||||||
|
if len(c.exposedHeaders) > 0 {
|
||||||
|
headers.Set("Access-Control-Expose-Headers", strings.Join(c.exposedHeaders, ", "))
|
||||||
|
}
|
||||||
|
if c.allowCredentials {
|
||||||
|
headers.Set("Access-Control-Allow-Credentials", "true")
|
||||||
|
}
|
||||||
|
c.logf("Actual response added headers: %v", headers)
|
||||||
|
}
|
||||||
|
|
||||||
|
// convenience method. checks if a logger is set.
|
||||||
|
func (c *Cors) logf(format string, a ...interface{}) {
|
||||||
|
if c.Log != nil {
|
||||||
|
c.Log.Printf(format, a...)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// isOriginAllowed checks if a given origin is allowed to perform cross-domain requests
|
||||||
|
// on the endpoint
|
||||||
|
func (c *Cors) isOriginAllowed(r *http.Request, origin string) bool {
|
||||||
|
if c.allowOriginFunc != nil {
|
||||||
|
return c.allowOriginFunc(r, origin)
|
||||||
|
}
|
||||||
|
if c.allowedOriginsAll {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
origin = strings.ToLower(origin)
|
||||||
|
for _, o := range c.allowedOrigins {
|
||||||
|
if o == origin {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, w := range c.allowedWOrigins {
|
||||||
|
if w.match(origin) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
// isMethodAllowed checks if a given method can be used as part of a cross-domain request
|
||||||
|
// on the endpoint
|
||||||
|
func (c *Cors) isMethodAllowed(method string) bool {
|
||||||
|
if len(c.allowedMethods) == 0 {
|
||||||
|
// If no method allowed, always return false, even for preflight request
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
method = strings.ToUpper(method)
|
||||||
|
if method == http.MethodOptions {
|
||||||
|
// Always allow preflight requests
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
for _, m := range c.allowedMethods {
|
||||||
|
if m == method {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
// areHeadersAllowed checks if a given list of headers are allowed to used within
|
||||||
|
// a cross-domain request.
|
||||||
|
func (c *Cors) areHeadersAllowed(requestedHeaders []string) bool {
|
||||||
|
if c.allowedHeadersAll || len(requestedHeaders) == 0 {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
for _, header := range requestedHeaders {
|
||||||
|
header = http.CanonicalHeaderKey(header)
|
||||||
|
found := false
|
||||||
|
for _, h := range c.allowedHeaders {
|
||||||
|
if h == header {
|
||||||
|
found = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !found {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
70
vendor/github.com/go-chi/cors/utils.go
generated
vendored
Normal file
70
vendor/github.com/go-chi/cors/utils.go
generated
vendored
Normal file
@@ -0,0 +1,70 @@
|
|||||||
|
package cors
|
||||||
|
|
||||||
|
import "strings"
|
||||||
|
|
||||||
|
const toLower = 'a' - 'A'
|
||||||
|
|
||||||
|
type converter func(string) string
|
||||||
|
|
||||||
|
type wildcard struct {
|
||||||
|
prefix string
|
||||||
|
suffix string
|
||||||
|
}
|
||||||
|
|
||||||
|
func (w wildcard) match(s string) bool {
|
||||||
|
return len(s) >= len(w.prefix+w.suffix) && strings.HasPrefix(s, w.prefix) && strings.HasSuffix(s, w.suffix)
|
||||||
|
}
|
||||||
|
|
||||||
|
// convert converts a list of string using the passed converter function
|
||||||
|
func convert(s []string, c converter) []string {
|
||||||
|
out := []string{}
|
||||||
|
for _, i := range s {
|
||||||
|
out = append(out, c(i))
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// parseHeaderList tokenize + normalize a string containing a list of headers
|
||||||
|
func parseHeaderList(headerList string) []string {
|
||||||
|
l := len(headerList)
|
||||||
|
h := make([]byte, 0, l)
|
||||||
|
upper := true
|
||||||
|
// Estimate the number headers in order to allocate the right splice size
|
||||||
|
t := 0
|
||||||
|
for i := 0; i < l; i++ {
|
||||||
|
if headerList[i] == ',' {
|
||||||
|
t++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
headers := make([]string, 0, t)
|
||||||
|
for i := 0; i < l; i++ {
|
||||||
|
b := headerList[i]
|
||||||
|
if b >= 'a' && b <= 'z' {
|
||||||
|
if upper {
|
||||||
|
h = append(h, b-toLower)
|
||||||
|
} else {
|
||||||
|
h = append(h, b)
|
||||||
|
}
|
||||||
|
} else if b >= 'A' && b <= 'Z' {
|
||||||
|
if !upper {
|
||||||
|
h = append(h, b+toLower)
|
||||||
|
} else {
|
||||||
|
h = append(h, b)
|
||||||
|
}
|
||||||
|
} else if b == '-' || b == '_' || b == '.' || (b >= '0' && b <= '9') {
|
||||||
|
h = append(h, b)
|
||||||
|
}
|
||||||
|
|
||||||
|
if b == ' ' || b == ',' || i == l-1 {
|
||||||
|
if len(h) > 0 {
|
||||||
|
// Flush the found header
|
||||||
|
headers = append(headers, string(h))
|
||||||
|
h = h[:0]
|
||||||
|
upper = true
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
upper = b == '-'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return headers
|
||||||
|
}
|
3
vendor/modules.txt
vendored
3
vendor/modules.txt
vendored
@@ -5,6 +5,9 @@ github.com/ajg/form
|
|||||||
## explicit; go 1.14
|
## explicit; go 1.14
|
||||||
github.com/go-chi/chi/v5
|
github.com/go-chi/chi/v5
|
||||||
github.com/go-chi/chi/v5/middleware
|
github.com/go-chi/chi/v5/middleware
|
||||||
|
# github.com/go-chi/cors v1.2.1
|
||||||
|
## explicit; go 1.14
|
||||||
|
github.com/go-chi/cors
|
||||||
# github.com/go-chi/docgen v1.3.0
|
# github.com/go-chi/docgen v1.3.0
|
||||||
## explicit; go 1.15
|
## explicit; go 1.15
|
||||||
github.com/go-chi/docgen
|
github.com/go-chi/docgen
|
||||||
|
Reference in New Issue
Block a user