Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: cam-inc/viron
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.12.0
Choose a base ref
...
head repository: cam-inc/viron
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Loading
Showing with 7,607 additions and 935 deletions.
  1. +36 −0 .github/workflows/publish-package-viorn-lib.yml
  2. +35 −0 .github/workflows/publish-package-viorn-linter.yml
  3. +1 −1 Dockerfile.example-golang
  4. +1 −1 docker-compose.example-nodejs.mongo.yml
  5. +1 −1 docker-compose.example-nodejs.mysql.yml
  6. +124 −3 example/golang/go.mod
  7. +60 −30 example/golang/go.sum
  8. +9 −0 example/nodejs/.env.template
  9. +12 −0 example/nodejs/CHANGELOG.md
  10. +1 −1 example/nodejs/docker-compose.mongo.yml
  11. +2 −2 example/nodejs/docker-compose.mysql.yml
  12. +10 −7 example/nodejs/package.json
  13. +4 −0 example/nodejs/src/application.ts
  14. +25 −1 example/nodejs/src/config/development.ts
  15. +8 −0 example/nodejs/src/config/index.ts
  16. +25 −1 example/nodejs/src/config/local.ts
  17. +20 −2 example/nodejs/src/config/production.ts
  18. +4 −2 example/nodejs/src/constants.ts
  19. +4 −1 example/nodejs/src/controllers/adminroles.ts
  20. +69 −0 example/nodejs/src/controllers/auth.ts
  21. +42 −12 example/nodejs/src/controllers/authconfigs.ts
  22. +2 −2 example/nodejs/src/controllers/resources.ts
  23. +10 −6 example/nodejs/src/domains/resources.ts
  24. +11 −0 example/nodejs/src/infrastructures/mysql/models/index.ts
  25. +6 −4 example/nodejs/src/infrastructures/s3/client.ts
  26. +71 −0 example/nodejs/src/middlewares/csrf.ts
  27. +45 −9 example/nodejs/src/middlewares/errorhandler.ts
  28. +3 −0 example/nodejs/src/openapi/components.yaml
  29. +3 −0 example/nodejs/src/openapi/resources.yaml
  30. +24 −6 example/nodejs/src/security_handlers/jwt.ts
  31. +3,265 −314 package-lock.json
  32. +34 −0 packages/app/CHANGELOG.md
  33. +1 −1 packages/app/package.json
  34. +1 −1 packages/app/src/components/Skelton/index.tsx
  35. +1 −1 packages/app/src/components/button/index.tsx
  36. +50 −24 packages/app/src/components/error/index.tsx
  37. +1 −1 packages/app/src/components/fileReader/index.tsx
  38. +47 −0 packages/app/src/components/google/index.tsx
  39. +2 −0 packages/app/src/components/icon/key/outline/index.tsx
  40. +0 −2 packages/app/src/components/icon/login/outline/index.tsx
  41. +2 −0 packages/app/src/components/icon/mail/outline/index.tsx
  42. +10 −0 packages/app/src/constants/index.ts
  43. +7 −5 packages/app/src/errors/index.ts
  44. +195 −4 packages/app/src/hooks/endpoint.ts
  45. +28 −25 packages/app/src/locales/en/common.json
  46. +28 −25 packages/app/src/locales/ja/common.json
  47. +1 −1 packages/app/src/pages/dashboard/_/menu/export/index.tsx
  48. +2 −2 packages/app/src/pages/dashboard/_/menu/import/index.tsx
  49. +104 −70 packages/app/src/pages/dashboard/endpoints/_/body/index.tsx
  50. +20 −10 packages/app/src/pages/dashboard/endpoints/_/body/item/index.tsx
  51. +38 −28 packages/app/src/pages/dashboard/endpoints/_/body/item/qrcode/index.tsx
  52. +146 −60 packages/app/src/pages/dashboard/endpoints/_/body/item/signin/index.tsx
  53. +7 −5 packages/app/src/pages/dashboard/endpoints/_/body/item/signout/index.tsx
  54. +1 −1 packages/app/src/pages/dashboard/groups/_/body/index.tsx
  55. +1 −1 packages/app/src/pages/dashboard/groups/_/body/item/index.tsx
  56. +17 −23 packages/app/src/pages/endpointimport/_/body/index.tsx
  57. +2 −3 packages/app/src/pages/endpoints/[endpointId]/_/content/hooks/useBase.ts
  58. +2 −2 packages/app/src/pages/endpoints/[endpointId]/_/content/hooks/useDescendants.ts
  59. +3 −4 packages/app/src/pages/endpoints/[endpointId]/_/content/hooks/useSiblings.ts
  60. +16 −10 packages/app/src/pages/endpoints/[endpointId]/_/content/parts/head/index.tsx
  61. +14 −11 packages/app/src/pages/oauthredirect/_/body/index.tsx
  62. +35 −0 packages/app/src/pages/oidcredirect/_/appBar/index.tsx
  63. +133 −0 packages/app/src/pages/oidcredirect/_/body/index.tsx
  64. +56 −0 packages/app/src/pages/oidcredirect/_/navigation/index.tsx
  65. +53 −0 packages/app/src/pages/oidcredirect/index.tsx
  66. +10 −4 packages/app/src/portals/modal/index.tsx
  67. +1 −0 packages/app/src/storage/index.ts
  68. +8 −1 packages/app/src/types/index.ts
  69. +7 −4 packages/app/src/wrappers/root.tsx
  70. +31 −0 packages/golang/domains/adminroles.go
  71. +72 −0 packages/golang/domains/adminroles_test.go
  72. +66 −18 packages/golang/go.mod
  73. +37 −81 packages/golang/go.sum
  74. +30 −0 packages/nodejs/CHANGELOG.md
  75. +0 −4 packages/nodejs/__tests__/domains/adminrole.test.ts
  76. +35 −0 packages/nodejs/__tests__/domains/adminuser.test.ts
  77. +1,290 −0 packages/nodejs/__tests__/domains/auth/oidc.test.ts
  78. +6 −4 packages/nodejs/package.json
  79. +26 −12 packages/nodejs/src/constants.ts
  80. +8 −3 packages/nodejs/src/domains/adminaccount.ts
  81. +51 −4 packages/nodejs/src/domains/adminrole.ts
  82. +203 −47 packages/nodejs/src/domains/adminuser.ts
  83. +8 −7 packages/nodejs/src/domains/auth/common.ts
  84. +2 −1 packages/nodejs/src/domains/auth/email.ts
  85. +1 −0 packages/nodejs/src/domains/auth/index.ts
  86. +354 −0 packages/nodejs/src/domains/auth/oidc.ts
  87. +28 −0 packages/nodejs/src/errors.ts
  88. +30 −0 packages/nodejs/src/helpers/cookies.ts
  89. +16 −0 packages/nodejs/src/infrastructures/mongo/models/adminusers.ts
  90. +21 −0 packages/nodejs/src/infrastructures/mysql/models/adminusers.ts
  91. +6 −0 packages/nodejs/src/openapi/adminroles.yaml
  92. +3 −0 packages/nodejs/src/openapi/adminusers.yaml
  93. +57 −0 packages/nodejs/src/openapi/auth.yaml
  94. +1 −0 packages/nodejs/src/openapi/authconfigs.yaml
  95. +3 −0 packages/nodejs/src/openapi/components.yaml
  96. +6 −0 packages/website/CHANGELOG.md
  97. +97 −8 packages/website/docs/04-Advanced-Guides/authentication.md
  98. +1 −0 packages/website/docs/04-Advanced-Guides/environmental-variable.md
  99. +99 −10 packages/website/i18n/ja/docusaurus-plugin-content-docs/current/04-Advanced-Guides/authentication.md
  100. +1 −0 ...bsite/i18n/ja/docusaurus-plugin-content-docs/current/04-Advanced-Guides/environmental-variable.md
  101. +1 −1 packages/website/package.json
