feat(users): include account enabled field

and mail nickname

shard.yml

@@ -1,5 +1,5 @@
 name: office365
-version: 1.24.0
+version: 1.25.0
 
 crystal: ">= 0.36.1"
 

spec/spec_helper.cr

@@ -119,7 +119,7 @@ module SpecHelper
   end
 
   def mock_list_users
-    WebMock.stub(:get, "https://graph.microsoft.com/v1.0/users?$filter=accountEnabled eq true")
+    WebMock.stub(:get, "https://graph.microsoft.com/v1.0/users?$select=id,userPrincipalName,surname,preferredLanguage,officeLocation,mobilePhone,mail,jobTitle,givenName,displayName,businessPhones,accountEnabled,mailNickname&$filter=accountEnabled eq true")
       .to_return(mock_user_query.to_json)
   end
 

src/models/user.cr

@@ -35,6 +35,9 @@ module Office365
     @[JSON::Field(key: "userPrincipalName")]
     property user_principal_name : String
 
+    @[JSON::Field(key: "accountEnabled")]
+    property account_enabled : Bool?
+
     # Additional Properties (get through $select query parameter)
     property contacts : Array(Contact)?
 

src/users.cr

@@ -43,7 +43,9 @@ module Office365::Users
     get_user response
   end
 
-  def list_users_request(q : String? = nil, limit : Int32? = nil, filter : String? = nil)
+  SELECT_FIELDS = %w(id userPrincipalName surname preferredLanguage officeLocation mobilePhone mail jobTitle givenName displayName businessPhones accountEnabled mailNickname)
+
+  def list_users_request(q : String? = nil, limit : Int32? = nil, filter : String? = nil, additional_fields : Array(String)? = nil)
     if q
       queries = q.split(" ")
       filter_params = [] of String
@@ -61,7 +63,13 @@ module Office365::Users
 
     limit = limit.to_s if limit
 
+    fields = SELECT_FIELDS
+    if additional_fields
+      fields += additional_fields
+    end
+
     query_params = URI::Params.new({
+      "$select" => fields.join(","),
       "$filter" => filter_param,
       "$top"    => limit,
     }.compact.transform_values { |val| [val] })