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

[#23] Update develop #25

Closed
wants to merge 41 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
78b10b3
[ID-680] Single identity within an organisation (#684)
petyos Dec 1, 2023
bbc6346
Fix docker build
petyos Dec 1, 2023
2d28e88
Prepare v1.35.0
petyos Dec 1, 2023
12c25cf
Fix storeSystemData (#686)
stefanvit Dec 7, 2023
0a98a74
[ID-687] Handle Create Admin account API issue (#688)
petyos Dec 8, 2023
3d5d2ae
Prepare v1.35.1
petyos Dec 8, 2023
5f9abf8
Merge pull request #689 from rokwire/develop
petyos Dec 8, 2023
ff31949
[ID-690] Accounts to tenants account migration improvement (#691)
petyos Dec 13, 2023
3e53c76
Prepare v1.36.0
petyos Dec 13, 2023
664a5b5
[ID-692] Migration issue (#693)
petyos Feb 13, 2024
62cff39
Prepare v1.37.0
petyos Feb 13, 2024
d51cfbb
[ID-694] Fix nil pointer (#695)
petyos Feb 14, 2024
3c19218
Prepare v1.37.1
petyos Feb 14, 2024
d4b0b26
finished resolving merge conflicts, errors not yet fixed
roberlander2 Feb 16, 2024
6327157
fix some build errors
roberlander2 Feb 16, 2024
e3560f6
[ID-698] Clean up accounts migration legacy code (#699)
petyos Feb 20, 2024
6aa75ef
Prepare v1.37.2
petyos Feb 20, 2024
2dda19a
fix remaining build errors
roberlander2 Feb 20, 2024
434431f
remove UIUC specific pieces from migration
roberlander2 Feb 22, 2024
466cfaa
[ID-700]Update filter accounts API to accept many UINs (#701)
stefanvit Feb 27, 2024
7620651
migration updates
roberlander2 Feb 27, 2024
1d8c6f0
remove phase2 from tenant account migration, change external_ids to u…
roberlander2 Feb 28, 2024
bb26f88
use preferences on org signup external, remove unused function params…
roberlander2 Feb 29, 2024
964d96a
more unused function param cleanup, use tenantAccounts coll instead o…
roberlander2 Feb 29, 2024
5feb938
[ID-702]Expose Create multiple accounts admin API (#703)
stefanvit Mar 1, 2024
eddcb6f
Prepare v1.38.0
petyos Mar 1, 2024
65aa364
batch credential collection migration, need to batch accounts and log…
roberlander2 Mar 1, 2024
0246d4a
batch account identifiers migration
roberlander2 Mar 4, 2024
3d0030c
[ID-704]fix v2 create accounts (#705)
stefanvit Mar 5, 2024
ab093c4
Prepare v1.38.1
petyos Mar 5, 2024
59009b2
fix account and credential migration batching bugs
roberlander2 Mar 5, 2024
18161ed
merge changes from develop
roberlander2 Mar 5, 2024
c490552
merge changes from rokwire/develop
roberlander2 Mar 5, 2024
0cde308
update go version to 1.22
roberlander2 Mar 5, 2024
1bd8451
update changelog, merge duplicate any tenant account app memberships …
roberlander2 Mar 6, 2024
b45ab42
fix bbs, tps, and admin account search by params
roberlander2 Mar 6, 2024
4265838
make sure account identifiers are not returned in account search if r…
roberlander2 Mar 6, 2024
3b19c8b
fix Account, PartialAccount schema validation bugs
roberlander2 Mar 7, 2024
be0cb54
fix FindAccount bug when attempting operationAppSignUp
roberlander2 Mar 7, 2024
42c5ea1
batch tenant account migration
roberlander2 Mar 7, 2024
b4f7ec1
change migrated field back to migrated_2 for tenant account migration
roberlander2 Mar 11, 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: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: '1.20'
go-version: '1.22'
check-latest: true

- name: Build
Expand Down
118 changes: 97 additions & 21 deletions .secrets.baseline
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@
{
"path": "detect_secrets.filters.allowlist.is_line_allowlisted"
},
{
"path": "detect_secrets.filters.common.is_baseline_file",
"filename": ".secrets.baseline"
},
{
"path": "detect_secrets.filters.common.is_ignored_due_to_verification_policies",
"min_level": 2
Expand Down Expand Up @@ -123,7 +127,7 @@
"filename": "core/apis.go",
"hashed_secret": "44e17306b837162269a410204daaa5ecee4ec22c",
"is_verified": false,
"line_number": 95
"line_number": 108
}
],
"core/app_shared.go": [
Expand All @@ -140,6 +144,13 @@
"hashed_secret": "48da876cb7879f4d7e8d5e679b8fbd0af02845ae",
"is_verified": false,
"line_number": 80
},
{
"type": "Secret Keyword",
"filename": "core/app_shared.go",
"hashed_secret": "b5366a2d2ac98dae978423083f8b09e5cddc705d",
"is_verified": false,
"line_number": 81
}
],
"core/auth/apis.go": [
Expand All @@ -150,56 +161,63 @@
"is_verified": false,
"line_number": 167
},
{
"type": "Secret Keyword",
"filename": "core/auth/apis.go",
"hashed_secret": "b5366a2d2ac98dae978423083f8b09e5cddc705d",
"is_verified": false,
"line_number": 168
},
{
"type": "Secret Keyword",
"filename": "core/auth/apis.go",
"hashed_secret": "04e110541a2e8b44bc10939bfaf5d82adfe45158",
"is_verified": false,
"line_number": 1952
"line_number": 2087
},
{
"type": "Secret Keyword",
"filename": "core/auth/apis.go",
"hashed_secret": "394e3412459f79523e12e1fa95a4cf141ccff122",
"is_verified": false,
"line_number": 2347
"line_number": 2483
}
],
"core/auth/auth.go": [
{
"type": "Secret Keyword",
"filename": "core/auth/auth.go",
"hashed_secret": "70fd094756d9fcdcdfbd372dc526e9068a0ee711",
"hashed_secret": "3ad281dd0e7cbd966a14c7ccdde5eda5d817eca5",
"is_verified": false,
"line_number": 165
"line_number": 180
},
{
"type": "Secret Keyword",
"filename": "core/auth/auth.go",
"hashed_secret": "a358987289cd70bbf50fb10acbcb9bff73c66df6",
"is_verified": false,
"line_number": 167
"line_number": 182
},
{
"type": "Secret Keyword",
"filename": "core/auth/auth.go",
"hashed_secret": "58f3388441fbce0e48aef2bf74413a6f43f6dc70",
"is_verified": false,
"line_number": 992
"line_number": 949
},
{
"type": "Secret Keyword",
"filename": "core/auth/auth.go",
"hashed_secret": "44e17306b837162269a410204daaa5ecee4ec22c",
"is_verified": false,
"line_number": 2682
"line_number": 2808
},
{
"type": "Secret Keyword",
"filename": "core/auth/auth.go",
"hashed_secret": "94a7f0195bbbd2260c4e4d02b6348fbcd90b2b30",
"is_verified": false,
"line_number": 2812
"line_number": 2938
}
],
"core/auth/auth_type_oidc.go": [
Expand All @@ -208,7 +226,7 @@
"filename": "core/auth/auth_type_oidc.go",
"hashed_secret": "0ade4f3edccc8888bef404fe6b3c92c13cdfad6b",
"is_verified": false,
"line_number": 400
"line_number": 420
}
],
"core/auth/auth_type_password.go": [
Expand All @@ -224,7 +242,7 @@
"filename": "core/auth/auth_type_password.go",
"hashed_secret": "8a1618d670f9d2d7d0b26c1d80227ead407f66dd",
"is_verified": false,
"line_number": 197
"line_number": 201
}
],
"core/auth/identifier_type_email.go": [
Expand Down Expand Up @@ -263,20 +281,50 @@
"line_number": 223
}
],
"driven/storage/adapter.go": [
{
"type": "Secret Keyword",
"filename": "driven/storage/adapter.go",
"hashed_secret": "fe86558143c0bd528f649a153bdc32b8fa90301c",
"is_verified": false,
"line_number": 1440
}
],
"driven/storage/conversions_user.go": [
{
"type": "Secret Keyword",
"filename": "driven/storage/conversions_user.go",
"hashed_secret": "6a1a14990e40a6eaa33109699e00c7eddf89334b",
"hashed_secret": "37fac0120e0bd3fd5d09c3768cdae7309e0e2714",
"is_verified": false,
"line_number": 32
"line_number": 26
},
{
"type": "Secret Keyword",
"filename": "driven/storage/conversions_user.go",
"hashed_secret": "29a814fd3871dac2897523fce754e9efa56a2467",
"hashed_secret": "18019caaa3957a0e6e061921b35e41b222ea5f93",
"is_verified": false,
"line_number": 67
"line_number": 60
},
{
"type": "Secret Keyword",
"filename": "driven/storage/conversions_user.go",
"hashed_secret": "fe86558143c0bd528f649a153bdc32b8fa90301c",
"is_verified": false,
"line_number": 64
},
{
"type": "Secret Keyword",
"filename": "driven/storage/conversions_user.go",
"hashed_secret": "0de3d6a08cb1be3c11c57f46a343e196d991b741",
"is_verified": false,
"line_number": 98
},
{
"type": "Secret Keyword",
"filename": "driven/storage/conversions_user.go",
"hashed_secret": "64b9d2eaae06eed7290e8342398265617e3e9ac8",
"is_verified": false,
"line_number": 129
}
],
"driven/storage/database.go": [
Expand All @@ -285,7 +333,7 @@
"filename": "driven/storage/database.go",
"hashed_secret": "6547f385c6d867e20f8217018a4d468a7d67d638",
"is_verified": false,
"line_number": 232
"line_number": 245
}
],
"driven/storage/migrations.go": [
Expand All @@ -294,14 +342,28 @@
"filename": "driven/storage/migrations.go",
"hashed_secret": "fd9a601da67dbaa273e7fb64877518ee9e408057",
"is_verified": false,
"line_number": 141
"line_number": 165
},
{
"type": "Secret Keyword",
"filename": "driven/storage/migrations.go",
"hashed_secret": "44e17306b837162269a410204daaa5ecee4ec22c",
"is_verified": false,
"line_number": 156
"line_number": 180
},
{
"type": "Secret Keyword",
"filename": "driven/storage/migrations.go",
"hashed_secret": "d6cc178164ab53e06efb13b1c4cab6456c3e3a13",
"is_verified": false,
"line_number": 852
},
{
"type": "Secret Keyword",
"filename": "driven/storage/migrations.go",
"hashed_secret": "f8858fa361e5ab245f0c57b4adbae545d1883a9e",
"is_verified": false,
"line_number": 857
}
],
"driver/web/apis_system.go": [
Expand All @@ -314,12 +376,19 @@
}
],
"driver/web/conversions_user.go": [
{
"type": "Secret Keyword",
"filename": "driver/web/conversions_user.go",
"hashed_secret": "44e17306b837162269a410204daaa5ecee4ec22c",
"is_verified": false,
"line_number": 36
},
{
"type": "Secret Keyword",
"filename": "driver/web/conversions_user.go",
"hashed_secret": "fe86558143c0bd528f649a153bdc32b8fa90301c",
"is_verified": false,
"line_number": 67
"line_number": 94
}
],
"driver/web/docs/gen/def.yaml": [
Expand All @@ -332,12 +401,19 @@
}
],
"driver/web/docs/gen/gen_types.go": [
{
"type": "Secret Keyword",
"filename": "driver/web/docs/gen/gen_types.go",
"hashed_secret": "c55ac144fd47a187d147f3f22ec0dcf6a2b2c789",
"is_verified": false,
"line_number": 1874
},
{
"type": "Secret Keyword",
"filename": "driver/web/docs/gen/gen_types.go",
"hashed_secret": "c9739eab2dfa093cc0e450bf0ea81a43ae67b581",
"is_verified": false,
"line_number": 1921
"line_number": 1958
}
],
"driver/web/docs/resources/admin/auth/login.yaml": [
Expand Down Expand Up @@ -377,5 +453,5 @@
}
]
},
"generated_at": "2023-10-11T21:26:54Z"
"generated_at": "2024-03-07T22:46:45Z"
}
47 changes: 46 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,43 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
- Decouple authentication and verification mechanisms [#665](https://github.com/rokwire/core-building-block/issues/665)
- Refactor account auth types [#674](https://github.com/rokwire/core-building-block/issues/674)
- Improve request context logging

## [1.38.1] - 2024-03-05
### Fixed
- Fix v2 create accounts [#704](https://github.com/rokwire/core-building-block/issues/704)

## [1.38.0] - 2024-03-01
### Added
- Expose Create multiple accounts admin API [#702](https://github.com/rokwire/core-building-block/issues/702)

### Changed
- Update filter accounts API to accept many UIN [#700](https://github.com/rokwire/core-building-block/issues/700)

## [1.37.2] - 2024-02-14
### Changed
- Clean up accounts migration legacy code [#698](https://github.com/rokwire/core-building-block/issues/698)

## [1.37.1] - 2024-02-14
### Fixed
- Fix nil pointer [#694](https://github.com/rokwire/core-building-block/issues/694)

## [1.37.0] - 2024-02-13
### Fixed
- Migration issue [#692](https://github.com/rokwire/core-building-block/issues/692)

## [1.36.0] - 2023-12-13
### Changed
- Accounts to tenants account migration improvement [#690](https://github.com/rokwire/core-building-block/issues/690)

## [1.35.1] - 2023-12-08
### Fixed
- Handle Create Admin account API issue [#687](https://github.com/rokwire/core-building-block/issues/687)
- Fix storeSystemData [#685](https://github.com/rokwire/core-building-block/issues/685)

## [1.35.0] - 2023-12-01
### Changed
- Single identity within an organisation [#680](https://github.com/rokwire/core-building-block/issues/680)

## [1.34.0] - 2023-07-06
### Added
Expand Down Expand Up @@ -410,7 +447,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Users authentication polish [#155](https://github.com/rokwire/core-building-block/issues/155)
- Optimise the Mongo DB collections indexes usage [#146](https://github.com/rokwire/core-building-block/issues/146)

[Unreleased]: https://github.com/rokwire/core-building-block/compare/v1.34.0...HEAD
[Unreleased]: https://github.com/rokwire/core-building-block/compare/v1.38.1...HEAD
[1.38.1]: https://github.com/rokwire/core-building-block/compare/v1.38.0...v1.38.1
[1.38.0]: https://github.com/rokwire/core-building-block/compare/v1.37.2...v1.38.0
[1.37.2]: https://github.com/rokwire/core-building-block/compare/v1.37.1...v1.37.2
[1.37.1]: https://github.com/rokwire/core-building-block/compare/v1.37.0...v1.37.1
[1.37.0]: https://github.com/rokwire/core-building-block/compare/v1.36.0...v1.37.0
[1.36.0]: https://github.com/rokwire/core-building-block/compare/v1.35.1...v1.36.0
[1.35.1]: https://github.com/rokwire/core-building-block/compare/v1.35.0...v1.35.1
[1.35.0]: https://github.com/rokwire/core-building-block/compare/v1.34.0...v1.35.0
[1.34.0]: https://github.com/rokwire/core-building-block/compare/v1.33.0...v1.34.0
[1.33.0]: https://github.com/rokwire/core-building-block/compare/v1.32.2...v1.33.0
[1.32.2]: https://github.com/rokwire/core-building-block/compare/v1.32.1...v1.32.2
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20-alpine as builder
FROM golang:1.22-alpine as builder

ENV CGO_ENABLED=0

Expand Down
4 changes: 2 additions & 2 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
Patches for **Core Building Block** in this repository will only be applied to the following versions:
| Version | Supported |
| -------- | ------------------ |
| 1.34.0 | :white_check_mark: |
| < 1.34.0 | :x: |
| 1.38.1 | :white_check_mark: |
| < 1.38.1 | :x: |

## Reporting a Bug or Vulnerability

Expand Down
Loading
Loading