Uwe Schuster
9040a9ec48
Lifts the auth-essential users table from fewo-webapp into oatpp-authkit in temporal form per Option B from the issue body. The previous shape (id INTEGER autoinc + is_active flag) is replaced with the entity_id + valid_from/valid_until triple; soft-delete via valid_until = now() instead of toggling is_active. New files (all in oatpp-authkit): - dto/UserDto.hpp — auth-essential columns only: id, entity_id, username, password_hash, role, tls_cert_dn, valid_from, valid_until. Registered as temporal so TemporalRepository composes cleanly. Application- specific columns (email, profile data) belong on a consumer-side DTO + parallel SchemaContract that contributes additional columns to the same users table. - db/UserDb.hpp — DbClient with login-path queries (findLiveByUsername, findLiveByTlsCertDn) plus generic CRUD. UserSchema declares the schema: TEXT id, entity_id, username, password_hash, role, tls_cert_dn, with natural-key UNIQUE on (username, valid_until) so no two live rows can share a username while historical rows for the same username are allowed. - repo/ConcreteUserRepository.hpp — Repository<UserDto> adapter + makeUserRepository factory wrapping in TemporalRepository. - test/test_user_schema.cpp — verifies SchemaBuilder<UserSchema, TemporalRepository<UserDto>>::create produces the expected 5 DDL statements; specifically asserts is_active and created_at are NOT present in the temporal shape (Option B replacement). 13 of 13 tests pass. Bumped 0.11.0 → 0.12.0. Per owner directive on authkit#14: password_hash rides the temporal row. A separate security follow-up issue tracks the redaction policy for historical password hashes (likely blank the hash but keep the row so change-history is auditable). The migration of an existing non-temporal users table to this shape is documented in db/UserDb.hpp: Atlas-generated migration handles the structural conversion + backfill (each existing row becomes its own entity with entity_id = CAST(id AS TEXT)). Sessions/certificates FKs that referenced users.id (INTEGER) need rewiring to reference users.entity_id — that's a consumer-side rewire, separate PR. Closes #14 — the four migration sub-PRs (PR 1 role_templates, PRs 2+3 permissions, PR 4 users) are now landed; the umbrella issue can close. Follow-ups (security hash redaction, fewo-webapp consumer migration, Atlas CI integration) get their own issues. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
72 lines
2.4 KiB
C++
72 lines
2.4 KiB
C++
#ifndef OATPP_AUTHKIT_REPO_CONCRETE_USER_REPOSITORY_HPP
|
|
#define OATPP_AUTHKIT_REPO_CONCRETE_USER_REPOSITORY_HPP
|
|
|
|
// Concrete inner adapter of `Repository<UserDto>` (authkit#14 PR 4).
|
|
// Stacks under TemporalRepository<UserDto> via `makeUserRepository`.
|
|
|
|
#include "oatpp-authkit/db/UserDb.hpp"
|
|
#include "oatpp-authkit/dto/UserDto.hpp"
|
|
#include "oatpp-authkit/repo/Repository.hpp"
|
|
#include "oatpp-authkit/repo/SchemaContract.hpp"
|
|
#include "oatpp-authkit/repo/TemporalRepository.hpp"
|
|
|
|
#include "oatpp/core/Types.hpp"
|
|
|
|
#include <memory>
|
|
|
|
namespace oatpp_authkit::repo {
|
|
|
|
/**
|
|
* @brief Inner adapter of `Repository<UserDto>`, delegating to `db::UserDb`.
|
|
*
|
|
* Empty schema — `db::UserSchema` owns the table declaration.
|
|
*/
|
|
class ConcreteUserRepository : public Repository<dto::UserDto> {
|
|
public:
|
|
inline static constexpr DecoratorSchema kSchema = {
|
|
"ConcreteUserRepository",
|
|
nullptr, 0, nullptr, 0, nullptr, 0,
|
|
};
|
|
|
|
explicit ConcreteUserRepository(std::shared_ptr<db::UserDb> udb)
|
|
: m_db(std::move(udb)) {}
|
|
|
|
oatpp::Object<dto::UserDto> findByEntityId(const oatpp::String& entityId) override {
|
|
auto res = m_db->findUserByEntityId(entityId);
|
|
if (!res || !res->isSuccess()) return nullptr;
|
|
auto rows = res->template fetch<oatpp::Vector<oatpp::Object<dto::UserDto>>>();
|
|
if (!rows || rows->empty()) return nullptr;
|
|
return (*rows)[0];
|
|
}
|
|
|
|
oatpp::Vector<oatpp::Object<dto::UserDto>> list() override {
|
|
auto res = m_db->getAllUsersRaw();
|
|
auto out = oatpp::Vector<oatpp::Object<dto::UserDto>>::createShared();
|
|
if (!res || !res->isSuccess()) return out;
|
|
auto fetched = res->template fetch<oatpp::Vector<oatpp::Object<dto::UserDto>>>();
|
|
if (!fetched) return out;
|
|
for (auto& row : *fetched) if (row) out->push_back(row);
|
|
return out;
|
|
}
|
|
|
|
void save(const oatpp::Object<dto::UserDto>& d) override {
|
|
m_db->upsertUserById(d);
|
|
}
|
|
|
|
void softDelete(const oatpp::String& entityId) override {
|
|
m_db->softDeleteUser(entityId);
|
|
}
|
|
|
|
private:
|
|
std::shared_ptr<db::UserDb> m_db;
|
|
};
|
|
|
|
inline std::shared_ptr<Repository<dto::UserDto>>
|
|
makeUserRepository(std::shared_ptr<db::UserDb> udb) {
|
|
auto concrete = std::make_shared<ConcreteUserRepository>(std::move(udb));
|
|
return std::make_shared<TemporalRepository<dto::UserDto>>(concrete);
|
|
}
|
|
|
|
} // namespace oatpp_authkit::repo
|
|
|
|
#endif
|