cmdbox 0.5.0.8__py3-none-any.whl → 0.5.1__py3-none-any.whl

cmdbox/extensions/sample_project/sample/extensions/features.yml

@@ -1,17 +1,19 @@
 features:
-  cli:
-    - package: sample.app.features.cli
-      prefix: sample_
-  web:
-    - package: sample.app.features.web
-      prefix: sample_web_
-args:
-  cli:
-    - rule:
-        mode: web
-      default:
-      coercion:
-        assets:
+  cli:                                  # Specify a list of package names in which the module implementing the command is located.
+    - package: sample.app.features.cli  # Package Name. Classes inheriting from cmdbox.app.feature.Feature.
+      prefix: sample_                   # Module name prefix. Modules that begin with this letter are eligible.
+      exclude_modules: []               # Specify the module name to exclude from the list of modules to be loaded.
+  web:                                  # Specify a list of package names with modules that implement web screens and RESTAPIs.
+    - package: sample.app.features.web  # Package Name. Classes inheriting from cmdbox.app.feature.WebFeature .
+      prefix: sample_web_               # Module name prefix. Modules that begin with this letter are eligible.
+args:                                   # Specifies default or forced arguments for the specified command.
+  cli:                                  # Specify rules to apply default values or force arguments.
+    - rule:                             # Specify the rules for applying default values and forced arguments for each command line option.
+        mode: web                       #   e.g. mode: web
+      default:                          # Specify a default value for each item to be set when a rule is matched.
+                                        #   e.g. doc_root: f"{Path(self.ver.__file__).parent / 'web'}"
+      coercion:                         # Specify a coercion value for each item to be set when a rule is matched.
+        assets:                         #   e.g. doc_root: f"{Path(self.ver.__file__).parent / 'web'}"
           - f"{Path(self.ver.__file__).parent / 'web' / 'assets'}"
         doc_root: f"{Path(self.ver.__file__).parent / 'web'}"
     - rule:
@@ -21,3 +23,26 @@ args:
         assets:
           - f"{Path(self.ver.__file__).parent / 'web' / 'assets'}"
         doc_root: f"{Path(self.ver.__file__).parent / 'web'}"
+aliases:                                # Specify the alias for the specified command.
+  cli:                                  # Specify the alias for the command line.
+    - source:                           # Specifies the command from which the alias originates.
+        mode:                           # Specify the mode of the source command. The exact match "mode" is selected.
+                                        #   e.g. client
+        cmd:                            # Specify the source command to be aliased. The regex match "cmd" is selected.
+                                        #   e.g. (.+)_(.+)
+      target:                           # Specifies the command to be aliased to.
+        mode:                           # Specify the mode of the target command. Create an alias for this “mode”.
+                                        #   e.g. CLIENT
+        cmd:                            # Specify the target command to be aliased. Create an alias for this “cmd”, referring to the regular expression group of source by "{n}".
+                                        #   e.g. {2}_{1}
+        move:                           # Specify whether to move the regular expression group of the source to the target.
+                                        #   e.g. true
+  web:                                  # Specify the alias for the RESTAPI.
+    - source:                           # Specifies the RESTAPI from which the alias originates.
+        path:                           # Specify the path of the source RESTAPI. The regex match "path" is selected.
+                                        #   e.g. /exec_(.+)
+      target:                           # Specifies the RESTAPI to be aliased to.
+        path:                           # Specify the path of the target RESTAPI. Create an alias for this “path”, referring to the regular expression group of source by "{n}".
+                                        #   e.g. /{1}_exec
+        move:                           # Specify whether to move the regular expression group of the source to the target.
+                                        #   e.g. true

cmdbox/extensions/sample_project/sample/extensions/user_list.yml

@@ -1,10 +1,10 @@
-users:
-- uid: 1
-  name: admin
-  password: admin
-  hash: plain
-  groups: [admin]
-  email: admin@aaa.bbb.jp
+users:                         # A list of users, each of which is a map that contains the following fields.
+- uid: 1                       # An ID that identifies a user. No two users can have the same ID.
+  name: admin                  # A name that identifies the user. No two users can have the same name.
+  password: admin              # The user's password. The value is hashed with the hash function specified in the next hash field.
+  hash: plain                  # The hash function used to hash the password, which can be plain, md5, sha1, or sha256, or oauth2.
+  groups: [admin]              # A list of groups to which the user belongs, as specified in the groups field.
+  email: admin@aaa.bbb.jp      # The email address of the user, used when authenticating using the provider specified in the oauth2 field.
 - uid: 101
   name: user01
   password: b75705d7e35e7014521a46b532236ec3
@@ -23,42 +23,53 @@ users:
   hash: sha256
   groups: [editor]
   email: user03@aaa.bbb.jp
-groups:
-- gid: 1
-  name: admin
+groups:                        # A list of groups, each of which is a map that contains the following fields.
+- gid: 1                       # An ID that identifies a group. No two groups can have the same ID.
+  name: admin                  # A name that identifies the group. No two groups can have the same name.
+- gid: 2
+  name: guest
 - gid: 101
   name: user
 - gid: 102
   name: readonly
-  parent: user
+  parent: user                 # The parent group of the group. If the parent group is not specified, the group is a top-level group.
 - gid: 103
   name: editor
   parent: user
-cmdrule:
-  policy: deny # allow, deny
-  rules:
+
+cmdrule:                       # A list of command rules, Specify a rule that determines whether or not a command is executable when executed by a user in web mode.
+  policy: deny                 # Specify the default policy for the rule. The value can be allow or deny.
+  rules:                       # Specify rules to allow or deny execution of the command, depending on the group the user belongs to.
   - groups: [admin]
     rule: allow
-  - groups: [user]
-    mode: client
-    cmds: [file_download, file_list, server_info]
-    rule: allow
+  - groups: [user]             # Specify the groups to which the rule applies.
+    mode: client               # Specify the "mode" as the condition for applying the rule.
+    cmds: [file_download, file_list, server_info] # Specify the "cmd" to which the rule applies. Multiple items can be specified in a list.
+    rule: allow                # Specifies whether or not the specified command is allowed for the specified group. The value can be allow or deny.
   - groups: [user]
     mode: server
     cmds: [list]
     rule: allow
+  - groups: [user, guest]
+    mode: web
+    cmds: [genpass]
+    rule: allow
   - groups: [editor]
     mode: client
     cmds: [file_copy, file_mkdir, file_move, file_remove, file_rmdir, file_upload]
     rule: allow
