Merge branch 'dev' of git.phc.dm.unipi.it:phc/problemi into dev
This commit is contained in:
+1
-1
@@ -5,7 +5,7 @@ import { DatabaseConnection, getUser, createUser } from './db/database'
|
||||
import { UserId } from '../shared/model'
|
||||
import { SessionService } from './routes'
|
||||
|
||||
export function setupOauth(r: Router, db: DatabaseConnection, sessions: SessionService) {
|
||||
export function setupOAuth(r: Router, db: DatabaseConnection, sessions: SessionService) {
|
||||
const config = {
|
||||
client: {
|
||||
id: process.env.OAUTH_CLIENT_ID ?? '',
|
||||
|
||||
+2
-2
@@ -38,7 +38,7 @@ import {
|
||||
import { initialDatabaseValue } from './db/example-data'
|
||||
|
||||
import { validateObjectKeys } from '../shared/utils'
|
||||
import { setupOauth } from './auth'
|
||||
import { setupOAuth } from './auth'
|
||||
|
||||
type SessionId = Opaque<string, string, 'session'>
|
||||
|
||||
@@ -78,7 +78,7 @@ export async function createApiRouter() {
|
||||
|
||||
const authRouter: Router = express.Router()
|
||||
|
||||
setupOauth(authRouter, db, sessions)
|
||||
setupOAuth(authRouter, db, sessions)
|
||||
r.use('/auth', authRouter)
|
||||
|
||||
r.get('/api/status', (req, res) => {
|
||||
|
||||
Reference in New Issue
Block a user