Skip to content

Commit 24bd0c9

Browse files
silverhacksilverhack
committed
update init
1 parent 641f22f commit 24bd0c9

2 files changed

Lines changed: 31 additions & 31 deletions

File tree

‎core/init/Get-AADRMServiceLocatorUrl.ps1‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Function Get-AADRMServiceLocatorUrl{
3636
[CmdletBinding()]
3737
Param()
3838
try{
39-
if($O365Object.auth_tokens.AADRM){
39+
If($O365Object.auth_tokens.AADRM){
4040
$access_token = $O365Object.auth_tokens.AADRM
4141
#Set Authorization Header
4242
$AuthHeader = ("MSOID {0}" -f $access_token.AccessToken)
@@ -53,16 +53,16 @@ Function Get-AADRMServiceLocatorUrl{
5353
}
5454
[xml]$xml_response = Invoke-MonkeyWebRequest @p
5555
#Get service locator url
56-
if($null -ne $xml_response){
56+
If($null -ne $xml_response){
5757
$ns = @{ns="http://microsoft.com/DRM/ServiceLocatorService"}
5858
$response = Select-Xml -Xml $xml_response -XPath '//ns:ServiceLocationResponse' -Namespace $ns -ErrorAction Ignore
59-
if($null -ne $response -and $null -ne ($response.PsObject.Properties.Item('Node'))){
59+
If($null -ne $response -and $null -ne ($response.PsObject.Properties.Item('Node'))){
6060
$service_locator = $response.Node.Url
6161
return $service_locator
6262
}
6363
}
6464
}
65-
else{
65+
Else{
6666
$msg = @{
6767
MessageData = $message.AADRMServiceLocatorError;
6868
callStack = (Get-PSCallStack | Select-Object -First 1);
@@ -79,7 +79,7 @@ Function Get-AADRMServiceLocatorUrl{
7979
logLevel = 'error';
8080
Tags = @('AADRMServiceLocatorError');
8181
}
82-
Write-Verbose @msg
82+
Write-Error @msg
8383
}
8484
}
8585

‎core/init/Get-ExecutionInfo.ps1‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# Unless required by applicable law or agreed to in writing, software
1010
# distributed under the License is distributed on an "AS IS" BASIS,
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
# See the License for the specific language governing permissions and
12+
# See the License for the specIfic language governing permissions and
1313
# limitations under the License.
1414

1515
Function Get-ExecutionInfo{
@@ -37,34 +37,34 @@ Function Get-ExecutionInfo{
3737
Param()
3838
Begin{
3939
#Get default domain
40-
if($null -ne $O365Object.Tenant.CompanyInfo){
41-
$defaultDomain = $O365Object.Tenant.CompanyInfo.verifiedDomains.Where({$_.isDefault -eq $true})
42-
if($defaultDomain){
40+
If($null -ne $O365Object.Tenant.CompanyInfo){
41+
$defaultDomain = $O365Object.Tenant.CompanyInfo.verIfiedDomains.Where({$_.isDefault -eq $true})
42+
If($defaultDomain){
4343
$domainName = $defaultDomain.name
4444
}
4545
}
46-
else{
46+
Else{
4747
$domainName = $null
4848
}
4949
#Get TenantId
50-
if($null -ne $O365Object.Tenant.TenantId){
51-
$tenantId = $O365Object.Tenant.TenantId
50+
If($null -ne $O365Object.Tenant.tenantId){
51+
$tenantId = $O365Object.Tenant.tenantId
5252
}
53-
elseif($null -ne $O365Object.TenantId){
53+
ElseIf($null -ne $O365Object.TenantId){
5454
$tenantId = $O365Object.TenantId
5555
}
56-
else{
56+
Else{
5757
$tenantId = $null;
5858
}
5959
#Get Tenant Name
60-
if($null -ne $O365Object.Tenant.TenantName){
61-
$tenantName = $O365Object.Tenant.TenantName
60+
If($null -ne $O365Object.Tenant.tenantName){
61+
$tenantName = $O365Object.Tenant.tenantName
6262
}
63-
else{
63+
Else{
6464
$tenantName = $null;
6565
}
6666
#Set hashtable
67-
if($O365Object.Instance -eq "Azure"){
67+
If($O365Object.Instance -eq "Azure"){
6868
$user_profile = [ordered]@{
6969
Domain = $domainName;
7070
"TenantId" = $tenantId;
@@ -73,7 +73,7 @@ Function Get-ExecutionInfo{
7373
"Subscription Name" = $O365Object.current_subscription.displayName;
7474
}
7575
}
76-
else{
76+
Else{
7777
$user_profile = [ordered]@{
7878
Domain = $domainName;
7979
"TenantId" = $tenantId;
@@ -83,26 +83,26 @@ Function Get-ExecutionInfo{
8383
#Set psObject
8484
$execution_info = [pscustomobject]@{
8585
Domain = $domainName;
86-
userPrincipalName = if($O365Object.isConfidentialApp){$O365Object.me.appId}else{$O365Object.me.userPrincipalName};
86+
userPrincipalName = If($O365Object.isConfidentialApp){$O365Object.me.appId}Else{$O365Object.me.userPrincipalName};
8787
displayName = $O365Object.me.displayName;
88-
permissions = if($null -ne $O365Object.aadPermissions){$O365Object.aadPermissions}else{$null};
88+
permissions = If($null -ne $O365Object.aadPermissions){$O365Object.aadPermissions}Else{$null};
8989
roles = $null;
9090
ScanDate = $O365Object.startDate.ToLocalTime();
91-
subscription = if($null -ne $O365Object.current_subscription){$O365Object.current_subscription}else{$null};
92-
tenant = if($null -ne $O365Object.Tenant){$O365Object.Tenant}else{$null};
91+
subscription = If($null -ne $O365Object.current_subscription){$O365Object.current_subscription}Else{$null};
92+
tenant = If($null -ne $O365Object.Tenant){$O365Object.Tenant}Else{$null};
9393
userpic = $null;
9494
profile = $user_profile;
9595
}
9696
}
9797
Process{
9898
#Get roles
99-
if($O365Object.Instance -eq "Azure" -and $null -ne $O365Object.azPermissions){
99+
If($O365Object.Instance -eq "Azure" -and $null -ne $O365Object.azPermissions){
100100
$roles = $O365Object.azPermissions | Select-Object -Unique -ExpandProperty RoleName -ErrorAction Ignore
101101
}
102-
elseif($O365Object.Instance -ne "Azure" -and $null -ne $O365Object.aadPermissions){
102+
ElseIf($O365Object.Instance -ne "Azure" -and $null -ne $O365Object.aadPermissions){
103103
$roles = $O365Object.aadPermissions | Select-Object -ExpandProperty displayName -ErrorAction Ignore
104104
}
105-
else{
105+
Else{
106106
$msg = @{
107107
MessageData = "Unable to get user's permissions";
108108
callStack = (Get-PSCallStack | Select-Object -First 1);
@@ -116,7 +116,7 @@ Function Get-ExecutionInfo{
116116
#Append roles to PsObject
117117
$execution_info.roles = $roles;
118118
#Get Profile pic
119-
if($O365Object.isConfidentialApp){
119+
If($O365Object.isConfidentialApp){
120120
$p = @{
121121
ApplicationId = $O365Object.clientApplicationId;
122122
Verbose = $O365Object.verbose;
@@ -125,7 +125,7 @@ Function Get-ExecutionInfo{
125125
}
126126
$pic = Get-MonkeyMSGraphProfilePhoto @p
127127
}
128-
else{
128+
Else{
129129
$p = @{
130130
UserId = $O365Object.userId;
131131
Verbose = $O365Object.verbose;
@@ -134,12 +134,12 @@ Function Get-ExecutionInfo{
134134
}
135135
$pic = Get-MonkeyMSGraphProfilePhoto @p
136136
}
137-
if($null -ne $pic){
137+
If($null -ne $pic){
138138
$user_pic = ('data:image/png;base64,{0}' -f $pic)
139139
$execution_info.userpic = $user_pic
140140
}
141-
else{
142-
$user_pic = 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNy4xLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IiBoZWlnaHQ9IjUwcHgiIHdpZHRoPSI1MHB4IiB2aWV3Qm94PSIwIDAgNTAgNTAiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDUwIDUwIiB4bWw6c3BhY2U9InByZXNlcnZlIj4NCjxwb2x5Z29uIG9wYWNpdHk9IjAuMSIgZmlsbD0iI0ZGRkZGRiIgcG9pbnRzPSIwLDAgNTAsMCA1MCw1MCAwLDUwICIvPg0KPHBvbHlnb24gb3BhY2l0eT0iMC4xIiBmaWxsPSIjMkIzMTM3IiBwb2ludHM9IjAsMCA1MCwwIDUwLDUwIDAsNTAgIi8+DQo8Zz4NCgk8cGF0aCBmaWxsPSIjNTlCNEQ5IiBkPSJNMzEuOSwxNS4xYzAsMy43LTMuMSw2LjktNi45LDYuOXMtNi45LTMuMS02LjktNi45czMuMS02LjksNi45LTYuOUMyOC43LDguMiwzMS45LDExLjQsMzEuOSwxNS4xIi8+DQoJPHBvbHlnb24gZmlsbD0iIzU5QjREOSIgcG9pbnRzPSIzMCwyNC40IDI1LDMxLjQgMjAsMjQuNCAxMi43LDI0LjQgMTIuNyw0MS44IDM3LjIsNDEuOCAzNy4yLDI0LjQgCSIvPg0KCTxwYXRoIG9wYWNpdHk9IjAuMiIgZmlsbD0iI0ZGRkZGRiIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAgICAiIGQ9Ik0xOC4xLDE1LjFjMCwzLjcsMyw2LjgsNi44LDYuOWwxLjYtMTMuNQ0KCQljLTAuNS0wLjEtMS0wLjEtMS41LTAuMUMyMS4xLDguMiwxOC4xLDExLjQsMTguMSwxNS4xIi8+DQoJPHBvbHlnb24gb3BhY2l0eT0iMC4yIiBmaWxsPSIjRkZGRkZGIiBlbmFibGUtYmFja2dyb3VuZD0ibmV3ICAgICIgcG9pbnRzPSIyMCwyNC40IDEyLjcsMjQuNCAxMi43LDQxLjggMjIuNCw0MS44IDIzLjksMjkuOSAJIi8+DQo8L2c+DQo8L3N2Zz4NCg=='
141+
Else{
142+
$user_pic = 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNy4xLjAsIfNWRyBFeHBvcnQgUGx1Zy1JbiAuIfNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IiBoZWlnaHQ9IjUwcHgiIHdpZHRoPSI1MHB4IiB2aWV3Qm94PSIwIDAgNTAgNTAiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDUwIDUwIiB4bWw6c3BhY2U9InByZXNlcnZlIj4NCjxwb2x5Z29uIG9wYWNpdHk9IjAuMSIgZmlsbD0iI0ZGRkZGRiIgcG9pbnRzPSIwLDAgNTAsMCA1MCw1MCAwLDUwICIvPg0KPHBvbHlnb24gb3BhY2l0eT0iMC4xIiBmaWxsPSIjMkIzMTM3IiBwb2ludHM9IjAsMCA1MCwwIDUwLDUwIDAsNTAgIi8+DQo8Zz4NCgk8cGF0aCBmaWxsPSIjNTlCNEQ5IiBkPSJNMzEuOSwxNS4xYzAsMy43LTMuMSw2LjktNi45LDYuOXMtNi45LTMuMS02LjktNi45czMuMS02LjksNi45LTYuOUMyOC43LDguMiwzMS45LDExLjQsMzEuOSwxNS4xIi8+DQoJPHBvbHlnb24gZmlsbD0iIzU5QjREOSIgcG9pbnRzPSIzMCwyNC40IDI1LDMxLjQgMjAsMjQuNCAxMi43LDI0LjQgMTIuNyw0MS44IDM3LjIsNDEuOCAzNy4yLDI0LjQgCSIvPg0KCTxwYXRoIG9wYWNpdHk9IjAuMiIgZmlsbD0iI0ZGRkZGRiIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAgICAiIGQ9Ik0xOC4xLDE1LjFjMCwzLjcsMyw2LjgsNi44LDYuOWwxLjYtMTMuNQ0KCQljLTAuNS0wLjEtMS0wLjEtMS41LTAuMUMyMS4xLDguMiwxOC4xLDExLjQsMTguMSwxNS4xIi8+DQoJPHBvbHlnb24gb3BhY2l0eT0iMC4yIiBmaWxsPSIjRkZGRkZGIiBlbmFibGUtYmFja2dyb3VuZD0ibmV3ICAgICIgcG9pbnRzPSIyMCwyNC40IDEyLjcsMjQuNCAxMi43LDQxLjggMjIuNCw0MS44IDIzLjksMjkuOSAJIi8+DQo8L2c+DQo8L3N2Zz4NCg=='
143143
$execution_info.userpic = $user_pic
144144
}
145145
}

0 commit comments

Comments
 (0)