Directory Information not available on User Principal

I need access to the directory on the user principal to know which directory they authenticated with (using this as a grouping mechanism), essentially allowing each company/customer to have their own directory.

The soap API returns the directoryId, and so I've resorted to that to get some handle on the directory, but ultimately it would be nice if the REST API could return the directory name or id on the principal.