Start to fix auth issue

Signed-off-by: Wu Xudong <tikiet@gmail.com>
Fix duplicate auth issue

Signed-off-by: Wu Xudong <tikiet@gmail.com>