Add grant approval, scope.Add, ClientAuthorization update, unit tests

Move this down below the generate and join it with the lower block initializer