-pathrule:
-  policy: deny # allow, deny
-  rules:
-  - groups: [admin]
-    paths: [/]
+pathrule:                      # List of RESTAPI rules, rules that determine whether or not a RESTAPI can be executed when a user in web mode accesses it.
+  policy: deny                 # Specify the default policy for the rule. The value can be allow or deny.
+  rules:                       # Specify rules to allow or deny execution of the RESTAPI, depending on the group the user belongs to.
+  - groups: [admin]            # Specify the groups to which the rule applies.
+    paths: [/]                 # Specify the "path" to which the rule applies. Multiple items can be specified in a list.
+    rule: allow                # Specifies whether or not the specified RESTAPI is allowed for the specified group. The value can be allow or deny.
+  - groups: [guest]
+    paths: [/signin, /assets, /copyright, /dosignin, /dosignout, /password/change,
+            /gui, /get_server_opt, /usesignout, /versions_cmdbox, /versions_used]
     rule: allow
   - groups: [user]
-    paths: [/signin, /assets, /bbforce_cmd, /copyright, /dosignin, /dosignout,
+    paths: [/signin, /assets, /bbforce_cmd, /copyright, /dosignin, /dosignout, /password/change,
             /exec_cmd, /exec_pipe, /filer, /gui, /get_server_opt, /usesignout, /versions_cmdbox, /versions_used]
     rule: allow
   - groups: [readonly]
@@ -67,21 +78,52 @@ pathrule:
   - groups: [editor]
     paths: [/gui/del_cmd, /gui/del_pipe, /gui/save_cmd, /gui/save_pipe]
     rule: allow
-oauth2:
-  providers:
-    google:
-      enabled: false
-      client_id: XXXXXXXXXXX
-      client_secret: XXXXXXXXXXX
-      redirect_uri: https://localhost:8443/oauth2/google/callback
-      scope: ['email']
-      note:
+password:                       # Password settings.
+  policy:                       # Password policy settings.
+    enabled: true               # Specify whether or not to enable password policy.
+    not_same_before: true       # Specify whether or not to allow the same password as the previous one.
+    min_length: 16              # Specify the minimum length of the password.
+    max_length: 64              # Specify the maximum length of the password.
+    min_lowercase: 1            # Specify the minimum number of lowercase letters in the password.
+    min_uppercase: 1            # Specify the minimum number of uppercase letters in the password.
+    min_digit: 1                # Specify the minimum number of digits in the password.
+    min_symbol: 1               # Specify the minimum number of symbol characters in the password.
+    not_contain_username: true  # Specify whether or not to include the username in the password.
+  expiration:                   # Password expiration settings.
+    enabled: true               # Specify whether or not to enable password expiration.
+    period: 90                  # Specify the number of days after which the password will expire.
+    notify: 7                   # Specify the number of days before the password expires that a notification will be sent.
+  lockout:                      # Account lockout settings.
+    enabled: true               # Specify whether or not to enable account lockout.
+    threshold: 5                # Specify the number of failed login attempts before the account is locked.
+    reset: 30                   # Specify the number of minutes after which the failed login count will be reset.
+oauth2:                             # OAuth2 settings.
+  providers:                        # This is a per-provider setting for OAuth2.
+    google:                         # Google's OAuth2 configuration.
+      enabled: false                # Specify whether to enable Google's OAuth2.
+      client_id: XXXXXXXXXXX        # Specify Google's OAuth2 client ID.
+      client_secret: XXXXXXXXXXX    # Specify Google's OAuth2 client secret.
+      redirect_uri: https://localhost:8443/oauth2/google/callback # Specify Google's OAuth2 redirect URI.
+      scope: ['email']              # Specify the scope you want to retrieve with Google's OAuth2. Usually, just reading the email is sufficient.
+      signin_module:                # Specify the module name that implements the sign-in. see, cmdbox.app.signin.SignIn
+      note:                         # Specify a description such as Google's OAuth2 reference site.
       - https://developers.google.com/identity/protocols/oauth2/web-server?hl=ja#httprest
-    github:
-      enabled: false
-      client_id: XXXXXXXXXXX
-      client_secret: XXXXXXXXXXX
-      redirect_uri: https://localhost:8443/oauth2/github/callback
-      scope: ['user:email']
-      note:
+    github:                         # OAuth2 settings for GitHub.
+      enabled: false                # Specify whether to enable OAuth2 for GitHub.
+      client_id: XXXXXXXXXXX        # Specify the OAuth2 client ID for GitHub.
+      client_secret: XXXXXXXXXXX    # Specify the GitHub OAuth2 client secret.
+      redirect_uri: https://localhost:8443/oauth2/github/callback # Specify the OAuth2 redirect URI for GitHub.
+      scope: ['user:email']         # Specify the scope you want to get from GitHub's OAuth2. Usually, just reading the email is sufficient.
+      signin_module:                # Specify the module name that implements the sign-in. see, cmdbox.app.signin.SignIn
+      note:                         # Specify a description, such as a reference site for OAuth2 on GitHub.
       - https://docs.github.com/ja/apps/oauth-apps/building-oauth-apps/authorizing-oauth-apps#scopes
+    azure:                          # OAuth2 settings for Azure AD.
+      enabled: false                # Specify whether to enable OAuth2 for Azure AD.
+      tenant_id: XXXXXXXXXXX        # Specify the tenant ID for Azure AD.
+      client_id: XXXXXXXXXXX        # Specify the OAuth2 client ID for Azure AD.
+      client_secret: XXXXXXXXXXX    # Specify the Azure AD OAuth2 client secret.
+      redirect_uri: https://localhost:8443/oauth2/azure/callback # Specify the OAuth2 redirect URI for Azure AD.
+      scope: ['openid', 'profile', 'email', 'https://graph.microsoft.com/mail.read']
+      signin_module:                # Specify the module name that implements the sign-in. see, cmdbox.app.signin.SignIn
+      note:                         # Specify a description, such as a reference site for Azure AD's OAuth2.
+      - https://learn.microsoft.com/ja-jp/entra/identity-platform/v2-oauth2-auth-code-flow

cmdbox/extensions/user_list.yml

@@ -116,3 +116,13 @@ oauth2:                             # OAuth2 settings.
       signin_module:                # Specify the module name that implements the sign-in. see, cmdbox.app.signin.SignIn
       note:                         # Specify a description, such as a reference site for OAuth2 on GitHub.
       - https://docs.github.com/ja/apps/oauth-apps/building-oauth-apps/authorizing-oauth-apps#scopes
+    azure:                          # OAuth2 settings for Azure AD.
+      enabled: false                # Specify whether to enable OAuth2 for Azure AD.
+      tenant_id: XXXXXXXXXXX        # Specify the tenant ID for Azure AD.
+      client_id: XXXXXXXXXXX        # Specify the OAuth2 client ID for Azure AD.
+      client_secret: XXXXXXXXXXX    # Specify the Azure AD OAuth2 client secret.
+      redirect_uri: https://localhost:8443/oauth2/azure/callback # Specify the OAuth2 redirect URI for Azure AD.
+      scope: ['openid', 'profile', 'email', 'https://graph.microsoft.com/mail.read']
+      signin_module:                # Specify the module name that implements the sign-in. see, cmdbox.app.signin.SignIn
+      note:                         # Specify a description, such as a reference site for Azure AD's OAuth2.
+      - https://learn.microsoft.com/ja-jp/entra/identity-platform/v2-oauth2-auth-code-flow

cmdbox/version.py

@@ -1,9 +1,9 @@
 import datetime
 
-dt_now = datetime.datetime(2025, 3, 16)
+dt_now = datetime.datetime(2025, 3, 26)
 __appid__ = 'cmdbox'
 __title__ = 'cmdbox (Command Development Application)'
-__version__ = '0.5.0.8'
+__version__ = '0.5.1'
 __copyright__ = f'Copyright © 2023-{dt_now.strftime("%Y")} hamacom2004jp'
 __pypiurl__ = 'https://pypi.org/project/cmdbox/'
 __srcurl__ = 'https://github.com/hamacom2004jp/cmdbox'

cmdbox/web/assets/cmdbox/list_cmd.js

@@ -15,11 +15,58 @@ const list_cmd_func = async () => {
         }
         elem.find('.cmd_title').text(row.title);
         elem.find('.cmd_mode').text(row.mode);
-        elem.find('.cmd_cmd').text(row.cmd);
+        elem.find('.cmd_cmd').text(row.cmd)
+        if (row.tag && Array.isArray(row.tag)) {
+            const tags = new Set([...row.tag]);
+            elem.find('.cmd_card').attr('data-tags', Array.from(tags).join(','));
+        }
         $('#cmd_items').append(elem);
     };
     py_list_cmd.forEach(row => {card_func(row, true)});
     py_list_cmd.forEach(row => {card_func(row, false)});
