Update from qilin fork

.dockerignore

@@ -0,0 +1 @@
+admin/node_modules

.gitignore

@@ -1,6 +1,8 @@
+.DS_Store
 .idea
 *.exe
 *.exe~
 *.out
 /sandbox/
-/bin/
+/auth1
+/bin/

.helm/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
 appVersion: "1.0"
 description: A Helm chart for Protocol.One Auth1 service
-name: p1auth1
+name: qilinauth
 version: 0.0.1

.helm/templates/deployment-backend.yaml

@@ -72,5 +72,19 @@ spec:
           initialDelaySeconds: 5
           timeoutSeconds: 1
           failureThreshold: 2
-          periodSeconds: 5
+          periodSeconds: 5        
+      - name: {{ $deployment.name }}-admin
+        image: {{ $deployment.image }}:{{ $deployment.imageTag }}
+        command: ["/app/auth1"]
+        args: ["admin"]
+        env:        
+        {{- range .Values.backend.env}}
+        - name: {{.}}
+          valueFrom:
+            secretKeyRef:
+              name: {{ $deploymentName }}-env
+              key: {{.}}
+        {{- end}}        
+        ports:
+        - containerPort: {{ $deployment.adminPort }}
 

.helm/templates/hydra.yaml

@@ -89,6 +89,8 @@ spec:
           - name: TRACING_PROVIDER_JAEGER_SAMPLING_VALUE
             value: "1"
           {{- end }}
+          - name: OAUTH2_LOGOUT_URL
+            value: "/oauth2/logout"
           - name: BCRYPT_COST
             value: "8"
           - name: LOG_FORMAT

.helm/templates/ingress.yaml

@@ -1,4 +1,6 @@
 {{- $endpoint := .Values.backend -}}
+{{- $hydraSvc := printf "hydra-external-%s" .Release.Name}}
+{{ $namespace := .Release.Namespace }}
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
@@ -25,31 +27,109 @@ spec:
     - host: {{printf "%s%s" .Values.ingress.hostnamePrefix .Values.ingress.hostname }}
       http:
         paths:
-          - path: {{ .Values.ingress.path }}
-            backend:
-              serviceName: {{ .Release.Name }}
-              servicePort: {{ $endpoint.service.port }}
           - path: /userinfo
             backend:
-              serviceName: hydra
+              serviceName: {{ $hydraSvc }}
               servicePort: 4444
           - path: /oauth2/auth
             backend:
-              serviceName: hydra
+              serviceName: {{ $hydraSvc }}
               servicePort: 4444
           - path: /oauth2/token
             backend:
-              serviceName: hydra
+              serviceName: {{ $hydraSvc }}
               servicePort: 4444
           - path: /oauth2/revoke
             backend:
-              serviceName: hydra
+              serviceName: {{ $hydraSvc }}
+              servicePort: 4444
+          - path: /oauth2/sessions/logout
+            backend:
+              serviceName: {{ $hydraSvc }}
               servicePort: 4444
           - path: /oauth2/userinfo
             backend:
-              serviceName: hydra
+              serviceName: {{ $hydraSvc }}
               servicePort: 4444
           - path: /.well-known/jwks.json
             backend:
