From 26ab4a12d06875d4cacb9f4039168db1da50b1d3 Mon Sep 17 00:00:00 2001 From: balzack Date: Wed, 12 Jan 2022 21:00:52 -0800 Subject: [PATCH] updated api to support import/export --- doc/api.oa3 | 280 +++++++++++++++++- net/server/internal/README.md | 6 +- net/server/internal/api_account.go | 17 +- net/server/internal/api_admin.go | 7 +- net/server/internal/api_authorize.go | 4 +- net/server/internal/api_contact.go | 2 +- net/server/internal/api_content.go | 2 +- net/server/internal/api_conversation.go | 2 +- net/server/internal/api_profile.go | 2 +- net/server/internal/api_share.go | 2 +- net/server/internal/api_status.go | 2 +- net/server/internal/logger.go | 2 +- net/server/internal/model_account.go | 4 +- .../internal/model_accounts_import_body.go | 18 ++ net/server/internal/model_announce.go | 2 +- net/server/internal/model_app.go | 2 +- net/server/internal/model_app_data.go | 2 +- net/server/internal/model_article.go | 2 +- .../internal/model_article_id_assets_body.go | 2 +- .../internal/model_article_id_subject_body.go | 2 +- net/server/internal/model_asset.go | 2 +- net/server/internal/model_authenticate.go | 2 +- net/server/internal/model_card.go | 2 +- net/server/internal/model_card_data.go | 2 +- net/server/internal/model_card_profile.go | 2 +- net/server/internal/model_card_view.go | 2 +- net/server/internal/model_connect.go | 2 +- .../internal/model_content_articles_body.go | 2 +- .../internal/model_content_labels_body.go | 2 +- net/server/internal/model_data_message.go | 2 +- net/server/internal/model_dialogue.go | 2 +- .../model_dialogue_id_subject_body.go | 2 +- .../internal/model_dialogue_insights.go | 2 +- net/server/internal/model_disconnect.go | 2 +- net/server/internal/model_group.go | 2 +- .../internal/model_groups_group_id_body.go | 2 +- .../internal/model_inline_response_200.go | 2 +- .../internal/model_inline_response_200_1.go | 2 +- .../internal/model_inline_response_200_2.go | 2 +- .../internal/model_inline_response_201.go | 2 +- .../internal/model_inline_response_201_1.go | 2 +- net/server/internal/model_insight.go | 2 +- net/server/internal/model_label.go | 2 +- .../internal/model_labels_label_id_body.go | 2 +- net/server/internal/model_node_config.go | 8 +- net/server/internal/model_profile.go | 4 +- net/server/internal/model_profile_data.go | 2 +- .../internal/model_share_groups_body.go | 2 +- net/server/internal/model_status.go | 27 ++ net/server/internal/model_tag.go | 2 +- net/server/internal/model_topic.go | 2 +- .../internal/model_topic_id_assets_body.go | 2 +- .../internal/model_topic_id_subject_body.go | 2 +- .../internal/model_topic_id_tags_body.go | 2 +- net/server/internal/model_tunnel.go | 2 +- net/server/internal/routers.go | 44 ++- net/server/internal/store/schema.go | 5 +- 57 files changed, 437 insertions(+), 77 deletions(-) create mode 100644 net/server/internal/model_accounts_import_body.go create mode 100644 net/server/internal/model_status.go diff --git a/doc/api.oa3 b/doc/api.oa3 index 67c670d2..f8ba69b2 100644 --- a/doc/api.oa3 +++ b/doc/api.oa3 @@ -24,12 +24,10 @@ tags: description: getting and setting of the public profile - name: share description: access control for personal subjects, associates content and cards - - name: contact description: connection to other identities, hook receiver - name: content description: posting and listing of personal subjects, group and tag managment - - name: converstaion description: group sharing of subjects @@ -251,6 +249,33 @@ paths: '500': description: internal server error + /admin/accounts/import: + post: + tags: + - admin + description: Import an account account from a backup archive. Access granted to the admin username and password. + operationId: import account + security: + - basicAuth: [] + responses: + '201': + description: success + '401': + description: permission denied + '406': + description: account already imported + '500': + description: internal server error + requestBody: + content: + multipart/form-data: + schema: + type: object + properties: + fileName: + type: string + format: binary + /account/public/claimable: get: tags: @@ -331,6 +356,46 @@ paths: '500': description: internal server error + /account/did: + get: + tags: + - account + description: Retrieve account DIDkey. Authorized to account username and password. + operationId: get-account-did + security: + - basicAuth: [] + responses: + '200': + description: successful operation + content: + application/json: + schema: + type: string + '401': + description: authentication error + '500': + description: internal server error + + /account/disabled: + get: + tags: + - account + description: Get disabled status of account. Authorized to account username and password. + operationId: get-account-status + security: + - basicAuth: [] + responses: + '200': + description: successful operation + content: + application/json: + schema: + type: boolean + '401': + description: authentication error + '500': + description: internal server error + /account/profile: get: tags: @@ -467,6 +532,8 @@ paths: type: string '401': description: invalid password + '410': + description: account disabled '500': description: internal server error put: @@ -487,6 +554,8 @@ paths: description: invalid token '406': description: app limit reached + '410': + description: account disabled '500': description: internal server error requestBody: @@ -517,6 +586,24 @@ paths: description: invalid password '404': description: app not found + '410': + description: account disabled + '500': + description: internal server error + + /account/export: + put: + tags: + - account + description: Export account from node. Account is automatically disabled afterwards. Authorized to account username and password. + operationId: set-account-export + security: + - basicAuth: [] + responses: + '201': + description: success + '401': + description: permission denied '500': description: internal server error @@ -537,6 +624,8 @@ paths: $ref: '#/components/schemas/DataMessage' '401': description: permission denied + '410': + description: account disabled '500': description: internal server error requestBody: @@ -562,6 +651,8 @@ paths: $ref: '#/components/schemas/Profile' '401': description: permission denied + '410': + description: account disabled '500': description: internal server error put: @@ -576,6 +667,8 @@ paths: description: success '401': description: permission denied + '410': + description: account disabled '500': description: internal server error requestBody: @@ -604,6 +697,8 @@ paths: description: permission denied '405': description: invalid image + '410': + description: account disabled '500': description: internal server error @@ -624,6 +719,8 @@ paths: $ref: '#/components/schemas/DataMessage' '401': description: permission denied + '410': + description: account disabled '500': description: internal server error @@ -646,6 +743,8 @@ paths: $ref: '#/components/schemas/Group' '401': description: invalid token + '410': + description: account disabled '500': description: internal server error post: @@ -660,6 +759,8 @@ paths: description: entry created '401': description: permission denied + '410': + description: account disabled '500': description: internal server error requestBody: @@ -698,6 +799,8 @@ paths: description: permission denied '404': description: group not found + '410': + description: account disabled '500': description: internal server error requestBody: @@ -734,6 +837,8 @@ paths: description: permission denied '404': description: group not found + '410': + description: account disabled '500': description: internal server error @@ -756,6 +861,8 @@ paths: description: invalid data message '401': description: permission denied + '410': + description: account disabled '500': description: internal server error @@ -778,6 +885,8 @@ paths: $ref: '#/components/schemas/CardView' '401': description: permission denied + '410': + description: account disabled '500': description: internal server error @@ -807,6 +916,8 @@ paths: description: permission denied '404': description: card not found + '410': + description: account disabled '500': description: internal server error delete: @@ -830,6 +941,8 @@ paths: description: permission denied '404': description: card not found + '410': + description: account disabled '500': description: internal server error @@ -865,6 +978,8 @@ paths: description: permission denied '404': description: card not found + '410': + description: account disabled '500': description: internal server error requestBody: @@ -900,6 +1015,8 @@ paths: description: permission denied '404': description: card not found + '410': + description: account disabled '500': description: internal server error @@ -926,6 +1043,8 @@ paths: enum: [ pending, confirmed, requested, connecting, connected ] '400': description: invalid data message + '410': + description: account disabled '500': description: internal server error requestBody: @@ -960,6 +1079,8 @@ paths: description: permission denied '404': description: card not found + '410': + description: account disabled '500': description: internal server error @@ -986,6 +1107,8 @@ paths: enum: [ pending, confirmed, requested, connecting, connected ] '400': description: invalid data message + '410': + description: account disabled '500': description: internal server error requestBody: @@ -1020,6 +1143,8 @@ paths: description: permission denied '404': description: not found + '410': + description: account disabled '500': description: internal server error put: @@ -1047,6 +1172,8 @@ paths: description: permission denied '404': description: card not found + '410': + description: account disabled '500': description: internal server error requestBody: @@ -1084,6 +1211,8 @@ paths: description: card not found '405': description: invalid image + '410': + description: account disabled '500': description: internal server error @@ -1113,6 +1242,8 @@ paths: description: permission denied '404': description: card not found + '410': + description: account disabled '500': description: internal server error @@ -1142,6 +1273,8 @@ paths: description: permission denied '404': description: card not found + '410': + description: account disabled '500': description: internal server error requestBody: @@ -1174,6 +1307,8 @@ paths: description: permission denied '404': description: card not found + '410': + description: account disabled '500': description: internal server error @@ -1209,6 +1344,8 @@ paths: description: permission denied '404': description: card or group not found + '410': + description: account disabled '500': description: internal server error delete: @@ -1242,6 +1379,8 @@ paths: description: permission denied '404': description: card or group not found + '410': + description: account disabled '500': description: internal server error @@ -1258,6 +1397,8 @@ paths: description: revision set '401': description: not authorized + '410': + description: account disabled '500': description: internal server error requestBody: @@ -1280,6 +1421,8 @@ paths: description: revision set '401': description: not authorized + '410': + description: account disabled '500': description: internal server error requestBody: @@ -1314,6 +1457,8 @@ paths: format: int64 '401': description: permission denied + '410': + description: account disabled '500': description: internal server error @@ -1345,6 +1490,8 @@ paths: description: permission denied '404': description: block not found + '410': + description: account disabled '500': description: internal server error @@ -1382,6 +1529,8 @@ paths: description: permission denied '404': description: block not found + '410': + description: account disabled '500': description: internal server error @@ -1410,6 +1559,8 @@ paths: $ref: '#/components/schemas/Article' '401': description: permission denied + '410': + description: account disabled '500': description: internal server error requestBody: @@ -1456,6 +1607,8 @@ paths: description: permission denied '404': description: article not found + '410': + description: account disabled '500': description: internal server error delete: @@ -1479,6 +1632,8 @@ paths: description: invalid password '404': description: article not found + '410': + description: account disabled '500': description: internal server error @@ -1516,6 +1671,8 @@ paths: description: field, article not found '405': description: invalid field + '410': + description: account disabled '500': description: internal server error @@ -1541,6 +1698,8 @@ paths: description: permission denied '404': description: article not found + '410': + description: account disabled '500': description: internal server error requestBody: @@ -1585,6 +1744,8 @@ paths: description: permission denied '404': description: group or article not found + '410': + description: account disabled '500': description: internal server error delete: @@ -1614,6 +1775,8 @@ paths: description: permission denied '404': description: group or article not found + '410': + description: account disabled '500': description: internal server error @@ -1645,6 +1808,8 @@ paths: description: permission denied '404': description: label or article not found + '410': + description: account disabled '500': description: internal server error delete: @@ -1674,6 +1839,8 @@ paths: description: permission denied '404': description: label or article not found + '410': + description: account disabled '500': description: internal server error @@ -1703,6 +1870,8 @@ paths: $ref: '#/components/schemas/Asset' '401': description: invalid token + '410': + description: account disabled '500': description: internal server error post: @@ -1740,6 +1909,8 @@ paths: description: article not found '406': description: storage limit reached + '410': + description: account disabled '500': description: internal server error requestBody: @@ -1785,6 +1956,8 @@ paths: description: permission denied '404': description: asset or article not found + '410': + description: account disabled '500': description: internal server error delete: @@ -1814,6 +1987,8 @@ paths: description: permission denied '404': description: asset or article not found + '410': + description: account disabled '500': description: internal server error @@ -1839,6 +2014,8 @@ paths: description: permission denied '404': description: article not found + '410': + description: account disabled '500': description: internal server error requestBody: @@ -1889,6 +2066,8 @@ paths: description: permission denied '404': description: article not found + '410': + description: account disabled '500': description: internal server error @@ -1940,6 +2119,8 @@ paths: description: permission denied '404': description: block or article not found + '410': + description: account disabled '500': description: internal server error @@ -1991,6 +2172,8 @@ paths: description: permission denied '404': description: block or article not found + '410': + description: account disabled '500': description: internal server error @@ -2028,6 +2211,8 @@ paths: description: permission denied '404': description: article not found + '410': + description: account disabled '500': description: internal server error @@ -2063,6 +2248,8 @@ paths: description: permission denied '404': description: tag or article not found + '410': + description: account disabled '500': description: internal server error delete: @@ -2092,6 +2279,8 @@ paths: description: permission denied '404': description: tag or article not found + '410': + description: account disabled '500': description: internal server error @@ -2135,6 +2324,8 @@ paths: description: field, tag or article not found '405': description: invalid field + '410': + description: account disabled '500': description: internal server error @@ -2157,6 +2348,8 @@ paths: $ref: '#/components/schemas/Label' '401': description: invalid token + '410': + description: account disabled '500': description: internal server error post: @@ -2171,6 +2364,8 @@ paths: description: success '401': description: permission denied + '410': + description: account disabled '500': description: internal server error requestBody: @@ -2207,6 +2402,8 @@ paths: description: successful operation '401': description: invalid token + '410': + description: account disabled '500': description: internal server error requestBody: @@ -2243,6 +2440,8 @@ paths: description: permission denied '404': description: label not found + '410': + description: account disabled '500': description: internal server error @@ -2275,6 +2474,8 @@ paths: description: permission denied '404': description: group or label not found + '410': + description: account disabled '500': description: internal server error delete: @@ -2304,6 +2505,8 @@ paths: description: permission denied '404': description: group or label not found + '410': + description: account disabled '500': description: internal server error @@ -2326,6 +2529,8 @@ paths: $ref: '#/components/schemas/Dialogue' '401': description: permission denied + '410': + description: account disabled '500': description: internal server error post: @@ -2346,6 +2551,8 @@ paths: $ref: '#/components/schemas/Dialogue' '401': description: permission denied + '410': + description: account disabled '500': description: internal server error @@ -2371,6 +2578,8 @@ paths: description: permission denied '404': description: dialogue not found + '410': + description: account disabled '500': description: internal server error requestBody: @@ -2409,6 +2618,8 @@ paths: description: permission denied '404': description: dialogue not found + '410': + description: account disabled '500': description: internal server error requestBody: @@ -2445,6 +2656,8 @@ paths: description: permission denied '404': description: cardId or dialogue not found + '410': + description: account disabled '500': description: internal server error delete: @@ -2474,6 +2687,8 @@ paths: description: permission denied '404': description: cardId or dialogue not found + '410': + description: account disabled '500': description: internal server error @@ -2499,6 +2714,8 @@ paths: description: permission denied '404': description: dialogue not found + '410': + description: account disabled '500': description: internal server error requestBody: @@ -2530,6 +2747,8 @@ paths: description: permission denied '404': description: dialogue not found + '410': + description: account disabled '500': description: internal server error @@ -2559,6 +2778,8 @@ paths: $ref: '#/components/schemas/Insight' '401': description: permission denied + '410': + description: account disabled '500': description: internal server error @@ -2589,6 +2810,8 @@ paths: description: permission denied '404': description: dialogue not found + '410': + description: account disabled '500': description: internal server error requestBody: @@ -2618,6 +2841,8 @@ paths: description: permission denied '404': description: dialogue not found + '410': + description: account disabled '500': description: internal server error @@ -2645,6 +2870,8 @@ paths: description: invalid state # once dismissed always dismissed '404': description: insight not found + '410': + description: account disabled '500': description: internal server error requestBody: @@ -2696,6 +2923,8 @@ paths: description: permission denied '404': description: dialogue not found + '410': + description: account disabled '500': description: internal server error @@ -2741,6 +2970,8 @@ paths: description: permission denied '404': description: block or dialogue not found + '410': + description: account disabled '500': description: internal server error @@ -2792,6 +3023,8 @@ paths: description: permission denied '404': description: block or dialogue not found + '410': + description: account disabled '500': description: internal server error @@ -2831,6 +3064,8 @@ paths: description: inactive dialogue '404': description: dialogue not found + '410': + description: account disabled '500': description: internal server error @@ -2866,6 +3101,8 @@ paths: description: permission denied '404': description: topic or dialogue not found + '410': + description: account disabled '500': description: internal server error delete: @@ -2897,6 +3134,8 @@ paths: description: inactive dialogue '404': description: topic or dilaogue not found + '410': + description: account disabled '500': description: internal server error @@ -2941,6 +3180,8 @@ paths: description: field, topic or dialogue not found '405': description: invalid field + '410': + description: account disabled '500': description: internal server error @@ -2974,6 +3215,8 @@ paths: description: inactive dialogue '404': description: topic or dialogue not found + '410': + description: account disabled '500': description: internal server error requestBody: @@ -3024,6 +3267,8 @@ paths: description: permission denied '404': description: topic or dialogue not found + '410': + description: account disabled '500': description: internal server error post: @@ -3067,6 +3312,8 @@ paths: description: inactive dialogue '404': description: topic or dialogue not found + '410': + description: account disabled '500': description: internal server error requestBody: @@ -3118,6 +3365,8 @@ paths: description: permission denied '404': description: asset, topic or dialogue not found + '410': + description: account disabled '500': description: internal server error delete: @@ -3155,6 +3404,8 @@ paths: description: inactive dialogue '404': description: asset, topic or dialogue not found + '410': + description: account disabled '500': description: internal server error @@ -3187,6 +3438,8 @@ paths: description: inactive dialogue '404': description: topic or dialogue not found + '410': + description: account disabled '500': description: internal server error requestBody: @@ -3243,6 +3496,8 @@ paths: description: permission denied '404': description: topic or dialogue not found + '410': + description: account disabled '500': description: internal server error @@ -3300,6 +3555,8 @@ paths: description: permission denied '404': description: block, topic or dialogue not found + '410': + description: account disabled '500': description: internal server error @@ -3351,6 +3608,8 @@ paths: description: permission denied '404': description: block, topic, or dialogue not found + '410': + description: account disabled '500': description: internal server error @@ -3396,6 +3655,8 @@ paths: description: inactive dialogue '404': description: topic or dialogue not found + '410': + description: account disabled '500': description: internal server error requestBody: @@ -3450,6 +3711,8 @@ paths: description: permission denied '404': description: tag, topic, or dialogue not found + '410': + description: account disabled '500': description: internal server error delete: @@ -3487,6 +3750,8 @@ paths: description: inactive dialogue '404': description: tag, topic, or dialogue not found + '410': + description: account disabled '500': description: internal server error @@ -3536,6 +3801,8 @@ paths: description: field, tag, topic, or dialogue not found '405': description: invalid field + '410': + description: account disabled '500': description: internal server error @@ -3607,11 +3874,11 @@ components: Profile: type: object required: - - did + - profileId - revision - node properties: - did: + profileId: type: string handle: type: string @@ -3651,11 +3918,14 @@ components: required: - accountId - profile + - disabled properties: accountId: type: string profile: $ref: '#/components/schemas/Profile' + disabled: + type: boolean App: type: object @@ -4097,7 +4367,7 @@ components: enum: [RSA4096, RSA2048] publicKey: type: string - format: base64 encoding of account key + format: base64 encoding of account public key signature: type: string format: base64 encoding of message signature diff --git a/net/server/internal/README.md b/net/server/internal/README.md index 701e96b8..d2e12f4a 100644 --- a/net/server/internal/README.md +++ b/net/server/internal/README.md @@ -4,16 +4,16 @@ DataBag provides storage for decentralized identity based self-hosting apps. It ## Overview This server was generated by the [swagger-codegen] -(https://github.com/swagger-databag/swagger-codegen) project. +(https://github.com/swagger-api/swagger-codegen) project. By using the [OpenAPI-Spec](https://github.com/OAI/OpenAPI-Specification) from a remote server, you can easily generate a server stub. - To see how to make this your own, look here: -[README](https://github.com/swagger-databag/swagger-codegen/blob/master/README.md) +[README](https://github.com/swagger-api/swagger-codegen/blob/master/README.md) - API version: 0.0.1 -- Build date: 2022-01-10T22:59:36.877Z[GMT] +- Build date: 2022-01-13T04:53:26.618Z[GMT] ### Running the server diff --git a/net/server/internal/api_account.go b/net/server/internal/api_account.go index 0b7cc405..9fb22e24 100644 --- a/net/server/internal/api_account.go +++ b/net/server/internal/api_account.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag @@ -38,6 +38,11 @@ func GetAccountApps(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusOK) } +func GetAccountDid(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Content-Type", "application/json; charset=UTF-8") + w.WriteHeader(http.StatusOK) +} + func GetAccountImage(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json; charset=UTF-8") w.WriteHeader(http.StatusOK) @@ -48,6 +53,11 @@ func GetAccountProfile(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusOK) } +func GetAccountStatus(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Content-Type", "application/json; charset=UTF-8") + w.WriteHeader(http.StatusOK) +} + func GetAccountToken(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json; charset=UTF-8") w.WriteHeader(http.StatusOK) @@ -77,3 +87,8 @@ func SetAccountAuthentication(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json; charset=UTF-8") w.WriteHeader(http.StatusOK) } + +func SetAccountExport(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Content-Type", "application/json; charset=UTF-8") + w.WriteHeader(http.StatusOK) +} diff --git a/net/server/internal/api_admin.go b/net/server/internal/api_admin.go index 32bee834..b953992f 100644 --- a/net/server/internal/api_admin.go +++ b/net/server/internal/api_admin.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag @@ -47,6 +47,11 @@ func GetNodeConfig(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusOK) } +func ImportAccount(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Content-Type", "application/json; charset=UTF-8") + w.WriteHeader(http.StatusOK) +} + func RemoveNodeAccount(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json; charset=UTF-8") w.WriteHeader(http.StatusOK) diff --git a/net/server/internal/api_authorize.go b/net/server/internal/api_authorize.go index cdf090e0..3ef8bdf6 100644 --- a/net/server/internal/api_authorize.go +++ b/net/server/internal/api_authorize.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag @@ -13,7 +13,7 @@ import ( "net/http" ) -func Authorize(w http.ResponseWriter, r *http.Request) { +func Authenticate(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json; charset=UTF-8") w.WriteHeader(http.StatusOK) } diff --git a/net/server/internal/api_contact.go b/net/server/internal/api_contact.go index a7053e13..709c5eeb 100644 --- a/net/server/internal/api_contact.go +++ b/net/server/internal/api_contact.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/api_content.go b/net/server/internal/api_content.go index 547b590d..1df22e91 100644 --- a/net/server/internal/api_content.go +++ b/net/server/internal/api_content.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/api_conversation.go b/net/server/internal/api_conversation.go index b91cd17c..a68a4e7c 100644 --- a/net/server/internal/api_conversation.go +++ b/net/server/internal/api_conversation.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/api_profile.go b/net/server/internal/api_profile.go index d15023a9..bd244ee3 100644 --- a/net/server/internal/api_profile.go +++ b/net/server/internal/api_profile.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/api_share.go b/net/server/internal/api_share.go index 25a3dfba..2fc77972 100644 --- a/net/server/internal/api_share.go +++ b/net/server/internal/api_share.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/api_status.go b/net/server/internal/api_status.go index a5b1a6c5..46f76a0b 100644 --- a/net/server/internal/api_status.go +++ b/net/server/internal/api_status.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/logger.go b/net/server/internal/logger.go index 070f5677..7eeef095 100644 --- a/net/server/internal/logger.go +++ b/net/server/internal/logger.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/model_account.go b/net/server/internal/model_account.go index b50baef5..a0eecbaf 100644 --- a/net/server/internal/model_account.go +++ b/net/server/internal/model_account.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag @@ -14,4 +14,6 @@ type Account struct { AccountId string `json:"accountId"` Profile *Profile `json:"profile"` + + Disabled bool `json:"disabled"` } diff --git a/net/server/internal/model_accounts_import_body.go b/net/server/internal/model_accounts_import_body.go new file mode 100644 index 00000000..0cc3f918 --- /dev/null +++ b/net/server/internal/model_accounts_import_body.go @@ -0,0 +1,18 @@ +/* + * DataBag + * + * DataBag provides storage for decentralized identity based self-hosting apps. It is intended to support sharing of personal data and hosting group conversations. + * + * API version: 0.0.1 + * Contact: roland.osborne@gmail.com + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ +package databag +import ( + "os" +) + +type AccountsImportBody struct { + + FileName **os.File `json:"fileName,omitempty"` +} diff --git a/net/server/internal/model_announce.go b/net/server/internal/model_announce.go index ec9148f1..88b933a9 100644 --- a/net/server/internal/model_announce.go +++ b/net/server/internal/model_announce.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/model_app.go b/net/server/internal/model_app.go index 2de734bb..b25a1720 100644 --- a/net/server/internal/model_app.go +++ b/net/server/internal/model_app.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/model_app_data.go b/net/server/internal/model_app_data.go index 58670085..06667b4a 100644 --- a/net/server/internal/model_app_data.go +++ b/net/server/internal/model_app_data.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/model_article.go b/net/server/internal/model_article.go index d1c24acb..02fdcbb3 100644 --- a/net/server/internal/model_article.go +++ b/net/server/internal/model_article.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/model_article_id_assets_body.go b/net/server/internal/model_article_id_assets_body.go index 4b3a7909..51ab9ef6 100644 --- a/net/server/internal/model_article_id_assets_body.go +++ b/net/server/internal/model_article_id_assets_body.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag import ( diff --git a/net/server/internal/model_article_id_subject_body.go b/net/server/internal/model_article_id_subject_body.go index 4e8a8a4e..54e98f0a 100644 --- a/net/server/internal/model_article_id_subject_body.go +++ b/net/server/internal/model_article_id_subject_body.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/model_asset.go b/net/server/internal/model_asset.go index 082428d5..360644fe 100644 --- a/net/server/internal/model_asset.go +++ b/net/server/internal/model_asset.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/model_authenticate.go b/net/server/internal/model_authenticate.go index 08192967..e8e8dbe0 100644 --- a/net/server/internal/model_authenticate.go +++ b/net/server/internal/model_authenticate.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/model_card.go b/net/server/internal/model_card.go index 1b37801d..5f29695e 100644 --- a/net/server/internal/model_card.go +++ b/net/server/internal/model_card.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/model_card_data.go b/net/server/internal/model_card_data.go index 930504a7..e0091caf 100644 --- a/net/server/internal/model_card_data.go +++ b/net/server/internal/model_card_data.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/model_card_profile.go b/net/server/internal/model_card_profile.go index f53cf8cd..a48b5cb0 100644 --- a/net/server/internal/model_card_profile.go +++ b/net/server/internal/model_card_profile.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/model_card_view.go b/net/server/internal/model_card_view.go index 6f833d97..4b754c8e 100644 --- a/net/server/internal/model_card_view.go +++ b/net/server/internal/model_card_view.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/model_connect.go b/net/server/internal/model_connect.go index 389aef8a..54249626 100644 --- a/net/server/internal/model_connect.go +++ b/net/server/internal/model_connect.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/model_content_articles_body.go b/net/server/internal/model_content_articles_body.go index c4c82f53..21b7be46 100644 --- a/net/server/internal/model_content_articles_body.go +++ b/net/server/internal/model_content_articles_body.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/model_content_labels_body.go b/net/server/internal/model_content_labels_body.go index d42eb8d3..04c8a01f 100644 --- a/net/server/internal/model_content_labels_body.go +++ b/net/server/internal/model_content_labels_body.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/model_data_message.go b/net/server/internal/model_data_message.go index bc9d8b7c..c1f6ee9b 100644 --- a/net/server/internal/model_data_message.go +++ b/net/server/internal/model_data_message.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/model_dialogue.go b/net/server/internal/model_dialogue.go index 19431cb2..24bf9665 100644 --- a/net/server/internal/model_dialogue.go +++ b/net/server/internal/model_dialogue.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/model_dialogue_id_subject_body.go b/net/server/internal/model_dialogue_id_subject_body.go index 1bfad286..9dac8ab5 100644 --- a/net/server/internal/model_dialogue_id_subject_body.go +++ b/net/server/internal/model_dialogue_id_subject_body.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/model_dialogue_insights.go b/net/server/internal/model_dialogue_insights.go index 0e237c69..7bf626a6 100644 --- a/net/server/internal/model_dialogue_insights.go +++ b/net/server/internal/model_dialogue_insights.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/model_disconnect.go b/net/server/internal/model_disconnect.go index 6d58de8f..c4276eec 100644 --- a/net/server/internal/model_disconnect.go +++ b/net/server/internal/model_disconnect.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/model_group.go b/net/server/internal/model_group.go index 1b025328..018514b3 100644 --- a/net/server/internal/model_group.go +++ b/net/server/internal/model_group.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/model_groups_group_id_body.go b/net/server/internal/model_groups_group_id_body.go index acd5e2eb..635ee78d 100644 --- a/net/server/internal/model_groups_group_id_body.go +++ b/net/server/internal/model_groups_group_id_body.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/model_inline_response_200.go b/net/server/internal/model_inline_response_200.go index 39fda638..9501c7ab 100644 --- a/net/server/internal/model_inline_response_200.go +++ b/net/server/internal/model_inline_response_200.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/model_inline_response_200_1.go b/net/server/internal/model_inline_response_200_1.go index e65cbd4a..c858be8b 100644 --- a/net/server/internal/model_inline_response_200_1.go +++ b/net/server/internal/model_inline_response_200_1.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/model_inline_response_200_2.go b/net/server/internal/model_inline_response_200_2.go index ad3661c1..9f02b3b1 100644 --- a/net/server/internal/model_inline_response_200_2.go +++ b/net/server/internal/model_inline_response_200_2.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/model_inline_response_201.go b/net/server/internal/model_inline_response_201.go index 75165ab7..9fb4b7e1 100644 --- a/net/server/internal/model_inline_response_201.go +++ b/net/server/internal/model_inline_response_201.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/model_inline_response_201_1.go b/net/server/internal/model_inline_response_201_1.go index 6658778a..092f6a27 100644 --- a/net/server/internal/model_inline_response_201_1.go +++ b/net/server/internal/model_inline_response_201_1.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/model_insight.go b/net/server/internal/model_insight.go index c2b5917b..fcc7e3d3 100644 --- a/net/server/internal/model_insight.go +++ b/net/server/internal/model_insight.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/model_label.go b/net/server/internal/model_label.go index c23494ee..f7f4fde2 100644 --- a/net/server/internal/model_label.go +++ b/net/server/internal/model_label.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/model_labels_label_id_body.go b/net/server/internal/model_labels_label_id_body.go index 09a70b21..68f6ca52 100644 --- a/net/server/internal/model_labels_label_id_body.go +++ b/net/server/internal/model_labels_label_id_body.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/model_node_config.go b/net/server/internal/model_node_config.go index 76115d67..dc07b769 100644 --- a/net/server/internal/model_node_config.go +++ b/net/server/internal/model_node_config.go @@ -5,15 +5,15 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag type NodeConfig struct { - Domain string `json:"domain,omitempty"` + Domain string `json:"domain"` - PublicLimit int64 `json:"publicLimit,omitempty"` + PublicLimit int64 `json:"publicLimit"` - AccountStorage int64 `json:"accountStorage,omitempty"` + AccountStorage int64 `json:"accountStorage"` } diff --git a/net/server/internal/model_profile.go b/net/server/internal/model_profile.go index ec6e4d6c..6a5d8635 100644 --- a/net/server/internal/model_profile.go +++ b/net/server/internal/model_profile.go @@ -5,13 +5,13 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag type Profile struct { - Did string `json:"did"` + ProfileId string `json:"profileId"` Handle string `json:"handle,omitempty"` diff --git a/net/server/internal/model_profile_data.go b/net/server/internal/model_profile_data.go index 1ba8ff0d..9af36d6e 100644 --- a/net/server/internal/model_profile_data.go +++ b/net/server/internal/model_profile_data.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/model_share_groups_body.go b/net/server/internal/model_share_groups_body.go index 403cb375..8e762a66 100644 --- a/net/server/internal/model_share_groups_body.go +++ b/net/server/internal/model_share_groups_body.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/model_status.go b/net/server/internal/model_status.go new file mode 100644 index 00000000..e8b63115 --- /dev/null +++ b/net/server/internal/model_status.go @@ -0,0 +1,27 @@ +/* + * DataBag + * + * DataBag provides storage for decentralized identity based self-hosting apps. It is intended to support sharing of personal data and hosting group conversations. + * + * API version: 0.0.1 + * Contact: roland.osborne@gmail.com + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ +package databag + +type Status struct { + + Profile int64 `json:"profile"` + + Content int64 `json:"content"` + + Label int64 `json:"label"` + + Share int64 `json:"share"` + + Card int64 `json:"card"` + + Dialogue int64 `json:"dialogue"` + + Insight int64 `json:"insight"` +} diff --git a/net/server/internal/model_tag.go b/net/server/internal/model_tag.go index 89bb63a0..c4d931a6 100644 --- a/net/server/internal/model_tag.go +++ b/net/server/internal/model_tag.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/model_topic.go b/net/server/internal/model_topic.go index a6fd7a53..f6be7462 100644 --- a/net/server/internal/model_topic.go +++ b/net/server/internal/model_topic.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/model_topic_id_assets_body.go b/net/server/internal/model_topic_id_assets_body.go index 3bda3bc7..f23b9ddb 100644 --- a/net/server/internal/model_topic_id_assets_body.go +++ b/net/server/internal/model_topic_id_assets_body.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag import ( diff --git a/net/server/internal/model_topic_id_subject_body.go b/net/server/internal/model_topic_id_subject_body.go index a463fdad..f210ccb9 100644 --- a/net/server/internal/model_topic_id_subject_body.go +++ b/net/server/internal/model_topic_id_subject_body.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/model_topic_id_tags_body.go b/net/server/internal/model_topic_id_tags_body.go index 75f46b9f..eb734e4c 100644 --- a/net/server/internal/model_topic_id_tags_body.go +++ b/net/server/internal/model_topic_id_tags_body.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/model_tunnel.go b/net/server/internal/model_tunnel.go index d6c31f29..fbdd1ce4 100644 --- a/net/server/internal/model_tunnel.go +++ b/net/server/internal/model_tunnel.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag diff --git a/net/server/internal/routers.go b/net/server/internal/routers.go index 9dbaf839..ca162993 100644 --- a/net/server/internal/routers.go +++ b/net/server/internal/routers.go @@ -5,7 +5,7 @@ * * API version: 0.0.1 * Contact: roland.osborne@gmail.com - * Generated by: Swagger Codegen (https://github.com/swagger-databag/swagger-codegen.git) + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package databag @@ -13,6 +13,7 @@ import ( "fmt" "net/http" "strings" + "github.com/gorilla/mux" ) @@ -26,15 +27,6 @@ type Route struct { type Routes []Route func NewRouter() *mux.Router { - - // populate context - _configured = getBoolConfigValue(CONFIG_CONFIGURED, false); - _adminUsername = getStrConfigValue(CONFIG_USERNAME, ""); - _adminPassword = getBinConfigValue(CONFIG_PASSWORD, nil); - _nodeDomain = getStrConfigValue(CONFIG_DOMAIN, ""); - _publicLimit = getNumConfigValue(CONFIG_PUBLICLIMIT, 0); - _accountStorage = getNumConfigValue(CONFIG_STORAGE, 0); - router := mux.NewRouter().StrictSlash(true) for _, route := range routes { var handler http.Handler @@ -98,6 +90,13 @@ var routes = Routes{ GetAccountApps, }, + Route{ + "GetAccountDid", + strings.ToUpper("Get"), + "/account/did", + GetAccountDid, + }, + Route{ "GetAccountImage", strings.ToUpper("Get"), @@ -112,6 +111,13 @@ var routes = Routes{ GetAccountProfile, }, + Route{ + "GetAccountStatus", + strings.ToUpper("Get"), + "/account/disabled", + GetAccountStatus, + }, + Route{ "GetAccountToken", strings.ToUpper("Get"), @@ -154,6 +160,13 @@ var routes = Routes{ SetAccountAuthentication, }, + Route{ + "SetAccountExport", + strings.ToUpper("Put"), + "/account/export", + SetAccountExport, + }, + Route{ "AddNodeAccount", strings.ToUpper("Post"), @@ -189,6 +202,13 @@ var routes = Routes{ GetNodeConfig, }, + Route{ + "ImportAccount", + strings.ToUpper("Post"), + "/admin/accounts/import", + ImportAccount, + }, + Route{ "RemoveNodeAccount", strings.ToUpper("Delete"), @@ -218,10 +238,10 @@ var routes = Routes{ }, Route{ - "Authorize", + "Authenticate", strings.ToUpper("Put"), "/authorize", - Authorize, + Authenticate, }, Route{ diff --git a/net/server/internal/store/schema.go b/net/server/internal/store/schema.go index 603f20e1..ff244a4a 100644 --- a/net/server/internal/store/schema.go +++ b/net/server/internal/store/schema.go @@ -45,7 +45,10 @@ type AccountToken struct { type Account struct { ID uint `gorm:"primaryKey;not null;unique;autoIncrement"` - Did string `gorm:"not null"` + PublicKey []byte `gorm:"not null"` + PrivateKey []byte `gorm:"not null"` + KeyType []byte `gorm:"not null"` + ProfileId string `gorm:"not null;uniqueIndex"` Username string `gorm:"not null;uniqueIndex"` Password []byte `gorm:"not null"` Name string