Skip to content

Commit

Permalink
Merge branch 'main' into recent_note_list_api
Browse files Browse the repository at this point in the history
  • Loading branch information
HyTekCoop committed Oct 21, 2023
2 parents 594e5b9 + 0a24a86 commit 7f39c6f
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
19 changes: 10 additions & 9 deletions src/presentation/http/http-api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,11 @@ export default class HttpApi implements Api {
},
servers: [ {
url: 'http://localhost:1337',
description: 'Localhost environment'
description: 'Localhost environment',
}, {
url: 'https://notex.so',
description: 'Stage environment'
}],
description: 'Stage environment',
} ],
components: {
securitySchemes: {
oAuthGoogle: {
Expand All @@ -144,14 +144,15 @@ export default class HttpApi implements Api {
authorizationCode: {
authorizationUrl: 'https://notex.so/oauth/google/login',
scopes: {
// eslint-disable-next-line @typescript-eslint/naming-convention
'notes_management': 'Create, read, update and delete notes',
},
tokenUrl: ''
}
}
}
}
}
tokenUrl: '',
},
},
},
},
},
},
});
}
Expand Down
2 changes: 1 addition & 1 deletion src/tests/utils/insert-data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ async function insertNotes(db: SequelizeOrm): Promise<void> {
*/
async function insertNoteSettings(db: SequelizeOrm): Promise<void> {
for (const noteSetting of noteSettings) {
await db.connection.query(`INSERT INTO public.notes_settings (id, "note_id", "custom_hostname", "enabled") VALUES (${noteSetting.id}, '${noteSetting.note_id}', '${noteSetting.custom_hostname}', ${noteSetting.enabled})`);
await db.connection.query(`INSERT INTO public.note_settings (id, "note_id", "custom_hostname", "enabled") VALUES (${noteSetting.id}, '${noteSetting.note_id}', '${noteSetting.custom_hostname}', ${noteSetting.enabled})`);
}
}

Expand Down

0 comments on commit 7f39c6f

Please sign in to comment.