Skip to content

Commit 7e89fbf

Browse files
committed
chore(cloud_auth): Simplify middleware getter
1 parent 10ea03a commit 7e89fbf

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

services/celest_cloud_auth/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## NEXT
2+
3+
- chore: Simplify `middleware` getter
4+
15
## 0.3.3
26

37
- fix: Migration of Cloud Auth tables

services/celest_cloud_auth/lib/celest_cloud_auth.dart

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -100,15 +100,7 @@ final class CelestCloudAuth {
100100
}
101101

102102
/// An authorization middleware which can be added to a Shelf pipeline.
103-
AuthorizationMiddleware get middleware => AuthorizationMiddleware(
104-
issuer: context.rootEntity,
105-
routeMap: routeMap,
106-
corks: corks,
107-
cryptoKeys: cryptoKeys,
108-
users: users,
109-
db: db,
110-
authorizer: authorizer,
111-
);
103+
AuthorizationMiddleware get middleware => authenticationService.middleware;
112104

113105
@visibleForTesting
114106
final CloudAuthDatabaseMixin db;

services/celest_cloud_auth/lib/src/authentication/authentication_service.dart

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ extension type AuthenticationService._(_Deps _deps) implements Object {
135135
..post('/sessions%3AendSession', handleEndSession);
136136
}
137137

138-
Handler get handler {
139-
final requestAuthorizer = AuthorizationMiddleware(
138+
AuthorizationMiddleware get middleware {
139+
return AuthorizationMiddleware(
140140
routeMap: _deps.routeMap,
141141
corks: _deps.corks,
142142
cryptoKeys: _deps.cryptoKeys,
@@ -145,9 +145,12 @@ extension type AuthenticationService._(_Deps _deps) implements Object {
145145
authorizer: _deps.authorizer,
146146
issuer: _deps.issuer,
147147
);
148+
}
149+
150+
Handler get handler {
148151
return const Pipeline()
149152
.addMiddleware(const CloudExceptionMiddleware().call)
150-
.addMiddleware(requestAuthorizer.call)
153+
.addMiddleware(middleware.call)
151154
.addHandler(_router.call);
152155
}
153156

0 commit comments

Comments
 (0)