Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

migrate empty string key properly
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

simplifying the code
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

migrate old token key format
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

fix warning msg
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

replace error with warn in delete
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

more fixes
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

more fixes
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>