36 changes: 36 additions & 0 deletions .github/workflows/publish-package-viorn-lib.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Publish NPM Package - Viron/lib

on:
push:
branches:
- develop
paths:
- "packages/nodejs/**"

jobs:
build-and-publish:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [20.x]
steps:
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: "npm"
- name: Install dependencies and Build
run: |
echo "Installing packages..."
npm ci
npm run build -w packages/linter
npm run build -w packages/nodejs
- name: Set NPM_TOKEN
run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
- name: Publish
run: |
echo "Publishing..."
npm publish -w packages/nodejs
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
35 changes: 35 additions & 0 deletions .github/workflows/publish-package-viorn-linter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Publish NPM Package - Viron/linter

on:
push:
branches:
- develop
paths:
- "packages/linter/**"

jobs:
build-and-publish:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [20.x]
steps:
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: "npm"
- name: Install dependencies and Build
run: |
echo "Installing packages..."
npm ci
npm run build -w packages/linter
- name: Set NPM_TOKEN
run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
- name: Publish
run: |
echo "Publishing..."
npm publish -w packages/linter
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
2 changes: 1 addition & 1 deletion Dockerfile.example-golang
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.16
FROM golang:1.22

RUN mkdir -p /viron/example/golang
RUN mkdir -p /viron/packages/golang
2 changes: 1 addition & 1 deletion docker-compose.example-nodejs.mongo.yml
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ services:
- $PWD/example/nodejs/cert:/viron/example/nodejs/cert
- $PWD/packages/nodejs:/viron/packages/nodejs
- $PWD/packages/linter:/viron/packages/linter
command: npm run dev
command: run dev