-              serviceName: hydra
-              servicePort: 4444              
+              serviceName: {{ $hydraSvc }}
+              servicePort: 4444
+          - path: /.well-known/openid-configuration
+            backend:
+              serviceName: {{ $hydraSvc }}
+              servicePort: 4444
+          - path: /oauth2
+            backend:
+              serviceName: {{ .Release.Name }}
+              servicePort: {{ $endpoint.service.port }}
+          - path: /api
+            backend:
+              serviceName: {{ .Release.Name }}
+              servicePort: {{ $endpoint.service.port }}
+          - path: /
+            backend:
+              serviceName: store-auth-web
+              servicePort: 80
+---
+{{ if eq $namespace "default" }}
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: {{ .Release.Name }}-admin
+  labels:
+    app: {{ .Chart.Name }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+  annotations:
+    kubernetes.io/ingress.class: nginx
+    certmanager.k8s.io/issuer: {{ .Release.Name }}
+    ingress.kubernetes.io/ssl-redirect: "true"
+    kubernetes.io/tls-acme: "true"
+    nginx.ingress.kubernetes.io/tls-acme: "true"
+spec:
+  tls:
+    - hosts:
+        - {{printf "%s%s" .Values.ingress.hostnamePrefix .Values.ingress.adminHostname }}
+      secretName: {{ .Release.Name}}-admin-ssl-secret
+  rules:
+    - host: {{printf "%s%s" .Values.ingress.hostnamePrefix .Values.ingress.adminHostname }}
+      http:
+        paths:
+          - path: /
+            backend:
+              serviceName: {{ .Release.Name }}
+              servicePort: {{ $endpoint.adminPort }}
+{{ end }}
+---
+{{ if eq $namespace "stg" }}
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: {{ .Release.Name }}-admin
+  labels:
+    app: {{ .Chart.Name }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+  annotations:
+    kubernetes.io/ingress.class: nginx
+    certmanager.k8s.io/issuer: {{ .Release.Name }}
+    ingress.kubernetes.io/ssl-redirect: "true"
+    kubernetes.io/tls-acme: "true"
+    nginx.ingress.kubernetes.io/tls-acme: "true"
+spec:
+  tls:
+    - hosts:
+        - {{printf "%s%s" .Values.ingress.hostnamePrefix .Values.ingress.adminStgHostname }}
+      secretName: {{ .Release.Name}}-admin-ssl-secret
+  rules:
+    - host: {{printf "%s%s" .Values.ingress.hostnamePrefix .Values.ingress.adminStgHostname }}
+      http:
+        paths:
+          - path: /
+            backend:
+              serviceName: {{ .Release.Name }}
+              servicePort: {{ $endpoint.adminPort }}
+{{ end }}

.helm/templates/service.yaml

@@ -13,9 +13,38 @@ metadata:
 spec:
   type: {{ $deployment.service.type }}
   ports:
-  - port: {{ $deployment.service.port }}
+  - name: auth1
+    port: {{ $deployment.service.port }}
     targetPort: {{ $deployment.port }}
     protocol: {{ $deployment.service.protocol }}
+  - name: auth1-admin
+    port: {{ $deployment.adminPort }}
+    targetPort: {{ $deployment.adminPort  }}
+    protocol: {{ $deployment.service.protocol }}    
+  selector:
+    app: {{ .Chart.Name }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+    role: {{ $deployment.role }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ $svcName }}-grpc
+  labels:
+    app: {{ .Chart.Name }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+    role: {{ $deployment.role }}
+spec:
+  type: {{ $deployment.service.type }}
+  ports:
+  - name: grpc
+    port: {{ $deployment.grpcApiPort }}
+    targetPort: {{ $deployment.grpcApiPort  }}
+    protocol: {{ $deployment.service.protocol }}
   selector:
     app: {{ .Chart.Name }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"

.helm/values.yaml

@@ -2,13 +2,16 @@
 # Declare variables to be passed into your templates.
 
 enableRedis: true
-enableMongo: true
-enableHydra: true
+enableMongo: false
+enableHydra: false
 enableCertIssuer: true
 enableHydraDebug: false
 
 ingress:
-  hostname: auth1.tst.protocol.one
+  hostname: id.tst.qilin.super.com
+  adminHostname: admin-id.tst.qilin.super.com
+  stgHostname: id.stg.qilin.super.com
+  adminStgHostname: admin-id.stg.qilin.super.com
   hostnamePrefix:
   path: /
 
@@ -20,6 +23,8 @@ backend:
   role: gobackend
   image: "p1hub/p1auth1"
   imageTag: latest
+  grpcApiPort: 5300
+  adminPort: 8081
   port: 8080
   replicas: 1
   service:
@@ -57,6 +62,17 @@ backend:
     - AUTHONE_MAILER_FROM
     - AUTHONE_MAILER_SKIP_VERIFY
     - AUTHONE_MIGRATION_DIRECT
+    - AUTHONE_AUTH_WEB_FORM_SDK_URL
+    - AUTHONE_RECAPTCHA_KEY
+    - AUTHONE_RECAPTCHA_SECRET
+    - AUTHONE_MAILTEMPLATES_PLATFORM_URL
+    - AUTHONE_MAILTEMPLATES_PLATFORM_NAME
+    - AUTHONE_MAILTEMPLATES_SUPPORT_PORTAL_URL
+    - AUTHONE_CENTRIFUGO_ADDR
+    - AUTHONE_CENTRIFUGO_API_KEY
+    - AUTHONE_CENTRIFUGO_HMAC_SECRET
+    - AUTHONE_CENTRIFUGO_SESSION_TTL
+    - AUTHONE_CENTRIFUGO_LAUNCHER_CHANNEL
 
 hydra:
   env: