martin/databag
1
0
Fork 0
mirror of https://github.com/balzack/databag.git synced 2025-04-20 00:25:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

allow cors since not using cookies anymore

Browse Source
This commit is contained in:
balzack 2024-07-19 22:07:23 -07:00
parent 79e217072e
commit 5f3ad8ed25
7 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/client/web/src/app.spec.tsx
View File

@ -1,4 +1,4 @@
import { App } from '@/app'
import { App } from '@/App'
import { render, screen } from '@testing-library/react'
it('Test', () => {

4
app/client/web/src/context/useAppContext.hook.ts
View File

@ -37,7 +37,7 @@ export function useAppContext () {
}, [])
const init = async () => {
const sdk = new DatabagSDK(null, null)
const sdk = new DatabagSDK(null)
const store = new Store()
const session: Session | null = await sdk.initOnlineStore(store)
console.log(session)
@ -56,7 +56,7 @@ export function useAppContext () {
appName: 'databag',
}
console.log('-----> SDK LOGIN')
const login = await sdk.login('asdf', 'asdf', 'https://balzack.coredb.org', null, params)
const login = await sdk.login('asdf', 'asdf', 'balzack.coredb.org', true, null, params)
console.log(login)
updateState({ sdk, session: login })
}

2
app/client/web/src/main.tsx
View File

@ -1,6 +1,6 @@
import { StrictMode } from 'react'
import { createRoot } from 'react-dom/client'
import { App } from '@/app'
import { App } from '@/App'
import './index.css'
import { AppContextProvider } from './context/AppContext'

2
net/container/entrypoint.sh
View File

@ -14,7 +14,7 @@ fi
if [ "$DEV" == "1" ]; then
cd /app/databag/net/server
./databag -m dev -p 7000 -w /app/databag/net/web/build -s /var/lib/databag -t /opt/databag/transform &
./databag -p 7000 -w /app/databag/net/web/build -s /var/lib/databag -t /opt/databag/transform &
/app/dev_setup.sh || true
while true; do
sleep 1;

6
net/server/internal/api_status.go
View File

@ -24,10 +24,8 @@ func Status(w http.ResponseWriter, r *http.Request) {
ringMode := r.FormValue("mode") == "ring"
// allows cross origin websocket in dev mode
if APPMode == "dev" {
upgrader.CheckOrigin = func(r *http.Request) bool {
return true
}
upgrader.CheckOrigin = func(r *http.Request) bool {
return true
}
// accept websocket connection

3
net/server/internal/appValues.go
View File

@ -1,8 +1,5 @@
package databag
//APPMode for development mode
var APPMode = "prod"
//APPCopyTransform reserved tranform code indicating copy
const APPTransformCopy = "_"

16
net/server/main.go
View File

@ -17,7 +17,6 @@ func main() {
var cert string
var key string
var transformPath string
var mode string
port := ":443"
storePath := "/var/lib/databag"
@ -37,8 +36,6 @@ func main() {
key = args[i + 1]
} else if args[i] == "-t" {
transformPath = args[i + 1]
} else if args[i] == "-m" {
mode = args[i + 1]
}
}
@ -79,7 +76,6 @@ func main() {
}
}
app.APPMode = mode
router := app.NewRouter(webApp)
origins := handlers.AllowedOrigins([]string{"*"})
headers := handlers.AllowedHeaders([]string{"content-type", "authorization", "credentials"})
@ -87,17 +83,9 @@ func main() {
if cert != "" && key != "" {
log.Printf("using args:" + " -s " + storePath + " -w " + webApp + " -p " + port[1:] + " -c " + cert + " -k " + key + " -t " + transformPath)
if mode != "dev" {
log.Fatal(http.ListenAndServeTLS(port, cert, key, handlers.CORS(origins, methods)(router)))
} else {
log.Fatal(http.ListenAndServeTLS(port, cert, key, handlers.CORS(origins, headers, methods)(router)))
}
log.Fatal(http.ListenAndServeTLS(port, cert, key, handlers.CORS(origins, headers, methods)(router)))
} else {
log.Printf("using args:" + " -s " + storePath + " -w " + webApp + " -p " + port[1:] + " -t " + transformPath)
if mode != "dev" {
log.Fatal(http.ListenAndServe(port, handlers.CORS(origins, methods)(router)))
} else {
log.Fatal(http.ListenAndServe(port, handlers.CORS(origins, headers, methods)(router)))
}
log.Fatal(http.ListenAndServe(port, handlers.CORS(origins, headers, methods)(router)))
}
}