Skip to content

Commit

Permalink
Update phoenix to 0.20.0
Browse files Browse the repository at this point in the history
  • Loading branch information
LukasHirt committed Oct 9, 2020
1 parent 84ca821 commit 0af5e44
Show file tree
Hide file tree
Showing 4 changed files with 131 additions and 5 deletions.
8 changes: 8 additions & 0 deletions changelog/unreleased/update-phoenix-0.20.0
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Change: Update phoenix to v0.20.0

Tags: web

We updated phoenix to v0.20.0. Please refer to the changelog (linked) for details on the phoenix release.

https://github.com/owncloud/ocis/pull/674
https://github.com/owncloud/phoenix/releases/tag/v0.20.0
118 changes: 118 additions & 0 deletions config/identifier-registration.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
---

# OpenID Connect client registry.
clients:
- id: phoenix
name: ownCloud web app
application_type: web
insecure: yes
trusted: yes
redirect_uris:
- https://localhost:9200/
- https://localhost:9200/oidc-callback.html
- https://localhost:9200/oidc-silent-redirect.html
- http://localhost:9100/
- http://localhost:9100/oidc-callback.html
- http://localhost:9100/oidc-silent-redirect.html
origins:
- https://localhost:9200
- http://localhost:9100

- id: ocis-explorer.js
name: OCIS Graph Explorer
trusted: yes
application_type: web
insecure: yes

- id: xdXOt13JKxym1B1QcEncf2XDkLAexMBFwiT9j6EfhhHFJhs2KM9jbjTmf8JBXE69
secret: UBntmLjC2yYCeHwsyj73Uwo9TAaecAetRwMw0xYcvNL9yRdLSUi0hUAHfvCHFeFh
name: ownCloud desktop app
application_type: native
insecure: true

- id: e4rAsNUSIUs0lF4nbv9FmCeUkTlV9GdgTLDH1b5uie7syb90SzEVrbN7HIpmWJeD
secret: dInFYGV33xKzhbRmpqQltYNdfLdJIfJ9L5ISoKhNoT9qZftpdWSP71VrpGR9pmoD
name: ownCloud Android app
application_type: native
redirect_uris:
- oc://android.owncloud.com

- id: mxd5OQDk6es5LzOzRvidJNfXLUZS2oN3oUFeXPP8LpPrhx3UroJFduGEYIBOxkY1
secret: KFeFWWEZO9TkisIQzR3fo7hfiMXlOpaqP8CFuTbSHzV1TUuGECglPxpiVKJfOXIx
name: ownCloud iOS app
application_type: native
redirect_uris:
- oc://ios.owncloud.com
- oc.ios://ios.owncloud.com


# - id: playground-trusted.js
# name: Trusted OIDC Playground
# trusted: yes
# application_type: web
# redirect_uris:
# - https://my-host:8509/
# origins:
# - https://my-host:8509

# - id: playground-trusted.js
# name: Trusted Insecure OIDC Playground
# trusted: yes
# application_type: web
# insecure: yes

# - id: client-with-keys
# secret: super
# application_type: native
# redirect_uris:
# - http://localhost
# trusted_scopes:
# - konnect/guestok
# - kopano/kwm
# jwks:
# keys:
# - kty: EC
# use: sig
# kid: client-with-keys-key-1
# crv: P-256
# x: RTZpWoRbjwX1YavmSHVBj6Cy3Yzdkkp6QLvTGB22D0c
# y: jeavjwcX0xlDSchFcBMzXSU7wGs2VPpNxWCwmxFvmF0
# request_object_signing_alg: ES256

# - id: first
# secret: lala
# application_type: native
# redirect_uris:
# - my://app

# - id: second
# secret: lulu
# application_type: native
# redirect_uris:
# - http://localhost

# External authority registry.
authorities:
# - id: my-univention
# name: Univention
# client_id: kopano-konnect
# authority_type: oidc
# jwks:
# keys:
# - kty: EC
# use: sig
# kid: example-key-1
# crv: P-256
# x: RTZpWoRbjwX1YavmSHVBj6Cy3Yzdkkp6QLvTGB22D0c
# y: jeavjwcX0xlDSchFcBMzXSU7wGs2VPpNxWCwmxFvmF0
# default: yes
# authorization_endpoint: https://my-univention/signin/v1/identifier/_/authorize
# response_type: id_token
# scopes:
# - openid
# - profile
# identity_claim_name: preferred_username
# identity_aliases:
# external-user-a: local-user-a
# external-user-b: local-user-b
# identity_alias_required: true
2 changes: 1 addition & 1 deletion ocis-phoenix/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ NAME := ocis-phoenix
IMPORT := github.com/owncloud/ocis/$(NAME)
BIN := bin
DIST := dist
PHOENIX_ASSETS_VERSION = v0.19.0
PHOENIX_ASSETS_VERSION = v0.20.0

ifeq ($(OS), Windows_NT)
EXECUTABLE := $(NAME).exe
Expand Down
8 changes: 4 additions & 4 deletions ocis-phoenix/pkg/assets/embed.go

Large diffs are not rendered by default.

0 comments on commit 0af5e44

Please sign in to comment.