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.

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

Feat/hydra oauth client and kratos session deps update #7

Merged
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
28,813 changes: 12,444 additions & 16,369 deletions .pnp.cjs

Large diffs are not rendered by default.

1,878 changes: 1,841 additions & 37 deletions .pnp.loader.mjs

Large diffs are not rendered by default.

2,823 changes: 1,203 additions & 1,620 deletions .../yarn-0.0.1-git.20220217.hash-18e92f3.cjs → .../yarn-0.0.1-git.20230911.hash-1c44e15.cjs
100644 → 100755

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
packageExtensions:
eslint-module-utils@*:
dependencies:
eslint-import-resolver-node: "*"
eslint-import-resolver-node: '*'

yarnPath: .yarn/releases/yarn-0.0.1-git.20220217.hash-18e92f3.cjs
yarnPath: .yarn/releases/yarn-0.0.1-git.20230911.hash-1c44e15.cjs
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# template

Template repo
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"license": "BSD 3-Clause",
"private": true,
"license": "BSD 3-Clause",
"workspaces": [
"packages/*"
],
Expand All @@ -10,12 +10,12 @@
"@jest/core": "^27.4.7",
"@types/eslint": "^8",
"@types/jest": "^26.0.22",
"@types/node": "^14.14.41",
"@types/node": "20.6.3",
"eslint": "^8.7.0",
"husky": "7.0.4",
"typescript": "^4.5.5"
},
"packageManager": "yarn@3.1.1",
"packageManager": "yarn@3.6.3",
"tools": {
"schematic": {
"collection": "@atls/schematics",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
* @jest-environment node
*/

import express from 'express'
import getPort from 'get-port'
import supertest from 'supertest'
import { Server } from 'http'
import express from 'express'
import { Express } from 'express'
import { Server } from 'http'

import { HydraAuthorizationCodeClient } from '../../src'

Expand Down
18 changes: 9 additions & 9 deletions packages/hydra-oauth-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@
"postpack": "rm -rf dist"
},
"dependencies": {
"cookie": "^0.4.1",
"simple-oauth2": "^4.2.0"
"cookie": "0.5.0",
"simple-oauth2": "5.0.0"
},
"devDependencies": {
"@types/cookie": "^0.4.0",
"@types/express": "^4.17.11",
"@types/node": "^14.14.41",
"@types/simple-oauth2": "^4.1.0",
"express": "^4.17.1",
"get-port": "^5.1.1",
"supertest": "^6.1.3"
"@types/cookie": "0.5.2",
"@types/express": "4.17.17",
"@types/node": "20.6.3",
"@types/simple-oauth2": "5.0.4",
"express": "4.18.2",
"get-port": "7.0.0",
"supertest": "6.3.3"
},
"publishConfig": {
"access": "public",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import cookie from 'cookie'
import { AuthorizationCode } from 'simple-oauth2'
import { ModuleOptions } from 'simple-oauth2'
import { randomBytes } from 'crypto'
import cookie from 'cookie'

import { HydraAuthorizationCodeClientOptions } from './hydra-authorization-code.interfaces'
import { HydraAuthorizationCodeResult } from './hydra-authorization-code.interfaces'
Expand Down
13 changes: 8 additions & 5 deletions packages/kratos-session/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,17 @@
"prepack": "yarn run build",
"postpack": "rm -rf dist"
},
"resolutions": {
TorinAsakura marked this conversation as resolved.
Show resolved Hide resolved
"@types/react": "18.2.22"
},
"dependencies": {
"@atls/logger": "^0.0.1",
"@ory/kratos-client": "^0.5.5-alpha.4"
"@atls/logger": "0.0.2",
"@ory/kratos-client": "0.6.3-alpha.1"
},
"devDependencies": {
"@types/react": "^17.0.3",
"@types/react-dom": "^17.0.3",
"next": "*"
"@types/react": "18.2.22",
"@types/react-dom": "18.2.7",
"next": "13.5.1"
},
"publishConfig": {
"access": "public",
Expand Down
4 changes: 3 additions & 1 deletion packages/kratos-session/src/get-kratos.session.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import type { NextApiRequest } from 'next'
import { IncomingMessage } from 'http'

import { Logger } from '@atls/logger'
import { Session } from '@ory/kratos-client'

import { IncomingMessage } from 'http'

import { getKratosClient } from './get-kratos.client'

const logger = new Logger('getKratosSession')
Expand Down
Loading
Loading