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.

Sign up for GitHub

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

Sync gridx_extensions #19

Merged
merged 50 commits into from
Mar 6, 2024
Merged

Sync gridx_extensions #19

Changes from 1 commit
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
983d863
Add IsConnected utility method for charge points
lorenzodonini Nov 16, 2022
564c732
fix: use go-routines in handle functions to prevent blocking the unde…
Nov 16, 2022
956223d
Make SampledValue.Value field not required
lorenzodonini Dec 11, 2022
e66011a
v1.6: Change ChargingProfileStatus value from NotImplemented to NotSu…
lorenzodonini Dec 24, 2022
b542323
v2.0.1: Fix incorrect IdTokenType
lorenzodonini Dec 24, 2022
2fa5412
v2.0.1: Fix csms example after merging #163
lorenzodonini Dec 24, 2022
8c6098d
Use correct name to validate ClearChargingProfileConfirmation
Feb 23, 2023
0195c3f
Add debug logs for raw json messages
lorenzodonini Feb 4, 2023
70f4614
EscapeHTML configuration for json.Marshal
Feb 7, 2023
fc83394
Remove newline from encoded json byte array
lorenzodonini Mar 12, 2023
0374c84
Fix property constraint violation on ConfigurationKey nil values
lorenzodonini Mar 14, 2023
3c24b0d
Remove incorrect validation for IdToken in RequestStartTransactionReq…
lorenzodonini Mar 17, 2023
5869d11
feature to add a custom client validation handler before connected
dwibudut Feb 20, 2023
404fb1f
add/implement SetCheckClientHandler method on MockWebsocketServer
dwibudut Mar 21, 2023
7652fcf
fix/replace with direct func type arg on implement method SetCheckCli…
dwibudut Mar 21, 2023
fc3ab08
implement method `SetNewChargingStationValidationHandler` on ocpp1.6 …
dwibudut Mar 23, 2023
7d6d270
Add handler
shiv3 Feb 27, 2023
22b4f86
Add router to non tls server
shiv3 Mar 22, 2023
b979d02
Fix goimport
shiv3 Mar 22, 2023
3facaad
Fix CallError marshaling of empty fields
lorenzodonini Apr 7, 2023
c3dee61
Add send response error handling function
lorenzodonini Apr 7, 2023
3fbe338
Add error handling function for server SendResponse
lorenzodonini Apr 7, 2023
0ae68c7
Improve error handling and rewrite tests
lorenzodonini Apr 8, 2023
dfa368e
Convert v1.6 core listeners to pointer receiver
lorenzodonini Apr 8, 2023
830bc32
Fix v1.6 error handling in sendResponse functions
lorenzodonini Apr 8, 2023
9490eba
Add v1.6 tests for new error handling
lorenzodonini Apr 8, 2023
3430e25
Fix v2.0.1 error handling in sendResponse functions
lorenzodonini Apr 8, 2023
3ec1db9
Add v2.0.1 tests for new error handling
lorenzodonini Apr 8, 2023
782920b
Fix broken tests
lorenzodonini Apr 8, 2023
c38d419
resolves issues/173 checking and handling invalid message property fo…
sc-atompower Apr 17, 2023
3ecaf00
reverted go.mod
sc-atompower Apr 17, 2023
0c73967
Fix SetVariableStatus validation tag
lorenzodonini May 19, 2023
34d3b60
fix messagesinqueue json
May 10, 2023
e034d39
Change messageinqueue to messagesinqueue
May 19, 2023
c34f6ad
Fix validation override between v1.6 and v2.0.1
lorenzodonini Jun 11, 2023
694d985
fix certificateType on CertificateSignedRequest & GetInstalledCertifi…
dwibudut Jun 29, 2023
69eec62
add another FirmwareStatus type on FirmwareStatusNotification (suppor…
dwibudut Jun 29, 2023
118355f
Fix deadlock on double client stop
lorenzodonini Jul 3, 2023
290c89e
Override FormatViolation error code for v2.0.1
lorenzodonini Jul 4, 2023
2fef296
Add tests for FormatViolation value
lorenzodonini Jul 8, 2023
3760b41
Add hook for custom handling of invalid messages
lorenzodonini Jul 30, 2023
d0d7f6d
change serial number validate max to 40
Jul 25, 2023
ff45def
Serial number in OCS Request need to be change as well
Jul 26, 2023
139992c
add IdTokenType MacAddress
dwibudut Jul 27, 2023
fa5b59a
add key16 and key201 to resetType and resetStatus
Aug 17, 2023
f0af2ad
check type on action in call and add test
Aug 24, 2023
c686786
Fix assertion for invalid TLS certificate test
lorenzodonini Sep 3, 2023
607bfeb
Merge pull request #18 from grid-x/sync-fork
hnicolaysen Mar 5, 2024
ae287d7
Merge branch 'master' into sync-gridx_extensions
hnicolaysen Mar 5, 2024
add4e73
refactor(*): fix merge problems
hnicolaysen Mar 5, 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
Prev Previous commit
Next Next commit
add IdTokenType MacAddress
  • Loading branch information
@dwibudut @lorenzodonini
dwibudut authored and lorenzodonini committed Jul 30, 2023
commit 139992cfbe1164739c6478f1378b72e0da60186b
5 changes: 3 additions & 2 deletions ocpp2.0.1/types/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,17 @@ const (
IdTokenTypeCentral IdTokenType = "Central"
IdTokenTypeEMAID IdTokenType = "eMAID"
IdTokenTypeISO14443 IdTokenType = "ISO14443"
IdTokenTypeISO15693 IdTokenType = "ISO15693"
IdTokenTypeKeyCode IdTokenType = "KeyCode"
IdTokenTypeLocal IdTokenType = "Local"
IdTokenTypeMacAddress IdTokenType = "MacAddress"
IdTokenTypeNoAuthorization IdTokenType = "NoAuthorization"
IdTokenTypeISO15693 IdTokenType = "ISO15693"
)

func isValidIdTokenType(fl validator.FieldLevel) bool {
tokenType := IdTokenType(fl.Field().String())
switch tokenType {
case IdTokenTypeCentral, IdTokenTypeEMAID, IdTokenTypeISO14443, IdTokenTypeKeyCode, IdTokenTypeLocal, IdTokenTypeNoAuthorization, IdTokenTypeISO15693:
case IdTokenTypeCentral, IdTokenTypeEMAID, IdTokenTypeISO14443, IdTokenTypeISO15693, IdTokenTypeKeyCode, IdTokenTypeLocal, IdTokenTypeMacAddress, IdTokenTypeNoAuthorization:
return true
default:
return false
Expand Down