-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Partial Migration of CN account system
- Loading branch information
Showing
17 changed files
with
210 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 50 additions & 0 deletions
50
foundation-common/src/main/kotlin/com/xpdustry/foundation/common/database/model/Account.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| /* | ||
| * Foundation, the software collection powering the Xpdustry network. | ||
| * Copyright (C) 2023 Xpdustry | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
| package com.xpdustry.foundation.common.database.model | ||
|
|
||
| import com.xpdustry.foundation.common.database.Entity | ||
| import com.xpdustry.foundation.common.hash.HashWithParams | ||
| import org.bson.types.ObjectId | ||
|
|
||
| // This structure stores the users bound to an account. | ||
| // The HashWithParams is the hashed usid (NOTE: It is nullable because the previous database did not it) | ||
| typealias BoundUsers = MutableMap<MindustryUUID, HashWithParams?> | ||
|
|
||
| data class Account( | ||
| override val id: ObjectId, | ||
| var username: String, | ||
| var password: HashWithParams, | ||
| var rank: Rank = Rank.NEWBIE, | ||
| var steam: String? = null, | ||
| var discord: String? = null, | ||
| val users: BoundUsers = mutableMapOf(), | ||
| ) : Entity<ObjectId> { | ||
| val verified: Boolean | ||
| get() = steam != null || discord != null | ||
|
|
||
| enum class Rank { | ||
| NEWBIE, | ||
| ACTIVE, | ||
| HYPER_ACTIVE, | ||
| CONTRIBUTOR, | ||
| OVERSEER, | ||
| MODERATOR, | ||
| ADMINISTRATOR, | ||
| OWNER, | ||
| } | ||
| } |
23 changes: 23 additions & 0 deletions
23
...on-common/src/main/kotlin/com/xpdustry/foundation/common/database/model/AccountManager.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| /* | ||
| * Foundation, the software collection powering the Xpdustry network. | ||
| * Copyright (C) 2023 Xpdustry | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
| package com.xpdustry.foundation.common.database.model | ||
|
|
||
| import com.xpdustry.foundation.common.database.EntityManager | ||
| import org.bson.types.ObjectId | ||
|
|
||
| interface AccountManager : EntityManager<ObjectId, Account> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
...mmon/src/main/kotlin/com/xpdustry/foundation/common/database/mongo/MongoAccountManager.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| /* | ||
| * Foundation, the software collection powering the Xpdustry network. | ||
| * Copyright (C) 2023 Xpdustry | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
| package com.xpdustry.foundation.common.database.mongo | ||
|
|
||
| import com.mongodb.reactivestreams.client.MongoCollection | ||
| import com.xpdustry.foundation.common.database.model.Account | ||
| import com.xpdustry.foundation.common.database.model.AccountManager | ||
| import org.bson.types.ObjectId | ||
|
|
||
| class MongoAccountManager( | ||
| collection: MongoCollection<Account>, | ||
| ) : MongoEntityManager<Account, ObjectId>(collection), AccountManager |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 21 additions & 0 deletions
21
foundation-common/src/main/kotlin/com/xpdustry/foundation/common/hash/HashWithParams.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| /* | ||
| * Foundation, the software collection powering the Xpdustry network. | ||
| * Copyright (C) 2023 Xpdustry | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
| package com.xpdustry.foundation.common.hash | ||
|
|
||
| // TODO: Write mongo codec for that | ||
| data class HashWithParams(val hash: Hash, val params: HashParams) |
32 changes: 32 additions & 0 deletions
32
...try-core/src/main/kotlin/com/xpdustry/foundation/mindustry/core/account/AccountCommand.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| /* | ||
| * Foundation, the software collection powering the Xpdustry network. | ||
| * Copyright (C) 2023 Xpdustry | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
| package com.xpdustry.foundation.mindustry.core.account | ||
|
|
||
| import com.google.inject.Inject | ||
| import com.xpdustry.foundation.common.application.FoundationListener | ||
| import com.xpdustry.foundation.common.database.Database | ||
| import com.xpdustry.foundation.mindustry.core.command.FoundationPluginCommandManager | ||
| import jakarta.inject.Named | ||
|
|
||
| class AccountCommand @Inject constructor( | ||
| private val database: Database, | ||
| @param:Named("client") private val clientCommandManager: FoundationPluginCommandManager, | ||
| ) : FoundationListener { | ||
| override fun onFoundationInit() { | ||
| } | ||
| } |
26 changes: 26 additions & 0 deletions
26
...try-core/src/main/kotlin/com/xpdustry/foundation/mindustry/core/account/AccountService.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| /* | ||
| * Foundation, the software collection powering the Xpdustry network. | ||
| * Copyright (C) 2023 Xpdustry | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
| package com.xpdustry.foundation.mindustry.core.account | ||
|
|
||
| import com.xpdustry.foundation.common.application.FoundationListener | ||
|
|
||
| class AccountService : FoundationListener { | ||
| override fun onFoundationInit() { | ||
| super.onFoundationInit() | ||
| } | ||
| } |