Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Gamma2 Integration #108

Merged
merged 5 commits into from
Jun 23, 2024
Merged

Gamma2 Integration #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8b7aea7
tried to log in with gamma 2, ran into a lot of errors
Tussies Jun 8, 2024
3fedbee
Fixed integration with gamma 2
molleer Jun 9, 2024
cbe18c9
Removed unintended changes
molleer Jun 9, 2024
1b0ceb6
Removed hard-coded shit
molleer Jun 17, 2024
67d3554
Update .env.example file
molleer Jun 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
node_modules
build
.vscode/
package-lock.json
.env
23 changes: 23 additions & 0 deletions backend/.env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
DB_USER=postgres
DB_PASS=password
DB_HOST=localhost
DB_PORT=5432
DB_NAME=bookit

DATABASE_URL=postgres://$DB_USER:$DB_PASS@$DB_HOST:$DB_PORT/$DB_NAME

ISSUER_BASE_URL=https://auth.chalmers.it
BASE_URL=http://localhost:8080
CLIENT_ID=[client id]
CLIENT_SECRET=[client secret]
API_KEY=[api-key id]:[api-key] # pre-shared token
SECRET=some_random_long_string

REDIS_HOST=localhost
REDIS_PORT=6379
REDIS_PASS=""

SESSION_SECRET=secret
GRAPHIQL=true
MOCK=true
ADMIN_AUTHORITY=bookit-admin
16 changes: 0 additions & 16 deletions backend/dev_setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,4 @@ export DB_NAME=bookit

export DATABASE_URL=postgres://$DB_USER:$DB_PASS@$DB_HOST:$DB_PORT/$DB_NAME

export GAMMA_AUTH_URL=http://localhost:8081/api/oauth/authorize
export GAMMA_TOKEN_URL=http://localhost:8081/api/oauth/token
export GAMMA_USER_URL=http://localhost:8081/api/users/me
export GAMMA_CLIENT_ID=id
export GAMMA_CLIENT_SECRET=secret
export GAMMA_CALLBACK_URL=http://localhost:3001/auth/callback

export REDIS_HOST=localhost
export REDIS_PORT=6379
export REDIS_PASS=""

export SESSION_SECRET=secret
export GRAPHIQL=true
export MOCK=true
export ADMIN_AUTHORITY=bookit-admin

npm run migrate
Loading
Loading