@@ -34,9 +34,8 @@ const internalStream = {
34
34
data . meta = { } ;
35
35
}
36
36
37
- let data_no_domains = structuredClone ( data ) ;
38
-
39
37
// streams aren't routed by ___domain name so don't store ___domain names in the DB
38
+ let data_no_domains = structuredClone ( data ) ;
40
39
delete data_no_domains . domain_names ;
41
40
42
41
return streamModel
@@ -72,7 +71,7 @@ const internalStream = {
72
71
// Configure nginx
73
72
return internalNginx . configure ( streamModel , 'stream' , row )
74
73
. then ( ( ) => {
75
- return internalStream . get ( access , { id : row . id , expand : [ 'owner' ] } ) ;
74
+ return row ;
76
75
} ) ;
77
76
} )
78
77
. then ( ( row ) => {
@@ -139,12 +138,6 @@ const internalStream = {
139
138
. query ( )
140
139
. patchAndFetchById ( row . id , data )
141
140
. then ( utils . omitRow ( omissions ( ) ) )
142
- . then ( ( saved_row ) => {
143
- return internalNginx . configure ( streamModel , 'stream' , saved_row )
144
- . then ( ( ) => {
145
- return internalStream . get ( access , { id : row . id , expand : [ 'owner' ] } ) ;
146
- } ) ;
147
- } )
148
141
. then ( ( saved_row ) => {
149
142
// Add to audit log
150
143
return internalAuditLog . add ( access , {
@@ -157,6 +150,17 @@ const internalStream = {
157
150
return saved_row ;
158
151
} ) ;
159
152
} ) ;
153
+ } )
154
+ . then ( ( ) => {
155
+ return internalStream . get ( access , { id : data . id , expand : [ 'owner' , 'certificate' ] } )
156
+ . then ( ( row ) => {
157
+ return internalNginx . configure ( streamModel , 'stream' , row )
158
+ . then ( ( new_meta ) => {
159
+ row . meta = new_meta ;
160
+ row = internalHost . cleanRowCertificateMeta ( row ) ;
161
+ return _ . omit ( row , omissions ( ) ) ;
162
+ } ) ;
163
+ } ) ;
160
164
} ) ;
161
165
} ,
162
166
0 commit comments