mongo:
extends:
2 changes: 1 addition & 1 deletion docker-compose.example-nodejs.mysql.yml
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ services:
- $PWD/example/nodejs/cert:/viron/example/nodejs/cert
- $PWD/packages/nodejs:/viron/packages/nodejs
- $PWD/packages/linter:/viron/packages/linter
command: npm run dev
command: run dev

mysql:
extends:
127 changes: 124 additions & 3 deletions example/golang/go.mod
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
module github.com/cam-inc/viron/example/golang

go 1.16
go 1.22

require (
github.com/cam-inc/viron/packages/golang v0.0.0-00010101000000-000000000000
github.com/getkin/kin-openapi v0.66.0
github.com/getkin/kin-openapi v0.94.0
github.com/go-chi/chi v1.5.1
github.com/go-chi/chi/v5 v5.0.3
github.com/go-chi/chi/v5 v5.0.7
github.com/go-chi/cors v1.2.0
github.com/go-sql-driver/mysql v1.6.0
github.com/golang-migrate/migrate/v4 v4.14.1
@@ -17,4 +17,125 @@ require (
go.uber.org/automaxprocs v1.4.0
)

require (
cloud.google.com/go v0.93.3 // indirect
cloud.google.com/go/spanner v1.9.0 // indirect
cloud.google.com/go/storage v1.10.0 // indirect
github.com/Blank-Xu/sql-adapter v0.0.0-20210714092925-0bdd0d548758 // indirect
github.com/ClickHouse/clickhouse-go v1.3.12 // indirect
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible // indirect
github.com/apache/arrow/go/arrow v0.0.0-20200601151325-b2287a20f230 // indirect
github.com/aws/aws-sdk-go v1.34.28 // indirect
github.com/casbin/casbin/v2 v2.34.2 // indirect
github.com/casbin/mongodb-adapter/v3 v3.2.1 // indirect
github.com/cenkalti/backoff/v4 v4.0.2 // indirect
github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58 // indirect
github.com/cockroachdb/cockroach-go v0.0.0-20190925194419-606b3d062051 // indirect
github.com/cznic/mathutil v0.0.0-20180504122225-ca4c9f2c1369 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
github.com/deepmap/oapi-codegen v1.8.3 // indirect
github.com/denisenkom/go-mssqldb v0.10.0 // indirect
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712 // indirect
github.com/friendsofgo/errors v0.9.2 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/go-chi/jwtauth v1.2.0 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/swag v0.21.1 // indirect
github.com/go-stack/stack v1.8.0 // indirect
github.com/goccy/go-json v0.9.7 // indirect
github.com/gocql/gocql v0.0.0-20190301043612-f6df8288f9b4 // indirect
github.com/gofrs/uuid v4.0.0+incompatible // indirect
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe // indirect
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/snappy v0.0.3 // indirect
github.com/google/flatbuffers v1.11.0 // indirect
github.com/google/go-cmp v0.5.6 // indirect
github.com/google/go-github v17.0.0+incompatible // indirect
github.com/google/go-querystring v1.0.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/googleapis/gax-go/v2 v2.1.0 // indirect
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
github.com/hashicorp/errwrap v1.0.0 // indirect
github.com/hashicorp/go-multierror v1.1.0 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
github.com/jackc/pgconn v1.3.2 // indirect
github.com/jackc/pgio v1.0.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgproto3/v2 v2.0.1 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/k0kubun/pp v2.3.0+incompatible // indirect
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
github.com/klauspost/compress v1.9.5 // indirect
github.com/ktrysmt/go-bitbucket v0.6.4 // indirect
github.com/lestrrat-go/backoff/v2 v2.0.8 // indirect
github.com/lestrrat-go/blackmagic v1.0.1 // indirect
github.com/lestrrat-go/httpcc v1.0.1 // indirect
github.com/lestrrat-go/iter v1.0.2 // indirect
github.com/lestrrat-go/jwx v1.2.24 // indirect
github.com/lestrrat-go/option v1.0.0 // indirect
github.com/lib/pq v1.8.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.8 // indirect
github.com/mattn/go-isatty v0.0.12 // indirect
github.com/mattn/go-sqlite3 v1.10.0 // indirect
github.com/mitchellh/mapstructure v1.4.1 // indirect
github.com/mutecomm/go-sqlcipher/v4 v4.4.0 // indirect
github.com/nakagami/firebirdsql v0.0.0-20190310045651-3c02a58cfed8 // indirect
github.com/neo4j/neo4j-go-driver v1.8.1-0.20200803113522-b626aa943eba // indirect
github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/remyoudompheng/bigfft v0.0.0-20190728182440-6a916e37a237 // indirect
github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24 // indirect
github.com/snowflakedb/glog v0.0.0-20180824191149-f5055e6f21ce // indirect
github.com/snowflakedb/gosnowflake v1.3.5 // indirect
github.com/spf13/cast v1.3.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/volatiletech/inflect v0.0.1 // indirect
github.com/volatiletech/null/v8 v8.1.2 // indirect
github.com/volatiletech/randomize v0.0.1 // indirect
github.com/volatiletech/strmangle v0.0.1 // indirect
github.com/xanzy/go-gitlab v0.15.0 // indirect
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
github.com/xdg-go/scram v1.0.2 // indirect
github.com/xdg-go/stringprep v1.0.2 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
gitlab.com/nyarla/go-crypt v0.0.0-20160106005555-d9a5dc2b789b // indirect
go.opencensus.io v0.23.0 // indirect
go.uber.org/atomic v1.7.0 // indirect
golang.org/x/crypto v0.0.0-20220513210258-46612604a0f9 // indirect
golang.org/x/net v0.0.0-20220513224357-95641704303c // indirect
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20220513210249-45d2b4557a2a // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/tools v0.1.5 // indirect
golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect
google.golang.org/api v0.56.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71 // indirect
google.golang.org/grpc v1.40.0 // indirect
google.golang.org/protobuf v1.28.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
modernc.org/b v1.0.0 // indirect
modernc.org/db v1.0.0 // indirect
modernc.org/file v1.0.0 // indirect
modernc.org/fileutil v1.0.0 // indirect
modernc.org/golex v1.0.0 // indirect
modernc.org/internal v1.0.0 // indirect
modernc.org/lldb v1.0.0 // indirect
modernc.org/mathutil v1.0.0 // indirect
modernc.org/ql v1.0.0 // indirect
modernc.org/sortutil v1.1.0 // indirect
modernc.org/strutil v1.1.0 // indirect
modernc.org/zappy v1.0.0 // indirect
)

replace github.com/cam-inc/viron/packages/golang => ../../packages/golang
Loading