diff --git a/src/main/api/deactivateUsers.json b/src/main/api/deactivateUsers.json index 9d0d48beb..f4f06949c 100644 --- a/src/main/api/deactivateUsers.json +++ b/src/main/api/deactivateUsers.json @@ -1,7 +1,7 @@ { "uri": "/api/user/bulk", "comments": [ - "Deactivates the users with the given ids." + "Deactivates the users with the given Ids." ], "deprecated": "This method has been renamed to {{renamedMethod}}, use that method instead.", "renamedMethod": "deactivateUsersByIds", @@ -34,4 +34,4 @@ "value": "false" } ] -} \ No newline at end of file +} diff --git a/src/main/api/deactivateUsersByIds.json b/src/main/api/deactivateUsersByIds.json index 481bb3431..ede53ffd6 100644 --- a/src/main/api/deactivateUsersByIds.json +++ b/src/main/api/deactivateUsersByIds.json @@ -1,7 +1,7 @@ { "uri": "/api/user/bulk", "comments": [ - "Deactivates the users with the given ids." + "Deactivates the users with the given Ids." ], "method": "delete", "methodName": "deactivateUsersByIds", @@ -32,4 +32,4 @@ "value": "false" } ] -} \ No newline at end of file +} diff --git a/src/main/api/deleteUsers.json b/src/main/api/deleteUsers.json index cd6e6bb4b..2e5ec17d6 100644 --- a/src/main/api/deleteUsers.json +++ b/src/main/api/deleteUsers.json @@ -1,8 +1,8 @@ { "uri": "/api/user/bulk", "comments": [ - "Deletes the users with the given ids, or users matching the provided JSON query or queryString.", - "The order of preference is ids, query and then queryString, it is recommended to only provide one of the three for the request.", + "Deletes the users with the given Ids, or users matching the provided JSON query or queryString.", + "The order of preference is Ids, query and then queryString, it is recommended to only provide one of the three for the request.", "", "This method can be used to deactivate or permanently delete (hard-delete) users based upon the hardDelete boolean in the request body.", "Using the dryRun parameter you may also request the result of the action without actually deleting or deactivating any users." @@ -23,4 +23,4 @@ "javaType": "UserDeleteRequest" } ] -} \ No newline at end of file +} diff --git a/src/main/api/deleteUsersByQuery.json b/src/main/api/deleteUsersByQuery.json index 99ba25327..5ea156475 100644 --- a/src/main/api/deleteUsersByQuery.json +++ b/src/main/api/deleteUsersByQuery.json @@ -1,8 +1,8 @@ { "uri": "/api/user/bulk", "comments": [ - "Deletes the users with the given ids, or users matching the provided JSON query or queryString.", - "The order of preference is ids, query and then queryString, it is recommended to only provide one of the three for the request.", + "Deletes the users with the given Ids, or users matching the provided JSON query or queryString.", + "The order of preference is Ids, query and then queryString, it is recommended to only provide one of the three for the request.", "", "This method can be used to deactivate or permanently delete (hard-delete) users based upon the hardDelete boolean in the request body.", "Using the dryRun parameter you may also request the result of the action without actually deleting or deactivating any users." @@ -21,4 +21,4 @@ "javaType": "UserDeleteRequest" } ] -} \ No newline at end of file +} diff --git a/src/main/api/modifyAction.json b/src/main/api/modifyAction.json index f4ecd4a15..0d835ace8 100644 --- a/src/main/api/modifyAction.json +++ b/src/main/api/modifyAction.json @@ -12,7 +12,7 @@ { "name": "actionId", "comments": [ - "The Id of the action to modify. This is technically the user action log id." + "The Id of the action to modify. This is technically the user action log Id." ], "type": "urlSegment", "javaType": "UUID" diff --git a/src/main/api/patchAPIKey.json b/src/main/api/patchAPIKey.json index c14b16082..9a3b795fa 100644 --- a/src/main/api/patchAPIKey.json +++ b/src/main/api/patchAPIKey.json @@ -1,9 +1,9 @@ { "uri": "/api/api-key", "comments": [ - "Updates an authentication API key by given id" + "Updates an API key with the given Id." ], - "method": "post", + "method": "patch", "methodName": "patchAPIKey", "successResponse": "APIKeyResponse", "errorResponse": "Errors", @@ -11,7 +11,7 @@ { "name": "keyId", "comments": [ - "The Id of the authentication key. If not provided a secure random api key will be generated." + "The Id of the API key. If not provided a secure random api key will be generated." ], "type": "urlSegment", "javaType": "UUID" @@ -19,7 +19,7 @@ { "name": "request", "comments": [ - "The request object that contains all the information needed to create the APIKey." + "The request object that contains all the information needed to create the API key." ], "type": "body", "javaType": "APIKeyRequest" diff --git a/src/main/api/removeUserFromFamily.json b/src/main/api/removeUserFromFamily.json index 945770fbd..1e43acdd0 100644 --- a/src/main/api/removeUserFromFamily.json +++ b/src/main/api/removeUserFromFamily.json @@ -1,7 +1,7 @@ { "uri": "/api/user/family", "comments": [ - "Removes a user from the family with the given id." + "Removes a user from the family with the given Id." ], "method": "delete", "methodName": "removeUserFromFamily", diff --git a/src/main/api/retrieveAPIKey.json b/src/main/api/retrieveAPIKey.json index a02db22fb..27cc6365d 100644 --- a/src/main/api/retrieveAPIKey.json +++ b/src/main/api/retrieveAPIKey.json @@ -1,7 +1,7 @@ { "uri": "/api/api-key", "comments": [ - "Retrieves an authentication API key for the given id" + "Retrieves an authentication API key for the given Id." ], "method": "get", "methodName": "retrieveAPIKey", @@ -17,4 +17,4 @@ "javaType": "UUID" } ] -} \ No newline at end of file +} diff --git a/src/main/api/retrieveApplication.json b/src/main/api/retrieveApplication.json index d30f5021c..2e6ff4e0c 100644 --- a/src/main/api/retrieveApplication.json +++ b/src/main/api/retrieveApplication.json @@ -11,7 +11,7 @@ { "name": "applicationId", "comments": [ - "(Optional) The application id." + "(Optional) The application Id." ], "type": "urlSegment", "javaType": "UUID" diff --git a/src/main/api/retrieveDailyActiveReport.json b/src/main/api/retrieveDailyActiveReport.json index 23d826d77..5efb32ae0 100644 --- a/src/main/api/retrieveDailyActiveReport.json +++ b/src/main/api/retrieveDailyActiveReport.json @@ -1,7 +1,7 @@ { "uri": "/api/report/daily-active-user", "comments": [ - "Retrieves the daily active user report between the two instants. If you specify an application id, it will only", + "Retrieves the daily active user report between the two instants. If you specify an application Id, it will only", "return the daily active counts for that application." ], "method": "get", @@ -12,7 +12,7 @@ { "name": "applicationId", "comments": [ - "(Optional) The application id." + "(Optional) The application Id." ], "type": "urlParameter", "parameterName": "applicationId", @@ -37,4 +37,4 @@ "javaType": "long" } ] -} \ No newline at end of file +} diff --git a/src/main/api/retrieveEmailTemplate.json b/src/main/api/retrieveEmailTemplate.json index f7011a1c0..29c9a2ec8 100644 --- a/src/main/api/retrieveEmailTemplate.json +++ b/src/main/api/retrieveEmailTemplate.json @@ -1,7 +1,7 @@ { "uri": "/api/email/template", "comments": [ - "Retrieves the email template for the given Id. If you don't specify the id, this will return all the email templates." + "Retrieves the email template for the given Id. If you don't specify the Id, this will return all the email templates." ], "method": "get", "methodName": "retrieveEmailTemplate", diff --git a/src/main/api/retrieveLoginReport.json b/src/main/api/retrieveLoginReport.json index 1791de858..df05f8727 100644 --- a/src/main/api/retrieveLoginReport.json +++ b/src/main/api/retrieveLoginReport.json @@ -1,7 +1,7 @@ { "uri": "/api/report/login", "comments": [ - "Retrieves the login report between the two instants. If you specify an application id, it will only return the", + "Retrieves the login report between the two instants. If you specify an application Id, it will only return the", "login counts for that application." ], "method": "get", @@ -12,7 +12,7 @@ { "name": "applicationId", "comments": [ - "(Optional) The application id." + "(Optional) The application Id." ], "type": "urlParameter", "parameterName": "applicationId", @@ -37,4 +37,4 @@ "javaType": "long" } ] -} \ No newline at end of file +} diff --git a/src/main/api/retrieveMessageTemplate.json b/src/main/api/retrieveMessageTemplate.json index d3bd9c017..4dbb6aca5 100644 --- a/src/main/api/retrieveMessageTemplate.json +++ b/src/main/api/retrieveMessageTemplate.json @@ -1,7 +1,7 @@ { "uri": "/api/message/template", "comments": [ - "Retrieves the message template for the given Id. If you don't specify the id, this will return all the message templates." + "Retrieves the message template for the given Id. If you don't specify the Id, this will return all the message templates." ], "method": "get", "methodName": "retrieveMessageTemplate", diff --git a/src/main/api/retrieveMonthlyActiveReport.json b/src/main/api/retrieveMonthlyActiveReport.json index 13a3ea54f..59c2de110 100644 --- a/src/main/api/retrieveMonthlyActiveReport.json +++ b/src/main/api/retrieveMonthlyActiveReport.json @@ -1,7 +1,7 @@ { "uri": "/api/report/monthly-active-user", "comments": [ - "Retrieves the monthly active user report between the two instants. If you specify an application id, it will only", + "Retrieves the monthly active user report between the two instants. If you specify an application Id, it will only", "return the monthly active counts for that application." ], "method": "get", @@ -12,7 +12,7 @@ { "name": "applicationId", "comments": [ - "(Optional) The application id." + "(Optional) The application Id." ], "type": "urlParameter", "parameterName": "applicationId", @@ -37,4 +37,4 @@ "javaType": "long" } ] -} \ No newline at end of file +} diff --git a/src/main/api/retrieveRegistration.json b/src/main/api/retrieveRegistration.json index 32b417d80..730626f6e 100644 --- a/src/main/api/retrieveRegistration.json +++ b/src/main/api/retrieveRegistration.json @@ -1,7 +1,7 @@ { "uri": "/api/user/registration", "comments": [ - "Retrieves the user registration for the user with the given Id and the given application id." + "Retrieves the user registration for the user with the given Id and the given application Id." ], "method": "get", "methodName": "retrieveRegistration", diff --git a/src/main/api/retrieveRegistrationReport.json b/src/main/api/retrieveRegistrationReport.json index 119f85f3f..cd7718d67 100644 --- a/src/main/api/retrieveRegistrationReport.json +++ b/src/main/api/retrieveRegistrationReport.json @@ -1,7 +1,7 @@ { "uri": "/api/report/registration", "comments": [ - "Retrieves the registration report between the two instants. If you specify an application id, it will only return", + "Retrieves the registration report between the two instants. If you specify an application Id, it will only return", "the registration counts for that application." ], "method": "get", @@ -12,7 +12,7 @@ { "name": "applicationId", "comments": [ - "(Optional) The application id." + "(Optional) The application Id." ], "type": "urlParameter", "parameterName": "applicationId", @@ -37,4 +37,4 @@ "javaType": "long" } ] -} \ No newline at end of file +} diff --git a/src/main/api/retrieveUserAction.json b/src/main/api/retrieveUserAction.json index 4db9b1475..da88331ad 100644 --- a/src/main/api/retrieveUserAction.json +++ b/src/main/api/retrieveUserAction.json @@ -1,7 +1,7 @@ { "uri": "/api/user-action", "comments": [ - "Retrieves the user action for the given Id. If you pass in null for the id, this will return all the user", + "Retrieves the user action for the given Id. If you pass in null for the Id, this will return all the user", "actions." ], "method": "get", diff --git a/src/main/api/retrieveUserActionReason.json b/src/main/api/retrieveUserActionReason.json index 5a2d334fc..8f3992521 100644 --- a/src/main/api/retrieveUserActionReason.json +++ b/src/main/api/retrieveUserActionReason.json @@ -1,7 +1,7 @@ { "uri": "/api/user-action-reason", "comments": [ - "Retrieves the user action reason for the given Id. If you pass in null for the id, this will return all the user", + "Retrieves the user action reason for the given Id. If you pass in null for the Id, this will return all the user", "action reasons." ], "method": "get", diff --git a/src/main/api/retrieveUserCode.json b/src/main/api/retrieveUserCode.json index 5a518d0be..7fdf7e8b6 100644 --- a/src/main/api/retrieveUserCode.json +++ b/src/main/api/retrieveUserCode.json @@ -14,7 +14,7 @@ { "name": "client_id", "comments": [ - "The client id." + "The client Id." ], "type": "form", "parameterName": "client_id", @@ -23,7 +23,7 @@ { "name": "client_secret", "comments": [ - "The client id." + "The client Id." ], "type": "form", "parameterName": "client_secret", diff --git a/src/main/api/retrieveUserLoginReport.json b/src/main/api/retrieveUserLoginReport.json index 4b1bfd48d..a4e9844ea 100644 --- a/src/main/api/retrieveUserLoginReport.json +++ b/src/main/api/retrieveUserLoginReport.json @@ -1,7 +1,7 @@ { "uri": "/api/report/login", "comments": [ - "Retrieves the login report between the two instants for a particular user by Id. If you specify an application id, it will only return the", + "Retrieves the login report between the two instants for a particular user by Id. If you specify an application Id, it will only return the", "login counts for that application." ], "method": "get", @@ -12,7 +12,7 @@ { "name": "applicationId", "comments": [ - "(Optional) The application id." + "(Optional) The application Id." ], "type": "urlParameter", "parameterName": "applicationId", @@ -21,7 +21,7 @@ { "name": "userId", "comments": [ - "The userId id." + "The userId Id." ], "type": "urlParameter", "parameterName": "userId", @@ -46,4 +46,4 @@ "javaType": "long" } ] -} \ No newline at end of file +} diff --git a/src/main/api/retrieveUserLoginReportByLoginId.json b/src/main/api/retrieveUserLoginReportByLoginId.json index 7adfc5ad8..8a4377e9d 100644 --- a/src/main/api/retrieveUserLoginReportByLoginId.json +++ b/src/main/api/retrieveUserLoginReportByLoginId.json @@ -1,7 +1,7 @@ { "uri": "/api/report/login", "comments": [ - "Retrieves the login report between the two instants for a particular user by login Id. If you specify an application id, it will only return the", + "Retrieves the login report between the two instants for a particular user by login Id. If you specify an application Id, it will only return the", "login counts for that application." ], "method": "get", @@ -12,7 +12,7 @@ { "name": "applicationId", "comments": [ - "(Optional) The application id." + "(Optional) The application Id." ], "type": "urlParameter", "parameterName": "applicationId", @@ -21,7 +21,7 @@ { "name": "loginId", "comments": [ - "The userId id." + "The userId Id." ], "type": "urlParameter", "parameterName": "loginId", @@ -46,4 +46,4 @@ "javaType": "long" } ] -} \ No newline at end of file +} diff --git a/src/main/api/retrieveWebhook.json b/src/main/api/retrieveWebhook.json index 359ba2bec..265136be7 100644 --- a/src/main/api/retrieveWebhook.json +++ b/src/main/api/retrieveWebhook.json @@ -1,7 +1,7 @@ { "uri": "/api/webhook", "comments": [ - "Retrieves the webhook for the given Id. If you pass in null for the id, this will return all the webhooks." + "Retrieves the webhook for the given Id. If you pass in null for the Id, this will return all the webhooks." ], "method": "get", "methodName": "retrieveWebhook", @@ -17,4 +17,4 @@ "javaType": "UUID" } ] -} \ No newline at end of file +} diff --git a/src/main/api/searchEntitiesByIds.json b/src/main/api/searchEntitiesByIds.json index 3ded4b668..428e124ab 100644 --- a/src/main/api/searchEntitiesByIds.json +++ b/src/main/api/searchEntitiesByIds.json @@ -1,7 +1,7 @@ { "uri": "/api/entity/search", "comments": [ - "Retrieves the entities for the given ids. If any Id is invalid, it is ignored." + "Retrieves the entities for the given Ids. If any Id is invalid, it is ignored." ], "method": "get", "methodName": "searchEntitiesByIds", diff --git a/src/main/api/searchUsers.json b/src/main/api/searchUsers.json index b4edb2298..fe029f0bf 100644 --- a/src/main/api/searchUsers.json +++ b/src/main/api/searchUsers.json @@ -1,7 +1,7 @@ { "uri": "/api/user/search", "comments": [ - "Retrieves the users for the given ids. If any Id is invalid, it is ignored." + "Retrieves the users for the given Ids. If any Id is invalid, it is ignored." ], "deprecated": "This method has been renamed to {{renamedMethod}}, use that method instead.", "renamedMethod": "searchUsersByIds", diff --git a/src/main/api/searchUsersByIds.json b/src/main/api/searchUsersByIds.json index 99f899cc9..fd60478ff 100644 --- a/src/main/api/searchUsersByIds.json +++ b/src/main/api/searchUsersByIds.json @@ -1,7 +1,7 @@ { "uri": "/api/user/search", "comments": [ - "Retrieves the users for the given ids. If any Id is invalid, it is ignored." + "Retrieves the users for the given Ids. If any Id is invalid, it is ignored." ], "method": "get", "methodName": "searchUsersByIds", @@ -11,7 +11,7 @@ { "name": "ids", "comments": [ - "The user ids to search for." + "The user Ids to search for." ], "type": "urlParameter", "parameterName": "ids", diff --git a/src/main/api/sendEmail.json b/src/main/api/sendEmail.json index fc3a15a21..9c8da1e89 100644 --- a/src/main/api/sendEmail.json +++ b/src/main/api/sendEmail.json @@ -1,7 +1,7 @@ { "uri": "/api/email/send", "comments": [ - "Send an email using an email template id. You can optionally provide requestData to access key value", + "Send an email using an email template Id. You can optionally provide requestData to access key value", "pairs in the email template." ], "method": "post", diff --git a/src/main/api/updateAPIKey.json b/src/main/api/updateAPIKey.json index f283a85d0..bd87175b8 100644 --- a/src/main/api/updateAPIKey.json +++ b/src/main/api/updateAPIKey.json @@ -1,7 +1,7 @@ { "uri": "/api/api-key", "comments": [ - "Updates an API key by given id" + "Updates an API key with the given Id." ], "method": "put", "methodName": "updateAPIKey", @@ -9,7 +9,7 @@ "errorResponse": "Errors", "params": [ { - "name": "apiKeyId", + "name": "keyId", "comments": [ "The Id of the API key to update." ], @@ -19,10 +19,10 @@ { "name": "request", "comments": [ - "The request object that contains all the information used to create the API Key." + "The request that contains all the new API key information." ], "type": "body", "javaType": "APIKeyRequest" } ] -} \ No newline at end of file +} diff --git a/src/main/api/validateDevice.json b/src/main/api/validateDevice.json index 1f1b1c431..f47c7a612 100644 --- a/src/main/api/validateDevice.json +++ b/src/main/api/validateDevice.json @@ -22,7 +22,7 @@ { "name": "client_id", "comments": [ - "The client id." + "The client Id." ], "type": "urlParameter", "parameterName": "client_id", diff --git a/src/main/client/android.client.ftl b/src/main/client/android.client.ftl index 116227679..cead584ae 100644 --- a/src/main/client/android.client.ftl +++ b/src/main/client/android.client.ftl @@ -1,6 +1,6 @@ [#import "_macros.ftl" as global/] /* - * Copyright (c) 2018-2023, FusionAuth, All Rights Reserved + * Copyright (c) 2018-${.now?string('yyyy')}, FusionAuth, All Rights Reserved * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/client/angular.client.ftl b/src/main/client/angular.client.ftl index 433d8e477..d658a3e92 100644 --- a/src/main/client/angular.client.ftl +++ b/src/main/client/angular.client.ftl @@ -1,7 +1,7 @@ [#--noinspection ALL--] [#import "_macros.ftl" as global/] /* -* Copyright (c) 2018-2023, FusionAuth, All Rights Reserved +* Copyright (c) 2018-${.now?string('yyyy')}, FusionAuth, All Rights Reserved * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/client/csharp.client.ftl b/src/main/client/csharp.client.ftl index 642925561..18f7c9b66 100644 --- a/src/main/client/csharp.client.ftl +++ b/src/main/client/csharp.client.ftl @@ -1,6 +1,6 @@ [#import "_macros.ftl" as global/] /* - * Copyright (c) 2018-2023, FusionAuth, All Rights Reserved + * Copyright (c) 2018-${.now?string('yyyy')}, FusionAuth, All Rights Reserved * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/client/go.client.ftl b/src/main/client/go.client.ftl index b417bf3bf..1ce43cd5f 100644 --- a/src/main/client/go.client.ftl +++ b/src/main/client/go.client.ftl @@ -1,6 +1,6 @@ [#import "_macros.ftl" as global/] /* -* Copyright (c) 2019-2023, FusionAuth, All Rights Reserved +* Copyright (c) 2019-${.now?string('yyyy')}, FusionAuth, All Rights Reserved * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/client/go.domain.ftl b/src/main/client/go.domain.ftl index a693a22a6..a6d03b12c 100644 --- a/src/main/client/go.domain.ftl +++ b/src/main/client/go.domain.ftl @@ -1,7 +1,7 @@ [#-- @ftlvariable name="packages" type="String[]" --] [#-- @ftlvariable name="types_in_use" type="String[]" --] /* -* Copyright (c) 2019-2023, FusionAuth, All Rights Reserved +* Copyright (c) 2019-${.now?string('yyyy')}, FusionAuth, All Rights Reserved * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/client/go.domain.test.ftl b/src/main/client/go.domain.test.ftl index 81dfb0dcb..dc9568d17 100644 --- a/src/main/client/go.domain.test.ftl +++ b/src/main/client/go.domain.test.ftl @@ -1,5 +1,5 @@ /* -* Copyright (c) 2019-2023, FusionAuth, All Rights Reserved +* Copyright (c) 2019-${.now?string('yyyy')}, FusionAuth, All Rights Reserved * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/client/java.client.ftl b/src/main/client/java.client.ftl index d41fb70f4..da6ca18fc 100644 --- a/src/main/client/java.client.ftl +++ b/src/main/client/java.client.ftl @@ -1,6 +1,6 @@ [#import "_macros.ftl" as global/] /* - * Copyright (c) 2018-2023, FusionAuth, All Rights Reserved + * Copyright (c) 2018-${.now?string('yyyy')}, FusionAuth, All Rights Reserved * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/client/java.domain.ftl b/src/main/client/java.domain.ftl index 1815afec7..82451eb82 100644 --- a/src/main/client/java.domain.ftl +++ b/src/main/client/java.domain.ftl @@ -2,7 +2,7 @@ [#-- @ftlvariable name="packages" type="String[]" --] [#-- @ftlvariable name="types_in_use" type="String[]" --] /* - * Copyright (c) 2018-2023, FusionAuth, All Rights Reserved + * Copyright (c) 2018-${.now?string('yyyy')}, FusionAuth, All Rights Reserved * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -100,4 +100,4 @@ public enum ${domain_item.type} { [#lt][#sep], [/#sep] [/#list] } -[/#if] \ No newline at end of file +[/#if] diff --git a/src/main/client/java.domainNG.ftl b/src/main/client/java.domainNG.ftl index b69e1e096..f20bad22b 100644 --- a/src/main/client/java.domainNG.ftl +++ b/src/main/client/java.domainNG.ftl @@ -2,7 +2,7 @@ [#-- @ftlvariable name="packages" type="String[]" --] [#-- @ftlvariable name="types_in_use" type="String[]" --] /* - * Copyright (c) 2018-2023, FusionAuth, All Rights Reserved + * Copyright (c) 2018-${.now?string('yyyy')}, FusionAuth, All Rights Reserved * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -96,4 +96,4 @@ public enum ${domain_item.type} { [#lt][#sep], [/#sep] [/#list] } -[/#if] \ No newline at end of file +[/#if] diff --git a/src/main/client/netcore.client.ftl b/src/main/client/netcore.client.ftl index a112d05a3..0f616915e 100644 --- a/src/main/client/netcore.client.ftl +++ b/src/main/client/netcore.client.ftl @@ -1,6 +1,6 @@ [#import "_macros.ftl" as global/] /* - * Copyright (c) 2018-2023, FusionAuth, All Rights Reserved + * Copyright (c) 2018-${.now?string('yyyy')}, FusionAuth, All Rights Reserved * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/client/netcore.client.interface.ftl b/src/main/client/netcore.client.interface.ftl index 92bc98b16..a9493c7e3 100644 --- a/src/main/client/netcore.client.interface.ftl +++ b/src/main/client/netcore.client.interface.ftl @@ -1,6 +1,6 @@ [#import "_macros.ftl" as global/] /* - * Copyright (c) 2020-2023, FusionAuth, All Rights Reserved + * Copyright (c) 2020-${.now?string('yyyy')}, FusionAuth, All Rights Reserved * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/client/netcore.client.sync.ftl b/src/main/client/netcore.client.sync.ftl index 06c95e6fa..a0b73edfa 100644 --- a/src/main/client/netcore.client.sync.ftl +++ b/src/main/client/netcore.client.sync.ftl @@ -16,7 +16,7 @@ [#return result?join(", ")/] [/#function] /* - * Copyright (c) 2020-2023, FusionAuth, All Rights Reserved + * Copyright (c) 2020-${.now?string('yyyy')}, FusionAuth, All Rights Reserved * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/client/netcore.domain.ftl b/src/main/client/netcore.domain.ftl index fc5d7f89f..60a456a4a 100644 --- a/src/main/client/netcore.domain.ftl +++ b/src/main/client/netcore.domain.ftl @@ -1,7 +1,7 @@ [#-- @ftlvariable name="packages" type="String[]" --] [#-- @ftlvariable name="types_in_use" type="String[]" --] /* - * Copyright (c) 2018-2023, FusionAuth, All Rights Reserved + * Copyright (c) 2018-${.now?string('yyyy')}, FusionAuth, All Rights Reserved * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/client/php.client.ftl b/src/main/client/php.client.ftl index d65f56c0d..65293e5e2 100644 --- a/src/main/client/php.client.ftl +++ b/src/main/client/php.client.ftl @@ -14,7 +14,7 @@ namespace FusionAuth; /* - * Copyright (c) 2018-2023, FusionAuth, All Rights Reserved + * Copyright (c) 2018-${.now?string('yyyy')}, FusionAuth, All Rights Reserved * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -151,4 +151,4 @@ class FusionAuthClient ->successResponseHandler(new JSONResponseHandler()) ->errorResponseHandler(new JSONResponseHandler()); } -} \ No newline at end of file +} diff --git a/src/main/client/python.client.ftl b/src/main/client/python.client.ftl index 6b42fb815..82b23c563 100644 --- a/src/main/client/python.client.ftl +++ b/src/main/client/python.client.ftl @@ -1,6 +1,6 @@ [#import "_macros.ftl" as global/] # -# Copyright (c) 2018-2023, FusionAuth, All Rights Reserved +# Copyright (c) 2018-${.now?string('yyyy')}, FusionAuth, All Rights Reserved # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/main/client/ruby.client.ftl b/src/main/client/ruby.client.ftl index 375dbd7ce..626bed3bb 100644 --- a/src/main/client/ruby.client.ftl +++ b/src/main/client/ruby.client.ftl @@ -3,7 +3,7 @@ require 'ostruct' require 'fusionauth/rest_client' # -# Copyright (c) 2018-2023, FusionAuth, All Rights Reserved +# Copyright (c) 2018-${.now?string('yyyy')}, FusionAuth, All Rights Reserved # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/main/client/typescript.client.ftl b/src/main/client/typescript.client.ftl index b76bf8231..04896b94d 100644 --- a/src/main/client/typescript.client.ftl +++ b/src/main/client/typescript.client.ftl @@ -1,7 +1,7 @@ [#--noinspection ALL--] [#import "_macros.ftl" as global/] /* -* Copyright (c) 2019-2023, FusionAuth, All Rights Reserved +* Copyright (c) 2019-${.now?string('yyyy')}, FusionAuth, All Rights Reserved * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/domainNG/io.fusionauth.domain.APIKey.json b/src/main/domainNG/io.fusionauth.domain.APIKey.json index e8228289b..891f89559 100644 --- a/src/main/domainNG/io.fusionauth.domain.APIKey.json +++ b/src/main/domainNG/io.fusionauth.domain.APIKey.json @@ -36,10 +36,17 @@ "className" : "io.fusionauth.domain.APIKey$APIKeyMetaData", "type" : "APIKey$APIKeyMetaData" }, + "name" : { + "className" : "java.lang.String", + "type" : "String" + }, "permissions" : { "className" : "io.fusionauth.domain.APIKey$APIKeyPermissions", "type" : "APIKey$APIKeyPermissions" }, + "retrievable" : { + "type" : "boolean" + }, "tenantId" : { "className" : "java.util.UUID", "type" : "UUID" diff --git a/src/main/domainNG/io.fusionauth.domain.TenantSSOConfiguration.json b/src/main/domainNG/io.fusionauth.domain.TenantSSOConfiguration.json index 52e8889a1..afeaf7cf0 100644 --- a/src/main/domainNG/io.fusionauth.domain.TenantSSOConfiguration.json +++ b/src/main/domainNG/io.fusionauth.domain.TenantSSOConfiguration.json @@ -2,6 +2,9 @@ "className" : "io.fusionauth.domain.TenantSSOConfiguration", "extends" : { }, "fields" : { + "allowAccessTokenBootstrap" : { + "type" : "boolean" + }, "deviceTrustTimeToLiveInSeconds" : { "type" : "int" }