Fix Provider.authorizers

Author: Andrea-Scuderi

Sources/SLSAdapter/Function+Extensions.swift

@@ -21,6 +21,34 @@ public extension YAMLContent {
         let layerInternalName =  layerName.prefix(1).capitalized + layerName.dropFirst(1).replacingOccurrences(of: "-", with: "Dash").appending("LambdaLayer")
         return try YAMLContent(with: [["Ref": layerInternalName]])
     }
+    
+    static func buildJWTAuthorizer(identitySource: String = "$request.header.Authorization",
+                                   issuerUrl: String,
+                                   audience: [String]) -> YAMLContent {
+        return .dictionary(
+            ["type": .string("jwt"),
+             "identitySource": .string(identitySource),
+             "issuerUrl": .string(issuerUrl),
+             "audience": .array(audience.compactMap { .string($0)} )])
+    }
+    
+    static func buildCustomAuthorizer(name: String,
+                                      type: String = "request",
+                                      functionName: String,
+                                      payloadVersion: String = "2.0",
+                                      identitySource: [String],
+                                      resultTtlInSeconds: Int = 0,
+                                      enableSimpleResponses: Bool = true) -> YAMLContent {
+        return .dictionary(
+            ["name": .string(name),
+             "type": .string(type),
+             "functionName": .string(functionName),
+             "payloadVersion": .string(payloadVersion),
+             "identitySource": .array(identitySource.compactMap { .string($0) }),
+             "resultTtlInSeconds": .string("\(resultTtlInSeconds)"),
+             "enableSimpleResponses": .string("\(enableSimpleResponses)")
+            ])
+    }
 }
 
 public extension Function {

Sources/SLSAdapter/Provider.swift

@@ -315,7 +315,7 @@ extension Provider {
             disableDefaultEndpoint: Bool? = nil,
             metrics: Bool? = nil,
             cors: Bool?,
-            authorizers: Provider.Authorizers? = nil
+            authorizers: YAMLContent? = nil
         ) {
             self.id = id
             self.name = name
@@ -347,23 +347,7 @@ extension Provider {
         public let cors: Bool?
 
         /// Authorizers
-        public let authorizers: Authorizers?
-    }
-
-    /// Authorizers
-    public struct Authorizers: Codable, Equatable {
-        /// JWT API authorizer
-        public let someJwtAuthorizer: JwtAuthorizer?
-
-        /// CustomLambdaAuthorizer
-        let someCustomLambdaAuthorizer: YAMLContent?
-    }
-
-    /// JwtAuthorizer
-    public struct JwtAuthorizer: Codable, Equatable {
-        public let identitySource: String
-        public let issuerUrl: String
-        public let audience: [String]
+        public let authorizers: YAMLContent?
     }
 }
 

Tests/SLSAdapterTests/Fixtures/serverless_no_layer.yml

@@ -15,6 +15,23 @@ provider:
     httpApi:
         payload: '2.0'
         cors: true
+        authorizers:
+            JWTAuthorizer:
+                type: jwt
+                identitySource: $request.header.Authorization
+                issuerUrl: "https://appleid.apple.com"
+                audience:
+                    - com.mydomain.myhost
+            customAuthorizer:
+                name: "LambdaAuthorizer"
+                type: request
+                functionName: lambdaAuthorizer
+                payloadVersion: '2.0'
+                identitySource:
+                    - $request.header.SEC-X-API-KEY
+                    - $request.header.User-Agent
+                resultTtlInSeconds: 0
+                enableSimpleResponses: true
     # Use provided.al2 if you build with M1, provided if you build with x86_64
     runtime: provided.al2
     # Use arm64 if you build with M1, or x86_64 if you build with intel

Tests/SLSAdapterTests/ServerlessConfig+Exensions.swift

@@ -149,7 +149,19 @@ extension ServerlessConfig {
                 runtime: runtime,
                 environment: environment,
                 architecture: architecture,
-                httpAPI: .init(payload: "2.0", cors: true),
+                httpAPI: .init(
+                    payload: "2.0",
+                    cors: true,
+                    authorizers:
+                        .dictionary([
+                            "JWTAuthorizer": .buildJWTAuthorizer(issuerUrl: "https://appleid.apple.com",
+                                                                                audience: ["com.mydomain.myhost"]),
+                            "customAuthorizer": .buildCustomAuthorizer(name: "LambdaAuthorizer",
+                                                                       functionName: "lambdaAuthorizer",
+                                                                       identitySource: ["$request.header.SEC-X-API-KEY",
+                                                                                        "$request.header.User-Agent"])
+                        ])
+                ),
                 iam: iam
             )
             let custom = try YAMLContent(with: ["tableName": "\(dynamoDBTableNamePrefix)-table-${sls:stage}",