feat(login/config): merge config files into one default.py

deploy/helm/bk-user/charts/login/templates/general-envs-configmap.yaml

@@ -4,7 +4,7 @@ kind: ConfigMap
 metadata:
   name: bk-login-general-envs
 data:
-  DJANGO_SETTINGS_MODULE: "bklogin.config.overlays.prod"
+  DJANGO_SETTINGS_MODULE: "bklogin.config.prod"
   # 登录态 Cookie 写入的域名
   BK_DOMAIN: {{ .Values.global.bkDomain }}
   BK_LOGIN_HTTP_SCHEMA: {{ .Values.global.bkDomainScheme }}

src/login/bklogin/bkaccount/migrations/0001_initial.py

@@ -12,9 +12,9 @@
 
 from __future__ import unicode_literals
 
-from django.db import models, migrations
 import django.utils.timezone
 from django.conf import settings
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
@@ -67,15 +67,16 @@ class Migration(migrations.Migration):
                     "login_host",
                     models.CharField(max_length=100, null=True, verbose_name="\u767b\u5f55HOST", blank=True),
                 ),
-                ("app_id", models.CharField(max_length=30, null=True, verbose_name=b"APP_ID", blank=True)),
-                (
-                    "user",
-                    models.ForeignKey(
-                        verbose_name="\u7528\u6237",
-                        to=settings.AUTH_USER_MODEL,
-                        on_delete=django.db.models.deletion.CASCADE,
-                    ),
-                ),
+                ("app_id", models.CharField(max_length=30, null=True, verbose_name="APP_ID", blank=True)),
+                ("user", models.CharField(max_length=128, null=True, blank=True)),
+                # (
+                #     "user",
+                #     models.ForeignKey(
+                #         verbose_name="\u7528\u6237",
+                #         to=settings.AUTH_USER_MODEL,
+                #         on_delete=django.db.models.deletion.CASCADE,
+                #     ),
+                # ),
             ],
             options={
                 "db_table": "login_bklog",

src/login/bklogin/config/common/logging.py → src/login/bklogin/bkauth/manager.py

@@ -9,10 +9,25 @@
 an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
 specific language governing permissions and limitations under the License.
 """
-from pathlib import Path
 
-from . import PROJECT_ROOT, env
 
-# logging config
-LOG_LEVEL = env("LOG_LEVEL", default="INFO")
-LOGGING_DIR = env("LOGGING_DIR", default=Path(PROJECT_ROOT) / "logs")
+from django.contrib.auth.models import BaseUserManager
+from django.utils import timezone
+
+
+class BkUserManager(BaseUserManager):
+    """BK user manager"""
+
+    def create_user(self, username, password=None):
+        """
+        Create and saves a User with the given username and password
+        """
+        if not username:
+            raise ValueError("'The given username must be set")
+
+        now = timezone.now()
+        user = self.model(username=username, last_login=now)
+        user.set_password(password)
+        # user.save(using=self._db)
+
+        return user

src/login/bklogin/bkauth/models.py

@@ -17,6 +17,7 @@
 from django.db import models as db_models
 from django.utils import timezone
 
+from bklogin.bkauth.manager import BkUserManager
 from bklogin.bkauth.utils import is_bk_token_valid
 from bklogin.components.usermgr_api import upsert_user
 
@@ -27,6 +28,8 @@ class User(models.AbstractBaseUser, models.AnonymousUser):
     username = db_models.CharField(primary_key=True, max_length=255)
     USERNAME_FIELD = "username"
 
+    objects = BkUserManager()
+
     def __init__(self, *args, **kwargs):
         self.init_fields()
 
@@ -115,5 +118,8 @@ def is_authenticated(self):
     def is_anonymous(self):
         return not self.is_authenticated
 
+    def save(self, *args, **kwargs):
+        pass
+
     class Meta(object):
         app_label = "bkauth"

src/login/bklogin/config/common/.env-tmpl → src/login/bklogin/config/.env-tmpl

@@ -11,6 +11,4 @@ DATABASE_USER=fake-user
 DATABASE_HOST=fake-db-host
 DATABASE_PORT=3306
 DATABASE_NAME=bk-login
-DATABASE_PASSWORD=fake-password
-
-EDITION=ce
+DATABASE_PASSWORD=fake-password