TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-11 21:37:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: response type mapping (#426)

Browse Source 
* fix: return authorizations on userinfo

* fix: response type mapping

* fix tests

* fix angular

* regenerate mgmt proto

* enable login link again
This commit is contained in:
Livio Amstutz
2020-07-09 15:52:20 +02:00
committed by GitHub
parent 0b012f2fa2
commit 6128c0c672
13 changed files with 13246 additions and 13948 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/api/grpc/management/application_converter.go
View File

@@ -208,8 +208,8 @@ func oidcResponseTypesToModel(responseTypes []management.OIDCResponseType) []pro
oidcResponseTypes[i] = proj_model.OIDCResponseTypeCode
case management.OIDCResponseType_OIDCRESPONSETYPE_ID_TOKEN:
oidcResponseTypes[i] = proj_model.OIDCResponseTypeIDToken
case management.OIDCResponseType_OIDCRESPONSETYPE_TOKEN:
oidcResponseTypes[i] = proj_model.OIDCResponseTypeToken
case management.OIDCResponseType_OIDCRESPONSETYPE_ID_TOKEN_TOKEN:
oidcResponseTypes[i] = proj_model.OIDCResponseTypeIDTokenToken
}
}
@@ -225,8 +225,8 @@ func oidcResponseTypesFromModel(responseTypes []proj_model.OIDCResponseType) []m
oidcResponseTypes[i] = management.OIDCResponseType_OIDCRESPONSETYPE_CODE
case proj_model.OIDCResponseTypeIDToken:
oidcResponseTypes[i] = management.OIDCResponseType_OIDCRESPONSETYPE_ID_TOKEN
case proj_model.OIDCResponseTypeToken:
oidcResponseTypes[i] = management.OIDCResponseType_OIDCRESPONSETYPE_TOKEN
case proj_model.OIDCResponseTypeIDTokenToken:
oidcResponseTypes[i] = management.OIDCResponseType_OIDCRESPONSETYPE_ID_TOKEN_TOKEN
}
}

8
internal/api/oidc/auth_request_converter.go
View File

@@ -193,10 +193,10 @@ func ResponseTypeToBusiness(responseType oidc.ResponseType) model.OIDCResponseTy
switch responseType {
case oidc.ResponseTypeCode:
return model.OIDCResponseTypeCode
case oidc.ResponseTypeIDToken:
return model.OIDCResponseTypeIdToken
case oidc.ResponseTypeIDTokenOnly:
return model.OIDCResponseTypeToken
return model.OIDCResponseTypeIdToken
case oidc.ResponseTypeIDToken:
return model.OIDCResponseTypeIdTokenToken
default:
return model.OIDCResponseTypeCode
}
@@ -206,7 +206,7 @@ func ResponseTypeToOIDC(responseType model.OIDCResponseType) oidc.ResponseType {
switch responseType {
case model.OIDCResponseTypeCode:
return oidc.ResponseTypeCode
case model.OIDCResponseTypeToken:
case model.OIDCResponseTypeIdTokenToken:
return oidc.ResponseTypeIDToken
case model.OIDCResponseTypeIdToken:
return oidc.ResponseTypeIDTokenOnly