Skip to content

Commit df50e71

Browse files
memuratsmemurats
committed
fixed code style
1 parent 94e6fe2 commit df50e71

File tree

7 files changed

+197
-191
lines changed

7 files changed

+197
-191
lines changed

‎lib/MagentaBearer/MBackend.php‎

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,16 @@
2525

2626
namespace OCA\UserOIDC\MagentaBearer;
2727

28-
use OCA\UserOIDC\User\AbstractOidcBackend;
28+
use OCA\UserOIDC\AppInfo\Application;
2929
use OCA\UserOIDC\Db\Provider;
30+
use OCA\UserOIDC\Db\ProviderMapper;
31+
use OCA\UserOIDC\Db\UserMapper;
3032
use OCA\UserOIDC\Event\TokenValidatedEvent;
3133
use OCA\UserOIDC\Service\DiscoveryService;
3234
use OCA\UserOIDC\Service\ProviderService;
35+
use OCA\UserOIDC\Service\ProvisioningDeniedException;
3336
use OCA\UserOIDC\Service\ProvisioningEventService;
34-
use OCA\UserOIDC\AppInfo\Application;
35-
use OCA\UserOIDC\Db\ProviderMapper;
36-
use OCA\UserOIDC\Db\UserMapper;
37+
use OCA\UserOIDC\User\AbstractOidcBackend;
3738
use OCP\EventDispatcher\IEventDispatcher;
3839
use OCP\IConfig;
3940
use OCP\IRequest;
@@ -55,32 +56,37 @@ class MBackend extends AbstractOidcBackend {
5556
*/
5657
protected $provisioningService;
5758

59+
/**
60+
* @var ICrypto
61+
*/
62+
protected $crypto;
63+
5864
public function __construct(IConfig $config,
59-
UserMapper $userMapper,
60-
LoggerInterface $logger,
61-
IRequest $request,
62-
ISession $session,
63-
IURLGenerator $urlGenerator,
64-
IEventDispatcher $eventDispatcher,
65-
DiscoveryService $discoveryService,
66-
ProviderMapper $providerMapper,
67-
ProviderService $providerService,
68-
IUserManager $userManager,
69-
ICrypto $crypto,
70-
TokenService $mtokenService,
71-
ProvisioningEventService $provisioningService
72-
) {
65+
UserMapper $userMapper,
66+
LoggerInterface $logger,
67+
IRequest $request,
68+
ISession $session,
69+
IURLGenerator $urlGenerator,
70+
IEventDispatcher $eventDispatcher,
71+
DiscoveryService $discoveryService,
72+
ProviderMapper $providerMapper,
73+
ProviderService $providerService,
74+
IUserManager $userManager,
75+
ICrypto $crypto,
76+
TokenService $mtokenService,
77+
ProvisioningEventService $provisioningService,
78+
) {
7379
parent::__construct($config, $userMapper, $logger, $request, $session,
74-
$urlGenerator, $eventDispatcher, $discoveryService,
75-
$providerMapper, $providerService, $userManager);
80+
$urlGenerator, $eventDispatcher, $discoveryService,
81+
$providerMapper, $providerService, $userManager);
7682

7783
$this->mtokenService = $mtokenService;
7884
$this->provisioningService = $provisioningService;
7985
$this->crypto = $crypto;
8086
}
8187

8288
public function getBackendName(): string {
83-
return Application::APP_ID . "\\MagentaBearer";
89+
return Application::APP_ID . '\\MagentaBearer';
8490
}
8591

