diff --git a/docker-compose.accounts.yml b/docker-compose.accounts.yml index a84c64ed..9280850e 100644 --- a/docker-compose.accounts.yml +++ b/docker-compose.accounts.yml @@ -101,33 +101,6 @@ services: depends_on: - kratos-migrate - # kratos-selfservice-ui-node: - # image: oryd/kratos-selfservice-ui-node:v0.5.0-alpha.1 - # container_name: kratos-selfservice-ui-node - # restart: on-failure - # logging: *default-logging - # volumes: - # - ./docker/kratos-selfservice-ui-node/main.hbs:/usr/src/app/views/layouts/main.hbs:ro - # - ./docker/kratos-selfservice-ui-node/login.hbs:/usr/src/app/views/login.hbs:ro - # - ./docker/kratos-selfservice-ui-node/dashboard.hbs:/usr/src/app/views/dashboard.hbs:ro - # - ./docker/kratos-selfservice-ui-node/registration.hbs:/usr/src/app/views/registration.hbs:ro - # - ./docker/kratos-selfservice-ui-node/icon_logo.hbs:/usr/src/app/views/partials/icon_logo.hbs:ro - # - ./docker/kratos-selfservice-ui-node/branding.css:/usr/src/app/public/branding.css:ro - # - ./docker/kratos-selfservice-ui-node/favico.png:/usr/src/app/public/favico.png:ro - # environment: - # - PORT=4435 - # - SECURITY_MODE=jwks - # - PROJECT_NAME=Skynet - # - BASE_URL=/ - # - KRATOS_BROWSER_URL=/.ory/kratos/public - # - JWKS_URL=http://oathkeeper:4456/.well-known/jwks.json - # - KRATOS_PUBLIC_URL=http://kratos:4433/ - # - KRATOS_ADMIN_URL=http://kratos:4434/ - # - SQA_OPT_OUT=true - # networks: - # shared: - # ipv4_address: 10.10.10.82 - dashboard: build: context: ./packages/dashboard diff --git a/docker/kratos-selfservice-ui-node/branding.css b/docker/kratos-selfservice-ui-node/branding.css deleted file mode 100644 index 91fe5848..00000000 --- a/docker/kratos-selfservice-ui-node/branding.css +++ /dev/null @@ -1,18 +0,0 @@ -:root { - --base-white: #ffffff; - --base-light: #f0f0f1; - --base-text: #99999e; - --base-main: #5a5b6a; - --base-dark: #19191d; - --base-black: #000000; - --primary-light: #ecfdfe; - --primary-half: #4ea156; - --primary-main: #57b560; - --primary-dark: #2e0473; - --red-strong: #f44336; - --green-strong: #43a047; -} - -.logo { - margin: 0 auto; -} diff --git a/docker/kratos-selfservice-ui-node/dashboard.hbs b/docker/kratos-selfservice-ui-node/dashboard.hbs deleted file mode 100644 index b9464445..00000000 --- a/docker/kratos-selfservice-ui-node/dashboard.hbs +++ /dev/null @@ -1,15 +0,0 @@ -
- {{> header}} -
-

Welcome back, {{session.identity.traits.email}}!

-

This will be your dashboard!

-

Right now there is nothing else here but in future, you will be able to list your pinned files, upgrade to a - premium tiers and see your usage stats.

- -
- -

- Go back to siasky.net -

