Merge branch 'develop3.0-tmd' of http://106.12.23.251:10080/TEAMMODEL/TEAMModelOS into develop3.0-tmd

TEAMModelOS/Controllers/Teacher/InitController.cs

@@ -196,14 +196,14 @@ namespace TEAMModelOS.Controllers
             {
                 using var json = await JsonDocument.ParseAsync(response.ContentStream);
 
-                if (json.RootElement.TryGetProperty("roles", out JsonElement _roles))
+                if (json.RootElement.TryGetProperty("roles", out JsonElement _roles) && _roles.ValueKind != JsonValueKind.Null)
                 {
                     foreach (var obj in _roles.EnumerateArray())
                     {
                         roles.Add(obj.GetString());
                     }
                 }
-                if (json.RootElement.TryGetProperty("permissions", out JsonElement _permissions))
+                if (json.RootElement.TryGetProperty("permissions", out JsonElement _permissions) && _permissions.ValueKind != JsonValueKind.Null)
                 {
                     foreach (var obj in _permissions.EnumerateArray())
                     {
@@ -423,7 +423,7 @@ namespace TEAMModelOS.Controllers
                         id = id,
                         name = name.ToString(),
                         picture = picture?.ToString(), //TODO JJ，原本的判断会出现报错，没检查null却又去ToString
-                        //permissions = null, 加入學校無須特別設置此字段
+                        permissions = new List<string>(),
                         roles = new List<string>(){ "teacher" },
                         status = grant_type.GetString()
                     };