+    $('#cmd_item_tags').html('');
+    py_list_cmd.forEach(row => {
+        if (!row.tag || !Array.isArray(row.tag)) return;
+        const cmd_item_tags = $('#cmd_item_tags');
+        row.tag.forEach(tag => {
+            if (tag=='') return;
+            if (cmd_item_tags.find(`[data-tag="${tag}"]`).length > 0) return;
+            const elem = $(`<button type="button" class="btn btn-outline-secondary btn-sm btn-tag me-2">${tag}</button>`);
+            elem.attr('data-tag', tag);
+            elem.text(tag);
+            elem.click((e) => {
+                const ct = $(e.currentTarget);
+                const cmd_items = $('#cmd_items').find('.cmd_card:not(.cmd_add)');
+                if (ct.hasClass('btn-secondary')) {
+                    ct.removeClass('btn-secondary');
+                    ct.addClass('btn-outline-secondary');
+                }
+                else if (ct.hasClass('btn-outline-secondary')) {
+                    ct.removeClass('btn-outline-secondary');
+                    ct.addClass('btn-secondary');
+                }
+                const tags = new Set();
+                cmd_item_tags.find('.btn-tag').each((i, elem) => {
+                    if ($(elem).hasClass('btn-secondary')) tags.add($(elem).attr('data-tag'));
+                });
+                if (tags.size == 0) {
+                    cmd_items.parent().show();
+                    return;
+                }
+                cmd_items.parent().hide();
+                tags.forEach(tag => {
+                    cmd_items.each((i, elem) => {
+                        const el = $(elem);
+                        const itags = el.attr('data-tags');
+                        if (!itags) return;
+                        else if (itags.split(',').includes(tag)) el.parent().show();
+                    });
+                });
+            });
+            cmd_item_tags.append(elem);
+        });
+        
+    });
 }
 // コマンドファイルの取得が出来た時の処理
 const list_cmd_func_then = () => {
@@ -211,7 +258,8 @@ const list_cmd_func_then = () => {
                 }
                 title.append(`<span>${row.opt}</span>`);
                 if (row.hide) {
-                    elem.addClass('row_content_hide').hide();
+                    if (row_content.find('.row_content_hide').is(':hidden')) elem.hide();
+                    elem.addClass('row_content_hide');
                 } else {
                     title.addClass('text-decoration-underline');
                 }

cmdbox/web/assets/cmdbox/signin.js

@@ -58,6 +58,7 @@ $(() => {
     });
     const btn_google = $('.btn-google');
     const btn_github = $('.btn-github');
+    const btn_azure = $('.btn-azure');
     btn_google.off('click').on('click', async (event) => {
         const path = window.location.pathname.replace('/signin', '');
         window.location.href = `../oauth2/google${path}?n=${cmdbox.randam_string(8)}`;
@@ -66,11 +67,17 @@ $(() => {
         const path = window.location.pathname.replace('/signin', '');
         window.location.href = `../oauth2/github${path}?n=${cmdbox.randam_string(8)}`;
     });
+    btn_azure.off('click').on('click', async (event) => {
+        const path = window.location.pathname.replace('/signin', '');
+        window.location.href = `../oauth2/azure${path}?n=${cmdbox.randam_string(8)}`;
+    });
     oauth2_enabled().then((res) => {
         if (res.google) btn_google.show();
         else btn_google.hide();
         if (res.github) btn_github.show();
         else btn_github.hide();
+        if (res.azure) btn_azure.show();
+        else btn_azure.hide();
     });
 });
 const get_client_data = async () => {

cmdbox/web/gui.html

@@ -113,6 +113,7 @@
             Commands : 
             <input id="cmd_kwd" name="cmd_kwd" type="text" class="form-control d-inline-block" style="width:200px;" placeholder="Search title">
         </h2>
+        <div id="cmd_item_tags" class="mb-2"></div>
         <div id="cmd_items" class="row">
         </div>
         <div class="d-none">

cmdbox/web/signin.html

@@ -30,6 +30,9 @@
         <symbol id="github" viewBox="0 0 16 16">
             <path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27s1.36.09 2 .27c1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.01 8.01 0 0 0 16 8c0-4.42-3.58-8-8-8"/>
         </symbol>
+        <symbol id="azure" viewBox="0 0 16 16">
+            <path d="M7.462 0H0v7.19h7.462zM16 0H8.538v7.19H16zM7.462 8.211H0V16h7.462zm8.538 0H8.538V16H16z"/>
+        </symbol>
         <symbol id="svg_eye_btn" viewBox="0 0 16 16">
             <path d="M16 8s-3-5.5-8-5.5S0 8 0 8s3 5.5 8 5.5S16 8 16 8M1.173 8a13 13 0 0 1 1.66-2.043C4.12 4.668 5.88 3.5 8 3.5s3.879 1.168 5.168 2.457A13 13 0 0 1 14.828 8q-.086.13-.195.288c-.335.48-.83 1.12-1.465 1.755C11.879 11.332 10.119 12.5 8 12.5s-3.879-1.168-5.168-2.457A13 13 0 0 1 1.172 8z"/>
             <path d="M8 5.5a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5M4.5 8a3.5 3.5 0 1 1 7 0 3.5 3.5 0 0 1-7 0"/>
@@ -91,6 +94,10 @@
             </div>
             <button class="btn btn-primary w-100 py-2" type="submit">Sign in</button>
             <div class="mt-3">
+                <button class="btn btn-outline-primary w-100 py-2 mb-3 btn-azure" type="button" style="display:none;">
+                    <svg class="bi my-1 theme-icon-active" fill="currentColor" width="16" height="16"><use href="#azure"></use></svg>
+                    Sign in with Microsoft
+                </button>
                 <button class="btn btn-outline-primary w-100 py-2 mb-3 btn-google" type="button" style="display:none;">
                     <svg class="bi my-1 theme-icon-active" fill="currentColor" width="16" height="16"><use href="#google"></use></svg>
                     Sign in with Google

{cmdbox-0.5.0.8.dist-info → cmdbox-0.5.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cmdbox
-Version: 0.5.0.8
+Version: 0.5.1
 Summary: cmdbox: It is a command line application with a plugin mechanism.
 Home-page: https://github.com/hamacom2004jp/cmdbox
 Author: hamacom2004jp

{cmdbox-0.5.0.8.dist-info → cmdbox-0.5.1.dist-info}/RECORD

@@ -6,18 +6,17 @@ cmdbox/logconf_edge.yml,sha256=RkbUebCJV2z5dLnpgvf4GSFkd-Blzu4vUUDP9CQFwdM,686
 cmdbox/logconf_gui.yml,sha256=T3yhWoiyp0DW06RjiFG6kS7jScqXYs-KLfC5EYKUImk,686
 cmdbox/logconf_server.yml,sha256=tpDpKQXgTWzUnHKGU-Vvsha7n1hyIyFdLnSeCgnOgyk,701
 cmdbox/logconf_web.yml,sha256=lzr3ytjqRbQutbhEOJdHJT0hrrR_h9sPkaEQkzX02lo,686
-cmdbox/version.py,sha256=NhSu1Nz84OuNSy4YY1fAowqPGPE0AMF6fGb8MCM1UHw,1963
+cmdbox/version.py,sha256=EckA3XY1hLvl-wMEVk_JMlhiz4BQICd_f8H148-jZDU,1961
 cmdbox/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cmdbox/app/app.py,sha256=2rQpTbezCLuy36df89EhKsAfcPjtGepGHSTQZXimcqA,8949
 cmdbox/app/client.py,sha256=SNM4xxDh5ARxV6I7cDrmbzGc7sXUUwB3tSyIksdT1RY,19562
 cmdbox/app/common.py,sha256=v31KbYeAD5Cu7nqPn3qKRTSyOfW6pOflHp6EsFhK76Q,21179
-cmdbox/app/edge.py,sha256=RlEOz5JZf7nM_SqplmdrcYgqt1P74raM-wOuf2D5x1g,36233
+cmdbox/app/edge.py,sha256=uPFOLP68_WsEC8nx1gvUrb1g1_TNdf0p4IOoH93cEIM,41653
 cmdbox/app/feature.py,sha256=5pfO8rdqFNjuSaIYv1pK4jaMKScEJMg1UFqzggbNHrY,9651
 cmdbox/app/filer.py,sha256=L_DSMTvnbN_ffr3JIt0obbOmVoTHEfVm2cAVz3rLH-Q,16059
-cmdbox/app/options.py,sha256=A4q4dAFAsTaV_k4z7n7hT2Dl6Ei6DrQ7X0xKoVDK6sM,31092
+cmdbox/app/options.py,sha256=3vwQx5ekrwurSHJLEsd3iXC2f8QevkAiR08ZioTKYPo,30874
 cmdbox/app/server.py,sha256=rrH_a6zzrx7glp_SqRrc_2gBgRoT9FX0F1bpGxVLX1I,9467
-cmdbox/app/signin.py,sha256=Ry4jxUuroOAIAfTYSolMm_izaF27-IS7914I4vhr6yU,2577
-cmdbox/app/web.py,sha256=d_lrJi6UWVRbsUGzW_LYdW2VYND1FYSTrh_1bejgrh4,80345
+cmdbox/app/web.py,sha256=9Zu9z7Pkdmz1T6NbJ6cn4rSLOAflrKG8veb5b4pQOqk,45469
 cmdbox/app/commons/convert.py,sha256=etWeutkPyE8FMz11jw4KJ5uip7qu_CoD1yIqF5iypgg,6754
 cmdbox/app/commons/loghandler.py,sha256=HFTlsQEshFaIubCH-AjvXOE0swbYtv77kSy2pwRz_8c,3469
 cmdbox/app/commons/module.py,sha256=RsEyqP9Qty4v0qIEE6VuY4pgMlkhJKNTUhsN5p-sSoM,4880
@@ -31,9 +30,9 @@ cmdbox/app/features/cli/cmdbox_client_file_remove.py,sha256=OY4y2YlGFEgWXg8q7OVv
 cmdbox/app/features/cli/cmdbox_client_file_rmdir.py,sha256=SlqOLHdV4kWzORbMvk8P9G24WiEZ0VUR3gpvAtxGU_Y,11329
 cmdbox/app/features/cli/cmdbox_client_file_upload.py,sha256=w8vbNttQ_V-R3UWkj0iKKXT0-G6_gIReq7KSMby2xJo,13184
 cmdbox/app/features/cli/cmdbox_client_server_info.py,sha256=6cCWFoFF0stCw7Mn57LUFgUDCKFPThzAerTMuYnLc-I,9398
-cmdbox/app/features/cli/cmdbox_edge_config.py,sha256=CzuF4YlngUTOBOr6jDAe-jzQ-psb9OVXMxIEtjKddYQ,7240
+cmdbox/app/features/cli/cmdbox_edge_config.py,sha256=CrLeewVflWbPhSfhifxpWmJ_pLP1LkJfYaQrmwVGnek,7846
 cmdbox/app/features/cli/cmdbox_edge_start.py,sha256=SWI0SEdergvVBuewyypH5cWrCZSm_M365RRkGxSLqB8,3849
-cmdbox/app/features/cli/cmdbox_gui_start.py,sha256=A15Iol1nRCd_kTMKTyM-uKYEnEd3I_ZYPQRI8fw6Tks,14403
+cmdbox/app/features/cli/cmdbox_gui_start.py,sha256=sgnWlOvo_8vtYNbsM4f6j0qSwFaoe0r8epGPqSV6bzU,14403
 cmdbox/app/features/cli/cmdbox_gui_stop.py,sha256=nxaKEM_JSbndcbuHo2CSv7XX4hQwSf3_XC_aasVcs_Y,2730
 cmdbox/app/features/cli/cmdbox_server_list.py,sha256=xinPmftRK2WkhuZiC6RPh7ldbqEpYErbNaWZSUcT03I,5689
 cmdbox/app/features/cli/cmdbox_server_start.py,sha256=2u-J5GlkJxX7a6Sh8Gw8OfsbhkzYz4zhDGXEtSd2CwM,7294
@@ -46,48 +45,48 @@ cmdbox/app/features/cli/cmdbox_web_group_add.py,sha256=pxhR1Pg-EngB3vQmPnAUys4EV
 cmdbox/app/features/cli/cmdbox_web_group_del.py,sha256=nQfS2zgqDGTZaMdiEZvscIqF84k2Kf_9cwt_aqeJmAE,6597
 cmdbox/app/features/cli/cmdbox_web_group_edit.py,sha256=M-B3txvtLc4sh6URFWVaHaDJCdz3MrLwkmQKSZ2mr-o,7326
 cmdbox/app/features/cli/cmdbox_web_group_list.py,sha256=sSj237xq5ZrvBSVh2w7ZDHwbzdDR1oJDwmaCfqbp808,6692
-cmdbox/app/features/cli/cmdbox_web_start.py,sha256=aa4TncMVK3cbXDOSYhJ_N__WZziXzbYBIW3b6Fn3nr0,15272
+cmdbox/app/features/cli/cmdbox_web_start.py,sha256=5iIIoyfIcJPU0SokEQKlATMVdCrM-sRIr3a6-Xs80fc,15344
 cmdbox/app/features/cli/cmdbox_web_stop.py,sha256=mGFRgTvm4lbt9D9O-Gnp3p0E44KQ9TyURMYk_ngTWto,3593
 cmdbox/app/features/cli/cmdbox_web_user_add.py,sha256=agMXexo99lKALEo4nAQA9BDFN1oTmu8_nCjWL6BSGuc,8547
 cmdbox/app/features/cli/cmdbox_web_user_del.py,sha256=kj1te2Sogdg8huVPbuVa_a6EBR9sJ6kbmw4VgSRHkaY,6560
 cmdbox/app/features/cli/cmdbox_web_user_edit.py,sha256=pEXM1Cx8t7aiy2iXURmwfpdMwjFbyjnqXWio-Rey52c,8455
 cmdbox/app/features/cli/cmdbox_web_user_list.py,sha256=oIkICVqL687h7aC5H-s7gYeW0ibF7Xfmy8NPCV45Aro,6680
 cmdbox/app/features/web/cmdbox_web_assets.py,sha256=D1dYNrvC7xBAVAAHX6PkoB6RFehEofET4hkHeCFYq7s,1931
-cmdbox/app/features/web/cmdbox_web_bbforce_cmd.py,sha256=0nvmbqH8Ubnw4SekQEZe6kynueNsJ2lu3vzzWc2JKr4,1457
-cmdbox/app/features/web/cmdbox_web_copyright.py,sha256=jgwQbpLvDkZNnU7J-_JvdpRV9BsiZKNSSvkA6wUF7bw,792
-cmdbox/app/features/web/cmdbox_web_del_cmd.py,sha256=GSFXglQza8OOnVJvL53Jr6KEAjTXjD_qRFsTxdKj6lY,1128
-cmdbox/app/features/web/cmdbox_web_del_pipe.py,sha256=rTG4kRQJ6c9x5uScPp3ZwHAQz9p_gyQ1wv0M8geBqBw,1136
-cmdbox/app/features/web/cmdbox_web_do_signin.py,sha256=uVWXDO8OCAMDkJbAKt8b1AMOoH1EKnjV9svEHUSW1II,17147
+cmdbox/app/features/web/cmdbox_web_bbforce_cmd.py,sha256=5YuO-oyL5HdqTqp2z_A0hMl0kOEwWA8xh8dgpoqpkUk,1464
+cmdbox/app/features/web/cmdbox_web_copyright.py,sha256=kyDHGPQNSmnaZrORevNBvv4gUEgwNzxfDBBO5wmhlbU,799
+cmdbox/app/features/web/cmdbox_web_del_cmd.py,sha256=SInKyL7ElqTedV5l6TaO8LXY-XyhChZ_5s7AAbYZEDU,1135
+cmdbox/app/features/web/cmdbox_web_del_pipe.py,sha256=vqewfron7Aozw4O2fp3H0OcVtIYRzod-TPOVwlRHncM,1143
+cmdbox/app/features/web/cmdbox_web_do_signin.py,sha256=LZkvOmJdcdPIV_RhPTq3moihyMIwp957N-hwWRgBmcI,20623
 cmdbox/app/features/web/cmdbox_web_do_signout.py,sha256=jROCSIDZ2frn3N8EEZkvjS1_IvBXrWVio-Ee1kV0_yw,910
-cmdbox/app/features/web/cmdbox_web_exec_cmd.py,sha256=BwRVD9qYOpEBIj6NvtBH_-Kw9oLB7ZE9qTlfVnVlHE4,11089
-cmdbox/app/features/web/cmdbox_web_exec_pipe.py,sha256=uKWQodWO2Pr3dAJf8t5AmDH91vQZ_urp2y2da382hqA,10537
-cmdbox/app/features/web/cmdbox_web_filer download.py,sha256=7QaOnN9EGPQsyybWmiKH-uVsibbcPOkVGU8ya2Txszs,2283
-cmdbox/app/features/web/cmdbox_web_filer.py,sha256=LtEF0-MupyjysZklsvbBgHEAJaVRRRkP0yW-fWa7tFo,1814
-cmdbox/app/features/web/cmdbox_web_filer_upload.py,sha256=aiG7CQOtjR6oSFYOR_JRg937kS8SvlzWA7_PC5xGnJo,2859
-cmdbox/app/features/web/cmdbox_web_get_cmd_choices.py,sha256=P4qoYK7_jeA8rDmZYtiNBgmVCc1Zh3MJTQ9QvRiYAts,904
-cmdbox/app/features/web/cmdbox_web_get_cmds.py,sha256=5eguTQH6HksnpSVBWhL9Kher2t0ozBYj6MR-M0qNciM,1012
-cmdbox/app/features/web/cmdbox_web_get_modes.py,sha256=jaX4q-XzQgMZ2qjRPh-nsdac8h9TdDokRbzoenO-2LU,892
-cmdbox/app/features/web/cmdbox_web_get_server_opt.py,sha256=T4JEBo_ntlUeNTebmjXlcIxtWm7cU2hRYrJZPZeR4k0,1020
-cmdbox/app/features/web/cmdbox_web_gui.py,sha256=-ZkZo1DU3QP_N26oCJoslbrvbCjZzZ4TEye9AUk1O-g,6594
+cmdbox/app/features/web/cmdbox_web_exec_cmd.py,sha256=kb5gNPD2xE7uyfwtC4Q98vDLXpG7sSpEyvBksonhYpA,11103
+cmdbox/app/features/web/cmdbox_web_exec_pipe.py,sha256=Y2aiPkD0F8-YpHbdQDP4mbTQAZkns4GFf9R6YKrkCtw,10551
+cmdbox/app/features/web/cmdbox_web_filer download.py,sha256=5bq0IeE2eKfxSGjUZdGS_23Rzh_-8qiY5q-VM-1KHh0,2247
+cmdbox/app/features/web/cmdbox_web_filer.py,sha256=IDQ8qXRAkhxJoLHctinh_njHP7-gtF_-JS3DE-OiOok,1821
+cmdbox/app/features/web/cmdbox_web_filer_upload.py,sha256=OnLZfSzaysp-4EoJbOjTQ3tObkqczKb5NrxbA6SsluA,2866
+cmdbox/app/features/web/cmdbox_web_get_cmd_choices.py,sha256=emOF5h8Jrra-6hdWBjytpeVkbbYBFlkD_2eF5XV6Oe0,911
+cmdbox/app/features/web/cmdbox_web_get_cmds.py,sha256=EPwLnfSAwpG4Lao0cZS4qrygkXPm-e8Gw0dVjMDijWs,1026
+cmdbox/app/features/web/cmdbox_web_get_modes.py,sha256=2UgQxQ4bAyzDrCDg4TcmJiMqWpsW3z2Jtxbxngbb5XY,906
+cmdbox/app/features/web/cmdbox_web_get_server_opt.py,sha256=kdyPIfn-tmqtZeqZ_DlHTiB4E57Unl-8tbw9uCrBmMg,1027
+cmdbox/app/features/web/cmdbox_web_gui.py,sha256=Ergz6vYG6dPVlovo7ytswYR_mkNf_8OWFAZvt3Ououg,6608
 cmdbox/app/features/web/cmdbox_web_gui_callback.py,sha256=R-0edD7YbhsfbDVDv-iK2XHNVEvmrUOVEQuvafxpRJs,2181
-cmdbox/app/features/web/cmdbox_web_list_cmd.py,sha256=nQrC4wgZT5VXt-vVbfBPqkLwbHJLfuX6mNZG4DnuWmI,1661
-cmdbox/app/features/web/cmdbox_web_list_pipe.py,sha256=uiU8uQbI7xuP1NmvBcixBxhuGOB10_-O3kJZh-vRqEo,2452
-cmdbox/app/features/web/cmdbox_web_load_cmd.py,sha256=8I1K6PwxqQzpJ9dUXDXoFlxsc0_X-zyfA4mOHlYh5IU,1707
-cmdbox/app/features/web/cmdbox_web_load_pin.py,sha256=9ITLBmiAYj0lNnleXv2BaB0S2ZqfGdUgrRSfeS5R1AQ,1870
-cmdbox/app/features/web/cmdbox_web_load_pipe.py,sha256=AafzLxi5xEscZKVzjPRGy4dcVa_i_a_EgBwsVVqi-Ys,1367
-cmdbox/app/features/web/cmdbox_web_raw_cmd.py,sha256=m1s1gEMfRnyDS1xtZuC3b5_NHGqhc-fGz5QHKs1zxzo,2061
-cmdbox/app/features/web/cmdbox_web_raw_pipe.py,sha256=a7Mm00C7NC2wZ0jR9V24H84cQtV-7fhXTSLz4tVYXhA,4500
-cmdbox/app/features/web/cmdbox_web_result.py,sha256=fLC_nn9BnQAgeQb5_YYJf73N5JoOT9XbEUZdwSdizKc,2390
-cmdbox/app/features/web/cmdbox_web_save_cmd.py,sha256=9b21yj4yZdEMkJILlpf4ZNCCD1OESHZkzDUf4S3ylKc,2077
-cmdbox/app/features/web/cmdbox_web_save_pin.py,sha256=_VVADVwVcA5w4aJ1gVS_P_6YGKf86p3XshYJLzCqy3s,1841
-cmdbox/app/features/web/cmdbox_web_save_pipe.py,sha256=WM_HcheM_doP6u6Jx8waeMJGQQUfNERM7jbLvjh1ydY,1557
-cmdbox/app/features/web/cmdbox_web_signin.py,sha256=OdKDFm30u1THg8agvhuNxqgu71oo1a0O5Q620gEBRiM,3399
-cmdbox/app/features/web/cmdbox_web_users.py,sha256=N1oCSunDJdcIaRrGs-Ap3N87LA04Gs0OmW61An-rmBE,9385
+cmdbox/app/features/web/cmdbox_web_list_cmd.py,sha256=wI3YP_dWsqC_6RnXKJcE_OJZZXFNXPhhIF6Fn-B5P-U,1675
+cmdbox/app/features/web/cmdbox_web_list_pipe.py,sha256=E8eNr74aRe15I7LrsUwiwA9irkpeoeD5tdAo4e4qnh0,2466
+cmdbox/app/features/web/cmdbox_web_load_cmd.py,sha256=Bgc1jcs5dc31U_QriI7GMCCt0FOzp_jWCxFxHtmkJ4Y,1714
+cmdbox/app/features/web/cmdbox_web_load_pin.py,sha256=FCaKheyBgfqDoknKCQWIT3u72iPWpqjNK15VimEBERw,1835
+cmdbox/app/features/web/cmdbox_web_load_pipe.py,sha256=sD79E2azH9u7HY4wlb95sJaAgj-bRg0uein_TpcQRms,1374
+cmdbox/app/features/web/cmdbox_web_raw_cmd.py,sha256=EGGidJsVRccnDhrVUUqEAT_TKs_9mTSQzPmUO3at-p4,2068
+cmdbox/app/features/web/cmdbox_web_raw_pipe.py,sha256=kPE52DTWnP1ppt3-7X_-Zn24lVvw9wwTeSmS4-QmNrk,4507
+cmdbox/app/features/web/cmdbox_web_result.py,sha256=hANYh1Qito_Fzs6qeTBetqWlsjsWlI2az-mNSoPkNf8,2404
+cmdbox/app/features/web/cmdbox_web_save_cmd.py,sha256=06lUgGeKnW2771FuKZ303e8EkLSD_VAB6dDfOYQ9FAM,2084
+cmdbox/app/features/web/cmdbox_web_save_pin.py,sha256=ClZ1M4VsJAOPoriqE2paaOnHcaRg29gbhQTnHC7QSog,1855
+cmdbox/app/features/web/cmdbox_web_save_pipe.py,sha256=3ChbsJELRNmuATHWqbS2LOAsg6s75GEhOi06zbsKF0M,1564
+cmdbox/app/features/web/cmdbox_web_signin.py,sha256=s6DAB-IaxPgI8x8Bj8FT58RhLnMZ4M3-Zi-3ueQH2Ws,4602
+cmdbox/app/features/web/cmdbox_web_users.py,sha256=C8khexjN5AK9BxhHhzL-grF3mKAwMt-3PyqjvFkJTXc,9405
 cmdbox/app/features/web/cmdbox_web_usesignout.py,sha256=lBjBj8M8e69uXhdv7H92wZfRRWD2j6kmC_WekSCw5yo,682
-cmdbox/app/features/web/cmdbox_web_versions_cmdbox.py,sha256=cdMkkHUFPNFqtnUHZPiwF1xmV13EljPDF4__i981uho,811
-cmdbox/app/features/web/cmdbox_web_versions_used.py,sha256=JWuFWIIohELx1t1UuCWmbC53D3sGbBLN0jn2hR-yKlk,1315
+cmdbox/app/features/web/cmdbox_web_versions_cmdbox.py,sha256=hG4ikQc0Qr6He8AhYu8kK1GD5TNjezr-VpmCSAFL7Nk,818
+cmdbox/app/features/web/cmdbox_web_versions_used.py,sha256=xA368ASudYFIrJjWOC1MGmsaAE3Mdd5i-Y8sZBWL7p4,1322
 cmdbox/extensions/features.yml,sha256=Cy69Oy-Ync0M7OxfXGQgrCxD5YFfRHnh0jNNRYSjTWg,3813
-cmdbox/extensions/user_list.yml,sha256=-Nhcx4AYZr1LEtJA85zGDQ9XEYzNxP_pAyZaFkWHmI4,7979
+cmdbox/extensions/user_list.yml,sha256=EJDqdsjHozejxO3ClW8mQQvepVPX9CqoVnTWQKkF83c,8887
 cmdbox/extensions/sample_project/requirements.txt,sha256=z_gUanGVrPeYUExYeU5_gHiOTy8RKZkaJSeKxOM4mqY,18
 cmdbox/extensions/sample_project/.vscode/launch.json,sha256=Bj_FO1P0lPMfuwZxvyLfwQa0f7Gk276dvcVRjj2aem4,1348
 cmdbox/extensions/sample_project/sample/__init__.py,sha256=UiUuJV0knNR9PazyIf-pyQGVZXAxHP01UjbwU9GXnRw,69
@@ -97,8 +96,8 @@ cmdbox/extensions/sample_project/sample/version.py,sha256=Yj03cWCvXUFjCGDinEkiB5
 cmdbox/extensions/sample_project/sample/app/app.py,sha256=2snmsdwgYuHfCNMpGtpOzJJUWJoB5Ovem1JsQRWqZrk,231
 cmdbox/extensions/sample_project/sample/app/features/cli/sample_client_time.py,sha256=cJ71RsgyhNsfnVIMLiw9FzIy7hlZyh0qxGRk9uFzQn8,3049
 cmdbox/extensions/sample_project/sample/app/features/cli/sample_server_time.py,sha256=BhwBVUdOOM2UU3pLAEoon9sm316d63Z15vMb3s5eVbc,7288
-cmdbox/extensions/sample_project/sample/extensions/features.yml,sha256=oPudcQEnQeKrK0SZ8oB0rnmUqkNMFktU3VXnwpmCGQI,575
-cmdbox/extensions/sample_project/sample/extensions/user_list.yml,sha256=qsh7hjvnMXscwh5iFiHbzIq8M_HdSpB44TcODnv0LnA,2221
+cmdbox/extensions/sample_project/sample/extensions/features.yml,sha256=3SJOJeZtstrOdpvV74Funac8IcISlaky-dBwr77hiIM,4148
+cmdbox/extensions/sample_project/sample/extensions/user_list.yml,sha256=OpZqClVYh_QvEGPAlpOTT8iHslv-_TTWeERHRNghGKY,8888
 cmdbox/extensions/sample_project/sample/web/assets/sample/favicon.ico,sha256=z-jwmfktVBIsYjhUfCOj7ZNiq55GH-uXtbbDRzk7DHQ,9662
 cmdbox/extensions/sample_project/sample/web/assets/sample/icon.png,sha256=8WmOhepVHG46KG8Sjs4OjZht16dTcgpsNIs972PiVWU,327723
 cmdbox/licenses/LICENSE.Jinja2.3.1.4(BSD License).txt,sha256=ZI-J-fRTl3-a2K8rHwb7MTxJubc6M_SFq1tDaXWgQYY,1503
@@ -186,9 +185,9 @@ cmdbox/licenses/LICENSE.zope.interface.7.1.1(Zope Public License).txt,sha256=bHk
 cmdbox/licenses/files.txt,sha256=E_C-9JE8iJeOs-ZY_Lg1B3Brcdqr8G-kJeFnWeSHXUk,14179
 cmdbox/web/assets_license_list.txt,sha256=TcyF-U5C8O-J3Nxfp3pxralGdazTj8BgLwwEBRn59_w,853
 cmdbox/web/filer.html,sha256=NQzwJc1k4IDpK1F99vumLC3BO7x_frO6HJcEzI9c0kw,15254
-cmdbox/web/gui.html,sha256=5RB9iSpiCLEpFIOJZQ52JRpOYEV5OdAjFxT1UcQOEmQ,34635
+cmdbox/web/gui.html,sha256=rwdRVQPwtDrW07f_07z6h090XwnSRDnwKxBUC-DTG4w,34688
 cmdbox/web/result.html,sha256=dZcQCLSrhTr7gY50WYCfG2wEWngnV7x9xnYOVl73WSQ,14835
-cmdbox/web/signin.html,sha256=blFKNzpmJane-sUF2Xev5F1645oLoq_fuDMYd0_iziU,10556
+cmdbox/web/signin.html,sha256=Rhqvhcq_hZ1svRkHIpy_2BVTJkmw2R4Q4lZo93eQvsE,11063
 cmdbox/web/users.html,sha256=RHslVrj8FJgV1RI6oMTRuZTu3g7YyXMKKYGeoOzgwG4,19194
 cmdbox/web/assets/bootstrap/bootstrap.bundle.min.5.3.0.js,sha256=qlPVgvl-tZTCpcxYJFdHB_m6mDe84wRr-l81VoYPTgQ,80421
 cmdbox/web/assets/bootstrap/bootstrap.min.5.3.0.css,sha256=fx038NkLY4U1TCrBDiu5FWPEa9eiZu01EiLryshJbCo,232914
@@ -196,13 +195,13 @@ cmdbox/web/assets/cmdbox/common.js,sha256=rsegebcs7QtBNi-WEy5-sev-EDIEHV9P-0HZoj
 cmdbox/web/assets/cmdbox/favicon.ico,sha256=2U4MhqzJklRksOQwnK-MZigZCubxCHqKG_AuNJnvYtA,34494
 cmdbox/web/assets/cmdbox/filer_modal.js,sha256=hCEk0UR_bjJp9X9blWfmrbZVxKkmO3GGQ44ukSDuHbg,8522
 cmdbox/web/assets/cmdbox/icon.png,sha256=xdEwDdCS8CoPQk7brW-1mV8FIGYtUeSMBRlY9Oh-3nE,296172
-cmdbox/web/assets/cmdbox/list_cmd.js,sha256=a_v1ZOzXzAOaVMZKJmAE8s02oo6ccWBvi8uN2cD6EMw,30589
+cmdbox/web/assets/cmdbox/list_cmd.js,sha256=mGsN4_ZZ8Lgdt6WyZAMe-yGG5DRPc_vXy9Hen9ruKU0,32801
 cmdbox/web/assets/cmdbox/list_pipe.js,sha256=mlzISyZUG90GbE0gxMzWpwZhzhojxqvft2gne6Vajco,11218
 cmdbox/web/assets/cmdbox/main.js,sha256=K-tBnZlCpy__juT_HHKfvHzhNJykAjva7LUBJX45XzM,4997
 cmdbox/web/assets/cmdbox/open_capture.js,sha256=W4IQlOYLN4Y8OaS8Xc5yp-BRlm82TVjujChr3hJKS0M,709
 cmdbox/web/assets/cmdbox/open_output_json.js,sha256=4q7mCdVmSzFudlTlW9MuIJ1-f-kDvpD6rDUU01IbKi8,727
 cmdbox/web/assets/cmdbox/result.js,sha256=DHCYMXmuN9UQjwCGJfHE6rmHD0rSwRIxDqPQWHcdl24,3210
-cmdbox/web/assets/cmdbox/signin.js,sha256=x2QOTRVdTwy9bAbOD86ZYBB0yIRAjJZ32vNVQCCyWAA,3680
+cmdbox/web/assets/cmdbox/signin.js,sha256=IMb1aGm4kv4MjB9MR8xw9-rKY7UyuV7UNWPB_VwVdhA,4020
 cmdbox/web/assets/cmdbox/users.js,sha256=RsmMzLZohbU0u3GsXv7W64691se4TKUrhZxISAocc1I,29215
 cmdbox/web/assets/cmdbox/view_raw.js,sha256=pEPGZD10T3vrjnb-uZupPIhUNMJZu8o6DUucjjdDFQk,2657
 cmdbox/web/assets/cmdbox/view_result.js,sha256=FCT7uIxFp6TKXmGldjdQo2-SNkhyRtAAMBQ2qF54HVQ,6954
@@ -248,9 +247,9 @@ cmdbox/web/assets/tree-menu/image/file.png,sha256=Uw4zYkHyuoZ_kSVkesHAeSeA_g9_LP
 cmdbox/web/assets/tree-menu/image/folder-close.png,sha256=TcgsKTBBF2ejgzekOEDBFBxsJf-Z5u0x9IZVi4GBR-I,284
 cmdbox/web/assets/tree-menu/image/folder-open.png,sha256=DT7y1GRK4oXJkFvqTN_oSGM5ZYARzPvjoCGL6wqkoo0,301
 cmdbox/web/assets/tree-menu/js/tree-menu.js,sha256=-GkZxI7xzHuXXHYQBHAVTcuKX4TtoiMuyIms6Xc3pxk,1029
-cmdbox-0.5.0.8.dist-info/LICENSE,sha256=sBzzPc5v-5LBuIFi2V4olsnoVg-3EBI0zRX5r19SOxE,1117
-cmdbox-0.5.0.8.dist-info/METADATA,sha256=mNEz-XXmfFzRSjdGTKCEcImtwsBdcd3-Yjln1FdXyzo,24050
-cmdbox-0.5.0.8.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-cmdbox-0.5.0.8.dist-info/entry_points.txt,sha256=PIoRz-tr503YwdMmd6nxuSn2dDltf4cUMVs98E9WgaA,48
-cmdbox-0.5.0.8.dist-info/top_level.txt,sha256=eMEkD5jn8_0PkCAL8h5xJu4qAzF2O8Wf3vegFkKUXR4,7
-cmdbox-0.5.0.8.dist-info/RECORD,,
+cmdbox-0.5.1.dist-info/LICENSE,sha256=sBzzPc5v-5LBuIFi2V4olsnoVg-3EBI0zRX5r19SOxE,1117
+cmdbox-0.5.1.dist-info/METADATA,sha256=Cwr2Q21QZhC6iPg263joNQAKuANLhffiwsA0G25N_x0,24048
+cmdbox-0.5.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+cmdbox-0.5.1.dist-info/entry_points.txt,sha256=PIoRz-tr503YwdMmd6nxuSn2dDltf4cUMVs98E9WgaA,48
+cmdbox-0.5.1.dist-info/top_level.txt,sha256=eMEkD5jn8_0PkCAL8h5xJu4qAzF2O8Wf3vegFkKUXR4,7
+cmdbox-0.5.1.dist-info/RECORD,,

cmdbox/app/signin.py

@@ -1,56 +0,0 @@
-from typing import Dict, Any, Tuple, List, Union
-
-
-class Signin(object):
-
-    def __init__(self, appcls, ver):
-        self.ver = ver
-        self.appcls = appcls
-
-    def jadge(self, access_token:str, email:str, signin_file_data:Dict[str, Any]) -> Tuple[bool, Dict[str, Any]]:
-        """
-        サインインを成功させるかどうかを判定します。
-        返すユーザーデータには、uid, name, email, groups, hash が必要です。
-
-        Args:
-            access_token (str): アクセストークン
-            email (str): メールアドレス
-            signin_file_data (Dict[str, Any]): サインインファイルデータ（変更不可）
-
-        Returns:
-            Tuple[bool, Dict[str, Any]]: (成功かどうか, ユーザーデータ)
-        """
-        users = [u for u in signin_file_data['users'] if u['email'] == email and u['hash'] == 'oauth2']
-        return len(users) > 0, users[0] if len(users) > 0 else None
-
-    def get_groups(self, access_token:str, user:Dict[str, Any], signin_file_data:Dict[str, Any]) -> Tuple[List[str], List[int]]:
-        """
-        ユーザーのグループを取得します
-
-        Args:
-            access_token (str): アクセストークン
-            user (Dict[str, Any]): ユーザーデータ
-            signin_file_data (Dict[str, Any]): サインインファイルデータ（変更不可）
-
-        Returns:
-            Tuple[List[str], List[int]]: (グループ名, グループID)
-        """
-        group_names = list(set(self.correct_group(user['groups'], None, signin_file_data)))
-        gids = [g['gid'] for g in signin_file_data['groups'] if g['name'] in group_names]
-        return group_names, gids
-
-    def correct_group(self, group_names:List[str], master_groups:List[Dict[str, Any]], signin_file_data:Dict[str, Any]):
-        """
-        指定されたグループ名に属する子グループ名を収集します
-
-        Args:
-            group_names (List[str]): グループ名リスト
-            master_groups (List[Dict[str, Any]], optional): 親グループ名. Defaults to None.
-            signin_file_data (Dict[str, Any]): サインインファイルデータ（変更不可）
-        """
-        master_groups = signin_file_data['groups'] if master_groups is None else master_groups
-        gns = []
-        for gn in group_names.copy():
-            gns = [gr['name'] for gr in master_groups if 'parent' in gr and gr['parent']==gn]
-            gns += self.correct_group(gns, master_groups, signin_file_data)
-        return group_names + gns