Skip to content

Commit

Permalink
Merge pull request #640 from smoy/feat/2-step-verification
Browse files Browse the repository at this point in the history
(Google Workspace) Expand data model to capture two-step verification and admin status
  • Loading branch information
smoy authored Sep 19, 2023
2 parents cfeef7d + 47eb9c0 commit c0e2250
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 5 deletions.
4 changes: 4 additions & 0 deletions iambic/plugins/v0_1_0/google_workspace/iambic_plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,13 @@ def get_google_templates():
from iambic.plugins.v0_1_0.google_workspace.group.models import (
GoogleWorkspaceGroupTemplate,
)
from iambic.plugins.v0_1_0.google_workspace.user.models import (
GoogleWorkspaceUserTemplate,
)

return [
GoogleWorkspaceGroupTemplate,
GoogleWorkspaceUserTemplate,
]


Expand Down
38 changes: 33 additions & 5 deletions iambic/plugins/v0_1_0/google_workspace/user/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,30 @@ class WorkspaceUser(BaseModel, ExpiryModel):
description="Holds the given and family names of the user, and the read-only fullName value. The maximum number of characters in the givenName and in the familyName values is 60. In addition, name values support unicode/UTF-8 characters, and can contain spaces, letters (a-z), numbers (0-9), dashes (-), forward slashes (/), and periods (.). For more information about character usage rules, see the administration help center. Maximum allowed data size for this field is 1KB.",
)

is_enrolled_in_two_step_verification: Optional[bool] = Field(
alias="isEnrolledIn2Sv",
description="Output only. Is enrolled in 2-step verification (Read-only)",
)

is_enforced_in_two_step_verification: Optional[bool] = Field(
alias="isEnforcedIn2Sv",
description="Output only. Is enrolled in 2-step verification (Read-only)",
)

is_admin: Optional[bool] = Field(
alias="isAdmin",
description="Output only. Indicates a user with super admininistrator privileges. The isAdmin property can only be edited in the Make a user an administrator operation ( makeAdmin method). If edited in the user insert or update methods, the edit is ignored by the API service.",
)

is_delegated_admin: Optional[bool] = Field(
alias="isDelegatedAdmin",
description="Output only. Indicates if the user is a delegated administrator. Delegated administrators are supported by the API but cannot create or undelete users, or make users administrators. These requests are ignored by the API service. Roles and privileges for administrators are assigned using the Admin console.",
)

suspended: Optional[bool] = Field(
description="Indicates if user is suspended.",
)

domain: str = Field(
description="this is not direct from user object from google response, but since user maps to a domain, we need to keep track of this information",
)
Expand Down Expand Up @@ -95,11 +119,15 @@ async def get_user_template(
# members = await get_group_members(service, group)

file_name = f"{user['primaryEmail'].split('@')[0]}.yaml"

user_properties = dict(
domain=domain,
name=user["name"],
primary_email=user["primaryEmail"],
)
user_properties.update(**user)

return GoogleWorkspaceUserTemplate(
file_path=f"resources/google/users/{domain}/{file_name}",
properties=dict(
domain=domain,
name=user["name"],
primary_email=user["primaryEmail"],
),
properties=user_properties,
)

0 comments on commit c0e2250

Please sign in to comment.