|
|
|
|
@ -337,6 +337,39 @@ class OAuth2 extends Plugin |
|
|
|
|
); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
public static function isFirstLoginAfterAuthSource(int $userId): bool |
|
|
|
|
{ |
|
|
|
|
$em = Database::getManager(); |
|
|
|
|
|
|
|
|
|
$lastLogin = $em |
|
|
|
|
->getRepository(TrackELogin::class) |
|
|
|
|
->findOneBy( |
|
|
|
|
['loginUserId' => $userId], |
|
|
|
|
['loginDate' => 'DESC'] |
|
|
|
|
) |
|
|
|
|
; |
|
|
|
|
|
|
|
|
|
if (!$lastLogin) { |
|
|
|
|
return false; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
$objExtraField = new ExtraField('user'); |
|
|
|
|
$field = $objExtraField->getHandlerEntityByFieldVariable(self::EXTRA_FIELD_OAUTH2_ID); |
|
|
|
|
|
|
|
|
|
$fieldValue = $em |
|
|
|
|
->getRepository(ExtraFieldValues::class) |
|
|
|
|
->findOneBy( |
|
|
|
|
['itemId' => $userId, 'field' => $field] |
|
|
|
|
) |
|
|
|
|
; |
|
|
|
|
|
|
|
|
|
if (!$fieldValue) { |
|
|
|
|
return false; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return $fieldValue->getCreatedAt() >= $lastLogin->getLoginDate(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* Extends ArrayAccessorTrait::getValueByKey to return a list of values |
|
|
|
|
* $key can contain wild card character * |
|
|
|
|
@ -472,37 +505,4 @@ class OAuth2 extends Plugin |
|
|
|
|
error_log("OAuth2 plugin: $key: $content"); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
public static function isFirstLoginAfterAuthSource(int $userId): bool |
|
|
|
|
{ |
|
|
|
|
$em = Database::getManager(); |
|
|
|
|
|
|
|
|
|
$lastLogin = $em |
|
|
|
|
->getRepository(TrackELogin::class) |
|
|
|
|
->findOneBy( |
|
|
|
|
['loginUserId' => $userId], |
|
|
|
|
['loginDate' => 'DESC'] |
|
|
|
|
) |
|
|
|
|
; |
|
|
|
|
|
|
|
|
|
if (!$lastLogin) { |
|
|
|
|
return false; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
$objExtraField = new ExtraField('user'); |
|
|
|
|
$field = $objExtraField->getHandlerEntityByFieldVariable(self::EXTRA_FIELD_OAUTH2_ID); |
|
|
|
|
|
|
|
|
|
$fieldValue = $em |
|
|
|
|
->getRepository(ExtraFieldValues::class) |
|
|
|
|
->findOneBy( |
|
|
|
|
['itemId' => $userId, 'field' => $field] |
|
|
|
|
) |
|
|
|
|
; |
|
|
|
|
|
|
|
|
|
if (!$fieldValue) { |
|
|
|
|
return false; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return $fieldValue->getCreatedAt() >= $lastLogin->getLoginDate(); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|