Release 4.33.4

registry-public/package.yaml

@@ -1,5 +1,5 @@
 name: registry-public
-version: '4.33.3'
+version: '4.33.4'
 synopsis: Registry Public
 description: Registry Public
 category: Web

registry-server/package.yaml

@@ -1,5 +1,5 @@
 name: registry-server
-version: '4.33.3'
+version: '4.33.4'
 synopsis: Engine Registry
 description: Engine Registry
 category: Web

registry-server/src/Registry/Api/Handler/Swagger/Api.hs

@@ -41,7 +41,7 @@ swagger =
             s._swaggerInfo
               { _infoTitle = "Registry API"
               , _infoDescription = Just "API specification for Registry"
-              , _infoVersion = "4.33.3"
+              , _infoVersion = "4.33.4"
               , _infoLicense =
                   Just $
                     License

shared-common/package.yaml

@@ -1,5 +1,5 @@
 name: shared-common
-version: '4.33.3'
+version: '4.33.4'
 synopsis: Engine Shared
 description: Engine Shared
 category: Web

wizard-public/package.yaml

@@ -1,5 +1,5 @@
 name: wizard-public
-version: '4.33.3'
+version: '4.33.4'
 synopsis: Wizard Public
 description: Wizard Public
 category: Web

wizard-server/package.yaml

@@ -1,5 +1,5 @@
 name: wizard-server
-version: '4.33.3'
+version: '4.33.4'
 synopsis: Engine Wizard
 description: Engine Wizard
 category: Web

wizard-server/src/Wizard/Api/Handler/Swagger/Api.hs

@@ -158,7 +158,7 @@ swagger =
             s._swaggerInfo
               { _infoTitle = "Wizard API"
               , _infoDescription = Just "API specification for Wizard"
-              , _infoVersion = "4.33.3"
+              , _infoVersion = "4.33.4"
               , _infoLicense =
                   Just $
                     License

wizard-server/src/Wizard/Service/OpenId/Client/Flow/OpenIdClientFlowService.hs

@@ -22,6 +22,7 @@ import Shared.OpenId.Api.Resource.OpenId.Client.Flow.OpenIdClientAuthenticationU
 import Shared.OpenId.Model.OpenId.OpenIdClientParameter
 import Shared.OpenId.Service.OpenId.Client.Flow.OpenIdClientFlowService
 import Shared.OpenId.Service.OpenId.Client.Flow.OpenIdClientFlowUtil (parseIdToken)
+import Shared.UserEmailLink.Model.UserEmailLink.UserEmailLink
 import Wizard.Database.DAO.Common
 import Wizard.Database.DAO.OpenId.OpenIdClientSessionDAO
 import Wizard.Database.DAO.User.UserDAO
@@ -32,10 +33,12 @@ import Wizard.Model.Context.AppContextHelpers
 import Wizard.Model.OpenId.OpenIdClientSession
 import Wizard.Model.User.User
 import Wizard.Model.User.UserRegistrationPendingServiceType
+import Wizard.Model.UserEmailLink.UserEmailLinkType
 import Wizard.Service.Tenant.Config.ConfigService
 import Wizard.Service.Tenant.TenantHelper
 import Wizard.Service.User.UserService
 import Wizard.Service.User.UserUtil
+import Wizard.Service.UserEmailLink.UserEmailLinkService
 import Wizard.Service.UserToken.Login.LoginService
 import Wizard.Service.UserToken.Login.LoginValidation (validateIsUserActive)
 import WizardLib.Public.Api.Resource.UserToken.UserTokenDTO
@@ -126,7 +129,11 @@ loginUser providerUuid mClientUrl _mError mCode mState mIdToken mUserAgent mSess
               (Just email, Just firstName, Just lastName) -> do
                 consentRequired <- isConsentRequired Nothing
                 user <- createUserFromOpenIdLogin openIdClient externalId firstName lastName email mPicture mUserUuid (not consentRequired)
-                createLoginToken user mUserAgent mSessionState
+                if consentRequired
+                  then do
+                    userEmailLink <- createUserEmailLink user.uuid ConsentsRequiredUserEmailLinkType user.tenantUuid
+                    return $ ConsentsRequiredDTO {hash = userEmailLink.hash}
+                  else createLoginToken user mUserAgent mSessionState
               _ -> do
                 pending <- upsertPendingExternalRegistration OpenIdUserRegistrationPendingServiceType providerUuid externalId Nothing mEmail mFirstName mLastName mPicture Nothing
                 return $

wizard-server/src/Wizard/Service/User/UserService.hs

@@ -295,6 +295,12 @@ changeUserState hash active =
                 , emailVerifiedAt = Just now
                 , emailPending = Nothing
                 }
+            (ConsentsRequiredUserEmailLinkType, Just pendingEmail) ->
+              baseUser
+                { email = pendingEmail
+                , emailVerifiedAt = Just now
+                , emailPending = Nothing
+                }
             _ -> baseUser
     updateUserByUuid updatedUser
     void $ deleteUserEmailLinkByHash userEmailLink.hash