public
/
manageable-users
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 7 Wiki Activity

Compare commits

base: public:main
Branches Tags
public:main
public:1.3.1
public:1.3.0
public:1.2.0
public:1.1.1
public:1.1.0
public:1.0.1
public:1.0.0
..
compare: public:1.3.0
Branches Tags
public:main
public:1.3.1
public:1.3.0
public:1.2.0
public:1.1.1
public:1.1.0
public:1.0.1
public:1.0.0

No commits in common. "main" and "1.3.0" have entirely different histories.
main ... 1.3.0

4 changed files with 6 additions and 16 deletions
Show Stats Expand all files Collapse all files

6
Resources/Views/email/invite.leaf
View File

@ -1,5 +1,3 @@
Welcome to #(host). Välkommen till #(host).
To activate your account, go to #baseURL/auth/password/#(token) and enter a password. För att aktivera ditt konto, gå till #baseURL/auth/password/#(token) och skriv in ett lösenord.
The link is valid until #date(expiration, "yyyy-MM-dd HH:mm (z)").

6
Resources/Views/email/reset.leaf
View File

@ -1,5 +1,3 @@
You have requested a new password on #(host). Du har begärt ett nytt lösenord på #(host).
To change your password, go to #baseURL/auth/password/#(token) and enter a password. För att ändra ditt lösenord, gå till #baseURL/auth/password/#(token) och skriv in ett lösenord.
The link is valid until #date(expiration, "yyyy-MM-dd HH:mm (z)").

2
Sources/ManageableUsers/Controllers/AdminController.swift
View File

@ -88,7 +88,7 @@ public struct AdminController<User: ManagedUser>: Sendable where User.SessionID
let token = try await UserToken.create (connection: connection).token let token = try await UserToken.create (connection: connection).token
try await User.create (email: invitation.email, fullname: invitation.fullname, roles: invitation.roles, token: token, on: connection) try await User.create (email: invitation.email, fullname: invitation.fullname, roles: invitation.roles, token: token, on: connection)
let host = try Environment.baseURL.host() ?? "" let host = try Environment.baseURL.host() ?? ""
let body = try await request.view.render ("email/invite", AuthenticationController<User>.TokenEmailContext (token: token, host: host, expiration: Calendar.current.date (byAdding: .day, value: 1, to: Date()) ?? Date())) let body = try await request.view.render ("email/invite", ["token": token, "host": host])
.data .data
let message = Email (sender: Email.Contact (emailAddress: try Environment.emailSender), let message = Email (sender: Email.Contact (emailAddress: try Environment.emailSender),
recipients: [Email.Contact(emailAddress: invitation.email)], recipients: [Email.Contact(emailAddress: invitation.email)],

8
Sources/ManageableUsers/Controllers/AuthenticationController.swift
View File

@ -91,12 +91,6 @@ public struct AuthenticationController<User: ManagedUser>: Sendable where User.S
let email: String let email: String
} }
struct TokenEmailContext: Encodable {
let token: String
let host: String
let expiration: Date
}
func forgotPassword (request: Request) async throws -> Response { func forgotPassword (request: Request) async throws -> Response {
let input = try request.content.decode (Input.self) let input = try request.content.decode (Input.self)
@ -107,7 +101,7 @@ public struct AuthenticationController<User: ManagedUser>: Sendable where User.S
let token = try await UserToken.create (connection: connection).token let token = try await UserToken.create (connection: connection).token
try await User.store (token: token, userId: user.id, on: connection) try await User.store (token: token, userId: user.id, on: connection)
let host = try Environment.baseURL.host() ?? "" let host = try Environment.baseURL.host() ?? ""
let body = try await request.view.render ("email/reset", TokenEmailContext (token: token, host: host, expiration: Calendar.current.date (byAdding: .hour, value: 1, to: Date()) ?? Date())) let body = try await request.view.render ("email/reset", ["token": token, "host": host, "section": "login"])
.data .data
let message = Email (sender: Email.Contact (emailAddress: try Environment.emailSender), let message = Email (sender: Email.Contact (emailAddress: try Environment.emailSender),
recipients: [Email.Contact(emailAddress: input.email)], recipients: [Email.Contact(emailAddress: input.email)],