-
-
diff --git a/docker/kratos-selfservice-ui-node/favico.png b/docker/kratos-selfservice-ui-node/favico.png deleted file mode 100644 index 30c2af53..00000000 Binary files a/docker/kratos-selfservice-ui-node/favico.png and /dev/null differ diff --git a/docker/kratos-selfservice-ui-node/icon_logo.hbs b/docker/kratos-selfservice-ui-node/icon_logo.hbs deleted file mode 100644 index 4b356286..00000000 --- a/docker/kratos-selfservice-ui-node/icon_logo.hbs +++ /dev/null @@ -1,12 +0,0 @@ - - \ No newline at end of file diff --git a/docker/kratos-selfservice-ui-node/login.hbs b/docker/kratos-selfservice-ui-node/login.hbs deleted file mode 100644 index 42fb184d..00000000 --- a/docker/kratos-selfservice-ui-node/login.hbs +++ /dev/null @@ -1,28 +0,0 @@ -
-
- {{> icon_logo}} -
Welcome to siasky.net!
- - {{> messages messages=messages className="global"}} - - {{#if password}} -
- {{> form submitLabel="Sign in" form=password}} -
- {{/if}} - - {{#if oidc}} -
- {{> form form=oidc}} -
- {{/if}} - -
- -
- - Register new account - Reset password -
-
-
\ No newline at end of file diff --git a/docker/kratos-selfservice-ui-node/main.hbs b/docker/kratos-selfservice-ui-node/main.hbs deleted file mode 100644 index 76e85ff9..00000000 --- a/docker/kratos-selfservice-ui-node/main.hbs +++ /dev/null @@ -1,23 +0,0 @@ - - - - - {{#if baseUrl}} - - {{/if}} - - - - {{projectName}} - - - - - - - - - {{{body}}} - - - \ No newline at end of file diff --git a/docker/kratos-selfservice-ui-node/registration.hbs b/docker/kratos-selfservice-ui-node/registration.hbs deleted file mode 100644 index 51d7cf57..00000000 --- a/docker/kratos-selfservice-ui-node/registration.hbs +++ /dev/null @@ -1,27 +0,0 @@ -
-
- {{> icon_logo}} -
Welcome to siasky.net!
- Use the form below to sign up:
- - {{> messages messages=messages className="global"}} - - {{#if password}} -
- {{> form submitLabel="Sign up" form=password}} -
- {{/if}} - - {{#if oidc}} -
- {{> form form=oidc}} -
- {{/if}} - -
- -
- Already have an account? Log in instead -
-
-
\ No newline at end of file diff --git a/docker/kratos/oathkeeper/access-rules.yml b/docker/kratos/oathkeeper/access-rules.yml index 6f3c79b4..8a67a3dc 100644 --- a/docker/kratos/oathkeeper/access-rules.yml +++ b/docker/kratos/oathkeeper/access-rules.yml @@ -18,40 +18,6 @@ mutators: - handler: noop -# - id: "ory:kratos-selfservice-ui-node:anonymous" -# upstream: -# preserve_host: true -# url: "http://kratos-selfservice-ui-node:4435" -# match: -# url: "http://oathkeeper:4455/<{error,recovery,verify,auth/*,**.css,**.js}{/,}>" -# methods: -# - GET -# authenticators: -# - handler: anonymous -# authorizer: -# handler: allow -# mutators: -# - handler: noop - -# - id: "ory:kratos-selfservice-ui-node:protected" -# upstream: -# preserve_host: true -# url: "http://kratos-selfservice-ui-node:4435" -# match: -# url: "http://oathkeeper:4455/<{,debug,dashboard,settings}>" -# methods: -# - GET -# authenticators: -# - handler: cookie_session -# authorizer: -# handler: allow -# mutators: -# - handler: id_token -# errors: -# - handler: redirect -# config: -# to: http://127.0.0.1/auth/login - - id: "dashboard:anonymous" upstream: preserve_host: true @@ -91,10 +57,9 @@ preserve_host: true url: "http://accounts:3000" match: - url: "http://oathkeeper<{,:4455}>/<{user,user/**,track/**}>" + url: "http://oathkeeper<{,:4455}>/<{user,user/**}>" methods: - GET - - POST authenticators: - handler: cookie_session authorizer: diff --git a/docker/nginx/conf.d/client.conf b/docker/nginx/conf.d/client.conf index 825905b6..476ea2a1 100644 --- a/docker/nginx/conf.d/client.conf +++ b/docker/nginx/conf.d/client.conf @@ -348,7 +348,7 @@ server { if skylink and ngx.status >= ngx.HTTP_OK and ngx.status < ngx.HTTP_SPECIAL_RESPONSE then local http = require("socket.http") local headers = { Cookie = ngx.req.get_headers()["Cookie"] } - local ok, statusCode, headers, statusText = http.request { url = "http://oathkeeper:4455/track/download/" .. skylink, method = "POST", headers = headers } + local ok, statusCode, headers, statusText = http.request { url = "http://accounts:3000/track/download/" .. skylink, method = "POST", headers = headers } if statusCode ~= ngx.HTTP_NO_CONTENT then ngx.log(ngx.ERR, "accounts endpoint /track/download/" .. skylink .. " failed with error " .. statusCode) end