diff --git a/internal/controllers/user_devices_controller.go b/internal/controllers/user_devices_controller.go index 24aa8a03b..8879f4b61 100644 --- a/internal/controllers/user_devices_controller.go +++ b/internal/controllers/user_devices_controller.go @@ -784,22 +784,13 @@ func (udc *UserDevicesController) RegisterDeviceForUserFromSmartcar(c *fiber.Ctx if info == nil { info = &smartcar.Info{} } - // block kia - if strings.ToLower(info.Make) == "kia" { - localLog.Warn().Msgf("kia blocked, smartcar make") - return fiber.NewError(fiber.StatusFailedDependency, "Kia vehicles are only supported via Hardware connections for now.") - } + // decode VIN with grpc call, including any possible smartcar known info decodeVIN, err := udc.DeviceDefSvc.DecodeVIN(c.Context(), vin, info.Model, info.Year, reg.CountryCode) if err != nil { localLog.Err(err).Msg("unable to decode vin for customer request to create vehicle") return shared.GrpcErrorToFiber(err, "unable to decode vin: "+vin) } - // jic kia block by make id - if decodeVIN.DeviceMakeId == "2681cSm2zmTmGHzqK3ldzoTLZIw" { - localLog.Warn().Msgf("kia blocked, by smartcar vin decode to kia meke id") - return fiber.NewError(fiber.StatusFailedDependency, "Kia vehicles are only supported via Hardware connections for now.") - } // in case err is nil but we don't get a valid decode if len(decodeVIN.DeviceDefinitionId) == 0 { @@ -1278,6 +1269,12 @@ func (udc *UserDevicesController) GetMintDevice(c *fiber.Ctx) error { } makeTokenID := big.NewInt(int64(dd.Make.TokenId)) + // block new kias from minting + if strings.ToLower(dd.Make.NameSlug) == "kia" || dd.Make.Id == "2681cSm2zmTmGHzqK3ldzoTLZIw" { + udc.log.Warn().Msgf("new kias blocked from minting") + return fiber.NewError(fiber.StatusFailedDependency, "Kia vehicles cannot be manually minted for now.") + } + user, err := udc.usersClient.GetUser(c.Context(), &pb.GetUserRequest{Id: userID}) if err != nil { udc.log.Err(err).Msg("Couldn't retrieve user record.") diff --git a/internal/controllers/user_integrations_controller.go b/internal/controllers/user_integrations_controller.go index 1a4d5f249..171898fec 100644 --- a/internal/controllers/user_integrations_controller.go +++ b/internal/controllers/user_integrations_controller.go @@ -1456,11 +1456,7 @@ func (udc *UserDevicesController) registerDeviceIntegrationInner(c *fiber.Ctx, u logger.Err(err).Msg("grpc error searching for device definition") return shared.GrpcErrorToFiber(err, "failed to get device definition with id: "+ud.DeviceDefinitionID) } - // block SC kia's - if dd.Make.NameSlug == "kia" && integrationID == "22N2xaPOq2WW2gAHBHd0Ikn4Zob" { - logger.Warn().Msg("kia blocked, smartcar connection") - return fiber.NewError(fiber.StatusConflict, "kia software connection blocked, only hardware connections are allowed for this car") - } + logger.Info().Msgf("get device definition id result during registration %+v", dd) // filter out the desired integration from the compatible ones