Created Assets & improved Chapter 16

tib · tib · commit 8110f65e0942 · 2020-05-22T11:04:05.000+02:00
diff --git a/Assets/01.jpg b/Assets/01.jpg
diff --git a/Assets/02.jpg b/Assets/02.jpg
diff --git a/Assets/03.jpg b/Assets/03.jpg
diff --git a/Assets/04.jpg b/Assets/04.jpg
diff --git a/Assets/05.jpg b/Assets/05.jpg
diff --git a/Chapter 16/MyProjectClient/iOS/Sources/AppDelegate.swift b/Chapter 16/MyProjectClient/iOS/Sources/AppDelegate.swift
@@ -29,6 +29,7 @@ extension AppDelegate: UIApplicationDelegate {
         return .init(name: "Default Configuration",
                      sessionRole: connectingSceneSession.role)
     }
+    //...
     
     func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
         let token = deviceToken.map { String(format: "%02.2hhx", $0) }.joined()
diff --git a/Chapter 16/MyProjectClient/iOS/Sources/Modules/Account/AccountInteractor.swift b/Chapter 16/MyProjectClient/iOS/Sources/Modules/Account/AccountInteractor.swift
@@ -21,7 +21,7 @@ extension AccountInteractor: AccountInteractorPresenterInterface {
         .mapError { $0 as Error }
         .eraseToAnyPublisher()
     }