8692
/**
@@ -129,11 +135,11 @@ public function getCurrentUserId(): string {
129135
$this->mtokenService->verifyClaims($payload, ['http://auth.magentacloud.de']);
130136
} catch (InvalidTokenException $eToken) {
131137
// there is
132-
$this->logger->debug('Invalid token:' . $eToken->getMessage(). ". Trying another provider.");
138+
$this->logger->debug('Invalid token:' . $eToken->getMessage() . '. Trying another provider.');
133139
continue;
134140
} catch (SignatureException $eSignature) {
135141
// only the key seems not to fit, so try the next provider
136-
$this->logger->debug($eSignature->getMessage() . ". Trying another provider.");
142+
$this->logger->debug($eSignature->getMessage() . '. Trying another provider.');
137143
continue;
138144
} catch (\Throwable $e) {
139145
// there is

‎lib/MagentaBearer/TokenService.php‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,27 +24,27 @@
2424

2525
namespace OCA\UserOIDC\MagentaBearer;
2626

27-
use Psr\Log\LoggerInterface;
28-
use OCP\AppFramework\Utility\ITimeFactory;
29-
30-
use Jose\Component\Core\JWK;
3127
use Jose\Component\Core\Algorithm;
3228
use Jose\Component\Core\AlgorithmManager;
3329

34-
use Jose\Component\Encryption\Compression\CompressionMethodManager;
35-
use Jose\Component\Encryption\Compression\Deflate;
36-
use Jose\Component\Encryption\JWEDecrypter;
30+
use Jose\Component\Core\JWK;
31+
use Jose\Component\Encryption\Algorithm\ContentEncryption\A256CBCHS512;
32+
use Jose\Component\Encryption\Algorithm\KeyEncryption\ECDHESA256KW;
3733

3834
use Jose\Component\Encryption\Algorithm\KeyEncryption\PBES2HS512A256KW;
3935
use Jose\Component\Encryption\Algorithm\KeyEncryption\RSAOAEP256;
40-
use Jose\Component\Encryption\Algorithm\KeyEncryption\ECDHESA256KW;
41-
use Jose\Component\Encryption\Algorithm\ContentEncryption\A256CBCHS512;
36+
use Jose\Component\Encryption\Compression\CompressionMethodManager;
4237

38+
use Jose\Component\Encryption\Compression\Deflate;
39+
use Jose\Component\Encryption\JWEDecrypter;
4340
use Jose\Component\Signature\Algorithm\HS256;
4441
use Jose\Component\Signature\Algorithm\HS384;
42+
4543
use Jose\Component\Signature\Algorithm\HS512;
46-
use Jose\Component\Signature\JWSVerifier;
4744
use Jose\Component\Signature\JWS;
45+
use Jose\Component\Signature\JWSVerifier;
46+
use OCP\AppFramework\Utility\ITimeFactory;
47+
use Psr\Log\LoggerInterface;
4848

4949
class TokenService {
5050

@@ -58,7 +58,7 @@ class TokenService {
5858
private $discoveryService;
5959

6060
public function __construct(LoggerInterface $logger,
61-
ITimeFactory $timeFactory) {
61+
ITimeFactory $timeFactory) {
6262
$this->logger = $logger;
6363
$this->timeFactory = $timeFactory;
6464

@@ -142,7 +142,7 @@ public function decryptToken(string $rawToken, string $decryptKey) : JWS {
142142
* Transform them in a format compatible with id_token representation.
143143
*/
144144
public function decode(JWS $decodedToken) : object {
145-
$this->logger->debug("Telekom SAM3 access token: " . $decodedToken->getPayload());
145+
$this->logger->debug('Telekom SAM3 access token: ' . $decodedToken->getPayload());
146146
$samContent = json_decode($decodedToken->getPayload(), false);
147147

148148
// remap all the custom claims
@@ -153,7 +153,7 @@ public function decode(JWS $decodedToken) : object {
153153
}
154154
unset($samContent->{'urn:telekom.com:idm:at:attributes'});
155155

156-
$this->logger->debug("Adapted OpenID-like token; " . json_encode($samContent));
156+
$this->logger->debug('Adapted OpenID-like token; ' . json_encode($samContent));
157157
return $samContent;
158158
}
159159

‎lib/User/AbstractOidcBackend.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525

2626
namespace OCA\UserOIDC\User;
2727

28-
use OCA\UserOIDC\Service\DiscoveryService;
29-
use OCA\UserOIDC\Service\ProviderService;
3028
use OCA\UserOIDC\Db\ProviderMapper;
3129
use OCA\UserOIDC\Db\UserMapper;
30+
use OCA\UserOIDC\Service\DiscoveryService;
31+
use OCA\UserOIDC\Service\ProviderService;
3232
use OCP\AppFramework\Db\DoesNotExistException;
3333
use OCP\Authentication\IApacheBackend;
3434
use OCP\DB\Exception;
@@ -96,16 +96,16 @@ abstract class AbstractOidcBackend extends ABackend implements IPasswordConfirma
9696
protected $userManager;
9797

9898
public function __construct(IConfig $config,
99-
UserMapper $userMapper,
100-
LoggerInterface $logger,
101-
IRequest $request,
102-
ISession $session,
103-
IURLGenerator $urlGenerator,
104-
IEventDispatcher $eventDispatcher,
105-
DiscoveryService $discoveryService,
106-
ProviderMapper $providerMapper,
107-
ProviderService $providerService,
108-
IUserManager $userManager) {
99+
UserMapper $userMapper,
100+
LoggerInterface $logger,
101+
IRequest $request,
102+
ISession $session,
103+
IURLGenerator $urlGenerator,
104+
IEventDispatcher $eventDispatcher,
105+
DiscoveryService $discoveryService,
106+
ProviderMapper $providerMapper,
107+
ProviderService $providerService,
108+
IUserManager $userManager) {
109109
$this->config = $config;
110110
$this->userMapper = $userMapper;
111111
$this->logger = $logger;

0 commit comments

Comments
 (0)