-    
+    //...
     func register(deviceToken: String, bearerToken: String) -> AnyPublisher<Void, Error> {
         self.services.api.register(deviceToken: deviceToken, bearerToken: bearerToken)
         .mapError { $0 as Error }
diff --git a/Chapter 16/MyProjectClient/iOS/Sources/Modules/Account/AccountPresenter.swift b/Chapter 16/MyProjectClient/iOS/Sources/Modules/Account/AccountPresenter.swift
@@ -64,7 +64,7 @@ extension AccountPresenter: AccountPresenterViewInterface {
         UserDefaults.standard.synchronize()
         self.view.displayLogin()
     }
-    
+    //...
     func registerUserDevice(_ block: @escaping (() -> Void)) {
         guard
             let bearerToken = UserDefaults.standard.string(forKey: "user-token"),
diff --git a/Chapter 16/MyProjectClient/iOS/Sources/Services/Api/MyProject/MyProjectApiService.swift b/Chapter 16/MyProjectClient/iOS/Sources/Services/Api/MyProject/MyProjectApiService.swift
@@ -80,7 +80,7 @@ final class MyProjectApiService: ApiServiceInterface {
         }
         .eraseToAnyPublisher()
     }
-    
+    //...
     func register(deviceToken: String, bearerToken: String) -> AnyPublisher<Void, HTTP.Error> {
         struct Body: Codable {
             let token: String
diff --git a/Chapter 16/myProject/Sources/App/Extensions/Environment+App.swift b/Chapter 16/myProject/Sources/App/Extensions/Environment+App.swift
@@ -18,7 +18,7 @@ extension Environment {
     static let siwaTeamId = Self.get("SIWA_TEAM_ID")!
     static let siwaJWKId = Self.get("SIWA_JWK_ID")!
     static let siwaKey = Self.get("SIWA_KEY")!.base64Decoded()!
-    //...
+
     static let apnsKeyId = Self.get("APNS_KEY_ID")!
     static let apnsTeamId = Self.get("APNS_TEAM_ID")!
     static let apnsTopic = Self.get("APNS_TOPIC")!
diff --git a/Chapter 16/myProject/Sources/App/Modules/User/Controllers/UserAdminController.swift b/Chapter 16/myProject/Sources/App/Modules/User/Controllers/UserAdminController.swift
@@ -25,14 +25,14 @@ struct UserAdminController {
                                       userId: userId,
                                       status: status,
                                       users: $0)
-                return req.view.render("User/Frontend/Push", context)
+                return req.view.render("User/Admin/Push", context)
         }
     }
 
     func pushView(req: Request) throws -> EventLoopFuture<View> {
         self.renderPushView(req)
     }
-    
+
     func push(req: Request) throws -> EventLoopFuture<View> {
         struct Input: Decodable {
             let title: String
diff --git a/Chapter 16/myProject/Sources/App/Modules/User/Controllers/UserApiController.swift b/Chapter 16/myProject/Sources/App/Modules/User/Controllers/UserApiController.swift
@@ -24,7 +24,7 @@ struct UserApiController {
             UserTokenModel.create(on: req.db, for: user.id!).map { $0.getContent }
         }
     }
-    
+    //...
     func registerDevice(req: Request) throws -> EventLoopFuture<HTTPStatus> {
         guard let user = req.auth.get(UserModel.self) else {
             throw Abort(.unauthorized)
diff --git a/Chapter 16/myProject/Sources/App/Modules/User/UserRouter.swift b/Chapter 16/myProject/Sources/App/Modules/User/UserRouter.swift
@@ -9,33 +9,26 @@ struct UserRouter: ViperRouter {
     
     func boot(routes: RoutesBuilder, app: Application) throws {
         routes.get("sign-in", use: self.frontendController.loginView)
-        
-        routes.grouped(UserModelCredentialsAuthenticator())
-            .post("sign-in", use: self.frontendController.login)
-        
-        routes.grouped(UserModelSessionAuthenticator())
-            .get("logout", use: self.frontendController.logout)
-        
-        let publicApi = routes.grouped("api", "user")
-        let privateApi = publicApi.grouped([
-            UserTokenModel.authenticator(),
-            UserModel.guardMiddleware(),
-        ])
-
-        publicApi.grouped(UserModelCredentialsAuthenticator())
-            .post("login", use: self.apiController.login)
-
-        //...
+        routes.grouped(UserModelCredentialsAuthenticator()).post("sign-in", use: self.frontendController.login)
+        routes.grouped(UserModelSessionAuthenticator()).get("logout", use: self.frontendController.logout)
         routes.post("redirect", use: self.frontendController.signInWithApple)
-        publicApi.post("sign-in-with-apple", use: self.apiController.signInWithApple)
-        privateApi.post("devices", use: self.apiController.registerDevice)
-        
+
         let protected = routes.grouped([
             UserModelSessionAuthenticator(),
             UserModel.redirectMiddleware(path: "/")
         ])
         let user = protected.grouped("admin", "user")
         user.get("push", use: self.adminController.pushView)
         user.post("push", use: self.adminController.push)
+
+        let publicApi = routes.grouped("api", "user")
+        let privateApi = publicApi.grouped([
+            UserTokenModel.authenticator(),
+            UserModel.guardMiddleware(),
+        ])
+
+        publicApi.grouped(UserModelCredentialsAuthenticator()).post("login", use: self.apiController.login)
+        publicApi.post("sign-in-with-apple", use: self.apiController.signInWithApple)
+        privateApi.post("devices", use: self.apiController.registerDevice)
     }
 }
diff --git a/Chapter 16/myProject/Sources/App/Modules/User/Views/Admin/Push.leaf b/Chapter 16/myProject/Sources/App/Modules/User/Views/Admin/Push.leaf
@@ -4,20 +4,15 @@
             <h2>Push notification</h2>
         </div>
 
-        
-
         <form id="push-form" class="wrapper" method="post" action="/admin/user/push" enctype="multipart/form-data">
-            
             <section>
                 <label for="title">Title</label>
                 <input id="title" type="text" name="title" value="#(title)" class="field">
             </section>
-
             <section>
                 <label for="message">Message</label>
                 <input id="message" type="text" name="message" value="#(message)" class="field">
             </section>
-
             <section>
                 <label for="userId">User</label>
                 <select name="userId">
@@ -34,8 +29,6 @@
             <section>
                 #(status)
             </section>
-
         </form>
-
     #endexport
 #endextend
diff --git a/Chapter 16/myProject/Sources/App/configure.swift b/Chapter 16/myProject/Sources/App/configure.swift
@@ -18,7 +18,7 @@ public func configure(_ app: Application) throws {
             teamIdentifier: Environment.apnsTeamId
         ),
         topic: Environment.apnsTopic,
-        environment: .sandbox
+        environment: .production
     )
 
     let configuration = PostgresConfiguration(

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ extension AppDelegate: UIApplicationDelegate {`
`29`	`29`	`return .init(name: "Default Configuration",`
`30`	`30`	`sessionRole: connectingSceneSession.role)`
`31`	`31`	`}`
	`32`	`+ //...`
`32`	`33`
`33`	`34`	`func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {`
`34`	`35`	`let token = deviceToken.map { String(format: "%02.2hhx", $0) }.joined()`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ extension AccountInteractor: AccountInteractorPresenterInterface {`
`21`	`21`	`.mapError { $0 as Error }`
`22`	`22`	`.eraseToAnyPublisher()`
`23`	`23`	`}`
`24`		`-`
	`24`	`+ //...`
`25`	`25`	`func register(deviceToken: String, bearerToken: String) -> AnyPublisher<Void, Error> {`
`26`	`26`	`self.services.api.register(deviceToken: deviceToken, bearerToken: bearerToken)`
`27`	`27`	`.mapError { $0 as Error }`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ extension AccountPresenter: AccountPresenterViewInterface {`
`64`	`64`	`UserDefaults.standard.synchronize()`
`65`	`65`	`self.view.displayLogin()`
`66`	`66`	`}`
`67`		`-`
	`67`	`+ //...`
`68`	`68`	`func registerUserDevice(_ block: @escaping (() -> Void)) {`
`69`	`69`	`guard`
`70`	`70`	`let bearerToken = UserDefaults.standard.string(forKey: "user-token"),`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ final class MyProjectApiService: ApiServiceInterface {`
`80`	`80`	`}`
`81`	`81`	`.eraseToAnyPublisher()`
`82`	`82`	`}`
`83`		`-`
	`83`	`+ //...`
`84`	`84`	`func register(deviceToken: String, bearerToken: String) -> AnyPublisher<Void, HTTP.Error> {`
`85`	`85`	`struct Body: Codable {`
`86`	`86`	`let token: String`